Skip to content

Commit cba9d6a

Browse files
authored
YQL-17286: Fix sublink in projection, which has no external deps (#684)
Do not expand sublinks, which have no external deps
1 parent a98ff2b commit cba9d6a

File tree

5 files changed

+53
-1
lines changed

5 files changed

+53
-1
lines changed

ydb/library/yql/core/common_opt/yql_co_pgselect.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3196,7 +3196,7 @@ TExprNode::TPtr ExpandPgSelectImpl(const TExprNode::TPtr& node, TExprContext& ct
31963196
}
31973197
}
31983198

3199-
if (!outerInputs.empty()) {
3199+
if (!outerInputs.empty() && finalExtTypes && 0 < finalExtTypes->Tail().ChildrenSize()) {
32003200
list = JoinOuter(node->Pos(), list, finalExtTypes, outerInputs, outerInputAliases, cleanedInputs, inputAliases, ctx);
32013201
}
32023202

ydb/library/yql/tests/sql/dq_file/part0/canondata/result.json

+22
Original file line numberDiff line numberDiff line change
@@ -2305,6 +2305,28 @@
23052305
}
23062306
],
23072307
"test.test[pg-sublink_order_all_corr-default.txt-Results]": [],
2308+
"test.test[pg-sublink_projection_uncorrelated-default.txt-Analyze]": [
2309+
{
2310+
"checksum": "b4dd508a329723c74293d80f0278c705",
2311+
"size": 505,
2312+
"uri": "https://{canondata_backend}/1031349/4e362e41dd365ac933a1de3f249df5eea8bb185d/resource.tar.gz#test.test_pg-sublink_projection_uncorrelated-default.txt-Analyze_/plan.txt"
2313+
}
2314+
],
2315+
"test.test[pg-sublink_projection_uncorrelated-default.txt-Debug]": [
2316+
{
2317+
"checksum": "1aafa70160c01eddfb9563a02afc45b8",
2318+
"size": 399,
2319+
"uri": "https://{canondata_backend}/1031349/4e362e41dd365ac933a1de3f249df5eea8bb185d/resource.tar.gz#test.test_pg-sublink_projection_uncorrelated-default.txt-Debug_/opt.yql_patched"
2320+
}
2321+
],
2322+
"test.test[pg-sublink_projection_uncorrelated-default.txt-Plan]": [
2323+
{
2324+
"checksum": "b4dd508a329723c74293d80f0278c705",
2325+
"size": 505,
2326+
"uri": "https://{canondata_backend}/1031349/4e362e41dd365ac933a1de3f249df5eea8bb185d/resource.tar.gz#test.test_pg-sublink_projection_uncorrelated-default.txt-Plan_/plan.txt"
2327+
}
2328+
],
2329+
"test.test[pg-sublink_projection_uncorrelated-default.txt-Results]": [],
23082330
"test.test[pg-tpcds-q43-default.txt-Analyze]": [
23092331
{
23102332
"checksum": "212be881133a20b5b73ef1250dbeda51",

ydb/library/yql/tests/sql/sql2yql/canondata/result.json

+7
Original file line numberDiff line numberDiff line change
@@ -12130,6 +12130,13 @@
1213012130
"uri": "https://{canondata_backend}/1599023/af9c2f81df0601cf266a0926b5ce73b6101b9115/resource.tar.gz#test_sql2yql.test_pg-sublink_projection_in_corr_/sql.yql"
1213112131
}
1213212132
],
12133+
"test_sql2yql.test[pg-sublink_projection_uncorrelated]": [
12134+
{
12135+
"checksum": "79141a5b9b9c23500431069b9d31b804",
12136+
"size": 684,
12137+
"uri": "https://{canondata_backend}/1871182/2bf182d62d0d6b300a9cb187b902374eb8f27321/resource.tar.gz#test_sql2yql.test_pg-sublink_projection_uncorrelated_/sql.yql"
12138+
}
12139+
],
1213312140
"test_sql2yql.test[pg-sublink_where_all]": [
1213412141
{
1213512142
"checksum": "fc31f83221afa091432ab14824d7f1be",
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
--!syntax_pg
2+
select 1 as one, (select 2) as two;

ydb/library/yql/tests/sql/yt_native_file/part0/canondata/result.json

+21
Original file line numberDiff line numberDiff line change
@@ -2036,6 +2036,27 @@
20362036
"uri": "https://{canondata_backend}/1889210/fa3852f976b4938229195b3251165e823de702aa/resource.tar.gz#test.test_pg-sublink_order_all_corr-default.txt-Results_/results.txt"
20372037
}
20382038
],
2039+
"test.test[pg-sublink_projection_uncorrelated-default.txt-Debug]": [
2040+
{
2041+
"checksum": "b0821371fc2814854f8466a6eedfbbc3",
2042+
"size": 343,
2043+
"uri": "https://{canondata_backend}/1889210/992dba7e1c711dc3d2671795b7ce1db28f5ced6a/resource.tar.gz#test.test_pg-sublink_projection_uncorrelated-default.txt-Debug_/opt.yql"
2044+
}
2045+
],
2046+
"test.test[pg-sublink_projection_uncorrelated-default.txt-Plan]": [
2047+
{
2048+
"checksum": "b4dd508a329723c74293d80f0278c705",
2049+
"size": 505,
2050+
"uri": "https://{canondata_backend}/1889210/992dba7e1c711dc3d2671795b7ce1db28f5ced6a/resource.tar.gz#test.test_pg-sublink_projection_uncorrelated-default.txt-Plan_/plan.txt"
2051+
}
2052+
],
2053+
"test.test[pg-sublink_projection_uncorrelated-default.txt-Results]": [
2054+
{
2055+
"checksum": "ff27962bee40696d3897bf8b2c12becd",
2056+
"size": 944,
2057+
"uri": "https://{canondata_backend}/1889210/992dba7e1c711dc3d2671795b7ce1db28f5ced6a/resource.tar.gz#test.test_pg-sublink_projection_uncorrelated-default.txt-Results_/results.txt"
2058+
}
2059+
],
20392060
"test.test[pg-tpcds-q43-default.txt-Debug]": [
20402061
{
20412062
"checksum": "6d7ab3f0ace5f5eb7ca1f3b89d22c078",

0 commit comments

Comments
 (0)