Skip to content

Commit a8d35a6

Browse files
rvu1024rvu1024
authored
[yql] Plan: add InputSections (YQL-17549) (#1517)
1 parent 54e99cd commit a8d35a6

File tree

51 files changed

+1685
-1668
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+1685
-1668
lines changed

‎ydb/library/yql/providers/yt/provider/yql_yt_datasink.cpp

+17
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,23 @@ class TYtDataSink : public TDataProviderBase {
333333
WriteColumns(writer, op.Input().Item(0).Paths().Item(0).Columns());
334334
}
335335

336+
if (op.Input().Size() > 1) {
337+
writer.OnKeyedItem("InputSections");
338+
auto op = maybeOp.Cast();
339+
writer.OnBeginList();
340+
ui64 ndx = 0;
341+
for (auto section: op.Input()) {
342+
writer.OnListItem();
343+
writer.OnBeginList();
344+
for (ui64 i = 0; i < section.Paths().Size(); ++i) {
345+
writer.OnListItem();
346+
writer.OnUint64Scalar(ndx++);
347+
}
348+
writer.OnEndList();
349+
}
350+
writer.OnEndList();
351+
}
352+
336353
if (op.Maybe<TYtMap>() || op.Maybe<TYtMapReduce>() || op.Maybe<TYtMerge>() ||
337354
op.Maybe<TYtReduce>() || op.Maybe<TYtSort>() || op.Maybe<TYtEquiJoin>())
338355
{

‎ydb/library/yql/tests/s-expressions/yt_native_file/part0/canondata/result.json

+45-45
Original file line numberDiff line numberDiff line change
@@ -540,9 +540,9 @@
540540
],
541541
"test.test[EquiJoin-EquiCrossSelfStr-Plan]": [
542542
{
543-
"checksum": "2eeec27d31202ec05b3353c9f8bb32be",
544-
"size": 5519,
545-
"uri": "https://{canondata_backend}/1925821/f0725773ed171c9e889e92995d500e4974e88b5d/resource.tar.gz#test.test_EquiJoin-EquiCrossSelfStr-Plan_/plan.txt"
543+
"checksum": "02d9ed77217235c42444f8144259b2cf",
544+
"size": 5717,
545+
"uri": "https://{canondata_backend}/1931696/7d7e0543ef9a74c578b8dfc8a858b2ca4c06f448/resource.tar.gz#test.test_EquiJoin-EquiCrossSelfStr-Plan_/plan.txt"
546546
}
547547
],
548548
"test.test[EquiJoin-EquiCrossSelfStr-Results]": [
@@ -621,9 +621,9 @@
621621
],
622622
"test.test[EquiJoin-EquiFullSelfTwoColumnOptPartial1OptPartial2Str-Plan]": [
623623
{
624-
"checksum": "33033baf5a2cad26914524ed861d2b83",
625-
"size": 7345,
626-
"uri": "https://{canondata_backend}/1937492/01fc01e449db64f1f7f6ab6d5f4ed46b441cc084/resource.tar.gz#test.test_EquiJoin-EquiFullSelfTwoColumnOptPartial1OptPartial2Str-Plan_/plan.txt"
624+
"checksum": "a54290b754f44fd6b80693cd8f9294ca",
625+
"size": 7543,
626+
"uri": "https://{canondata_backend}/1931696/7d7e0543ef9a74c578b8dfc8a858b2ca4c06f448/resource.tar.gz#test.test_EquiJoin-EquiFullSelfTwoColumnOptPartial1OptPartial2Str-Plan_/plan.txt"
627627
}
628628
],
629629
"test.test[EquiJoin-EquiFullSelfTwoColumnOptPartial1OptPartial2Str-Results]": [
@@ -682,9 +682,9 @@
682682
],
683683
"test.test[EquiJoin-EquiInnerSelfTwoColumnOptPartial1OptPartial2Str-Plan]": [
684684
{
685-
"checksum": "bc369c975bfbed9fc05e3529044ee6fa",
686-
"size": 6688,
687-
"uri": "https://{canondata_backend}/1925821/f0725773ed171c9e889e92995d500e4974e88b5d/resource.tar.gz#test.test_EquiJoin-EquiInnerSelfTwoColumnOptPartial1OptPartial2Str-Plan_/plan.txt"
685+
"checksum": "56f67588240e9b57ba7c38e74188d562",
686+
"size": 6886,
687+
"uri": "https://{canondata_backend}/1931696/7d7e0543ef9a74c578b8dfc8a858b2ca4c06f448/resource.tar.gz#test.test_EquiJoin-EquiInnerSelfTwoColumnOptPartial1OptPartial2Str-Plan_/plan.txt"
688688
}
689689
],
690690
"test.test[EquiJoin-EquiInnerSelfTwoColumnOptPartial1OptPartial2Str-Results]": [
@@ -753,9 +753,9 @@
753753
],
754754
"test.test[EquiJoin-EquiLeftSelfTwoColumnOptPartial1OptPartial2Str-Plan]": [
755755
{
756-
"checksum": "4b2410b67a8812c4154ba591c95101d7",
757-
"size": 7023,
758-
"uri": "https://{canondata_backend}/1937492/01fc01e449db64f1f7f6ab6d5f4ed46b441cc084/resource.tar.gz#test.test_EquiJoin-EquiLeftSelfTwoColumnOptPartial1OptPartial2Str-Plan_/plan.txt"
756+
"checksum": "68089a44dabf779433957f44dfc9ee10",
757+
"size": 7221,
758+
"uri": "https://{canondata_backend}/1931696/7d7e0543ef9a74c578b8dfc8a858b2ca4c06f448/resource.tar.gz#test.test_EquiJoin-EquiLeftSelfTwoColumnOptPartial1OptPartial2Str-Plan_/plan.txt"
759759
}
760760
],
761761
"test.test[EquiJoin-EquiLeftSelfTwoColumnOptPartial1OptPartial2Str-Results]": [
@@ -804,9 +804,9 @@
804804
],
805805
"test.test[EquiJoin-EquiOptKey1InnerSelfStr-Plan]": [
806806
{
807-
"checksum": "1a534317d6fe028c6105d675743806e1",
808-
"size": 6668,
809-
"uri": "https://{canondata_backend}/1925821/f0725773ed171c9e889e92995d500e4974e88b5d/resource.tar.gz#test.test_EquiJoin-EquiOptKey1InnerSelfStr-Plan_/plan.txt"
807+
"checksum": "f7a8760abb12c2d60807e33cd2aacc2f",
808+
"size": 6866,
809+
"uri": "https://{canondata_backend}/1931696/7d7e0543ef9a74c578b8dfc8a858b2ca4c06f448/resource.tar.gz#test.test_EquiJoin-EquiOptKey1InnerSelfStr-Plan_/plan.txt"
810810
}
811811
],
812812
"test.test[EquiJoin-EquiOptKey1InnerSelfStr-Results]": [
@@ -1110,9 +1110,9 @@
11101110
],
11111111
"test.test[EquiJoinAny-CommonAnyAll-Plan]": [
11121112
{
1113-
"checksum": "b2e68de0660714eb1e9c2e3130179218",
1114-
"size": 40148,
1115-
"uri": "https://{canondata_backend}/1937492/861bfc131110540191bb087be3980deb3827b35c/resource.tar.gz#test.test_EquiJoinAny-CommonAnyAll-Plan_/plan.txt"
1113+
"checksum": "259b4707fa69b37efb55bb297d1c9d8b",
1114+
"size": 41930,
1115+
"uri": "https://{canondata_backend}/1931696/7d7e0543ef9a74c578b8dfc8a858b2ca4c06f448/resource.tar.gz#test.test_EquiJoinAny-CommonAnyAll-Plan_/plan.txt"
11161116
}
11171117
],
11181118
"test.test[EquiJoinAny-CommonAnyAll-Results]": [
@@ -1321,9 +1321,9 @@
13211321
],
13221322
"test.test[EquiJoinAny-MapAllAny-Plan]": [
13231323
{
1324-
"checksum": "09e3f4957bac499efd56f6b359af882b",
1325-
"size": 40129,
1326-
"uri": "https://{canondata_backend}/1775059/3fefb549fd47c5ea8445d0ae57e6925d43865d9f/resource.tar.gz#test.test_EquiJoinAny-MapAllAny-Plan_/plan.txt"
1324+
"checksum": "f6f7e0ed27d844db2552ab4953fe037e",
1325+
"size": 41119,
1326+
"uri": "https://{canondata_backend}/1931696/7d7e0543ef9a74c578b8dfc8a858b2ca4c06f448/resource.tar.gz#test.test_EquiJoinAny-MapAllAny-Plan_/plan.txt"
13271327
}
13281328
],
13291329
"test.test[EquiJoinAny-MapAllAny-Results]": [
@@ -1482,9 +1482,9 @@
14821482
],
14831483
"test.test[EquiJoinAny-MergeAllAny-Plan]": [
14841484
{
1485-
"checksum": "222cafe6db63868acab97e162c3dfff3",
1486-
"size": 30342,
1487-
"uri": "https://{canondata_backend}/1775059/3fefb549fd47c5ea8445d0ae57e6925d43865d9f/resource.tar.gz#test.test_EquiJoinAny-MergeAllAny-Plan_/plan.txt"
1485+
"checksum": "ab573f24d7ccd3ba441bbbc035c1e048",
1486+
"size": 32124,
1487+
"uri": "https://{canondata_backend}/1931696/7d7e0543ef9a74c578b8dfc8a858b2ca4c06f448/resource.tar.gz#test.test_EquiJoinAny-MergeAllAny-Plan_/plan.txt"
14881488
}
14891489
],
14901490
"test.test[EquiJoinAny-MergeAllAny-Results]": [
@@ -1644,9 +1644,9 @@
16441644
],
16451645
"test.test[EquiJoinMerge-Exclusion2key2_12-Plan]": [
16461646
{
1647-
"checksum": "30b4443d10c90695e0ff8b160ec467e2",
1648-
"size": 6511,
1649-
"uri": "https://{canondata_backend}/1871102/8c1e7e987403f272f4190703b6a058bc5b3af63e/resource.tar.gz#test.test_EquiJoinMerge-Exclusion2key2_12-Plan_/plan.txt"
1647+
"checksum": "7e0e08aef1630e225c5c5c82b868f570",
1648+
"size": 6709,
1649+
"uri": "https://{canondata_backend}/1931696/7d7e0543ef9a74c578b8dfc8a858b2ca4c06f448/resource.tar.gz#test.test_EquiJoinMerge-Exclusion2key2_12-Plan_/plan.txt"
16501650
}
16511651
],
16521652
"test.test[EquiJoinMerge-Exclusion2key2_12-Results]": [
@@ -1685,9 +1685,9 @@
16851685
],
16861686
"test.test[EquiJoinMerge-Full2key12_1o2o-Plan]": [
16871687
{
1688-
"checksum": "b5bc0ae1333c476b2bf975a67f8ae7cc",
1689-
"size": 7411,
1690-
"uri": "https://{canondata_backend}/1871102/8c1e7e987403f272f4190703b6a058bc5b3af63e/resource.tar.gz#test.test_EquiJoinMerge-Full2key12_1o2o-Plan_/plan.txt"
1688+
"checksum": "fb62249b7bc1158c06c30a1ea6c9a36a",
1689+
"size": 7609,
1690+
"uri": "https://{canondata_backend}/1931696/7d7e0543ef9a74c578b8dfc8a858b2ca4c06f448/resource.tar.gz#test.test_EquiJoinMerge-Full2key12_1o2o-Plan_/plan.txt"
16911691
}
16921692
],
16931693
"test.test[EquiJoinMerge-Full2key12_1o2o-Results]": [
@@ -1716,9 +1716,9 @@
17161716
],
17171717
"test.test[EquiJoinMerge-Left2key2_1o2o-Plan]": [
17181718
{
1719-
"checksum": "c015ac00047400c39c2bbaa0e71de27b",
1720-
"size": 6542,
1721-
"uri": "https://{canondata_backend}/1871102/8c1e7e987403f272f4190703b6a058bc5b3af63e/resource.tar.gz#test.test_EquiJoinMerge-Left2key2_1o2o-Plan_/plan.txt"
1719+
"checksum": "5ca212cc1922f36b4733fc3d2627863f",
1720+
"size": 6740,
1721+
"uri": "https://{canondata_backend}/1931696/7d7e0543ef9a74c578b8dfc8a858b2ca4c06f448/resource.tar.gz#test.test_EquiJoinMerge-Left2key2_1o2o-Plan_/plan.txt"
17221722
}
17231723
],
17241724
"test.test[EquiJoinMerge-Left2key2_1o2o-Results]": [
@@ -1747,9 +1747,9 @@
17471747
],
17481748
"test.test[EquiJoinMerge-RightSemi2key2_1o2o-Plan]": [
17491749
{
1750-
"checksum": "1815e24fc331caa10414f68cd087b4ba",
1751-
"size": 6124,
1752-
"uri": "https://{canondata_backend}/1871102/8c1e7e987403f272f4190703b6a058bc5b3af63e/resource.tar.gz#test.test_EquiJoinMerge-RightSemi2key2_1o2o-Plan_/plan.txt"
1750+
"checksum": "f21aead03fa19f144ee3be2a77c4825e",
1751+
"size": 6322,
1752+
"uri": "https://{canondata_backend}/1931696/7d7e0543ef9a74c578b8dfc8a858b2ca4c06f448/resource.tar.gz#test.test_EquiJoinMerge-RightSemi2key2_1o2o-Plan_/plan.txt"
17531753
}
17541754
],
17551755
"test.test[EquiJoinMerge-RightSemi2key2_1o2o-Results]": [
@@ -1948,9 +1948,9 @@
19481948
],
19491949
"test.test[EquiJoinOrdered-JoinOrderedOpt12-Plan]": [
19501950
{
1951-
"checksum": "114fbadfdc33d939153e9c621457feb2",
1952-
"size": 36200,
1953-
"uri": "https://{canondata_backend}/1781765/e6ce641c67ee5e8fd774af099d76f9f50309186e/resource.tar.gz#test.test_EquiJoinOrdered-JoinOrderedOpt12-Plan_/plan.txt"
1951+
"checksum": "5cb37759bd7bc21ff238942e8c74def3",
1952+
"size": 37982,
1953+
"uri": "https://{canondata_backend}/1931696/7d7e0543ef9a74c578b8dfc8a858b2ca4c06f448/resource.tar.gz#test.test_EquiJoinOrdered-JoinOrderedOpt12-Plan_/plan.txt"
19541954
}
19551955
],
19561956
"test.test[EquiJoinOrdered-JoinOrderedOpt12-Results]": [
@@ -2677,9 +2677,9 @@
26772677
],
26782678
"test.test[ManyInputTables-GroupAfterWeakConcatOther-Plan]": [
26792679
{
2680-
"checksum": "3eab7bf0838d8acde364fff069da8cbe",
2681-
"size": 11341,
2682-
"uri": "https://{canondata_backend}/1871102/8c1e7e987403f272f4190703b6a058bc5b3af63e/resource.tar.gz#test.test_ManyInputTables-GroupAfterWeakConcatOther-Plan_/plan.txt"
2680+
"checksum": "a226a9f374bec01cbb245e336211b73e",
2681+
"size": 11651,
2682+
"uri": "https://{canondata_backend}/1931696/7d7e0543ef9a74c578b8dfc8a858b2ca4c06f448/resource.tar.gz#test.test_ManyInputTables-GroupAfterWeakConcatOther-Plan_/plan.txt"
26832683
}
26842684
],
26852685
"test.test[ManyInputTables-GroupAfterWeakConcatOther-Results]": [
@@ -2856,9 +2856,9 @@
28562856
],
28572857
"test.test[MultiIO-LMapWithMultiIn-Plan]": [
28582858
{
2859-
"checksum": "33a23d5bf1e6b68a6417c3b5053465fb",
2860-
"size": 6653,
2861-
"uri": "https://{canondata_backend}/1920236/ccf1859182b1f1f309a85d0d38889b302aa5777b/resource.tar.gz#test.test_MultiIO-LMapWithMultiIn-Plan_/plan.txt"
2859+
"checksum": "5677f8b0cb646d54f08f9e68882fd6a4",
2860+
"size": 6851,
2861+
"uri": "https://{canondata_backend}/1931696/7d7e0543ef9a74c578b8dfc8a858b2ca4c06f448/resource.tar.gz#test.test_MultiIO-LMapWithMultiIn-Plan_/plan.txt"
28622862
}
28632863
],
28642864
"test.test[MultiIO-LMapWithMultiIn-Results]": [

0 commit comments

Comments
 (0)