From dba3c016b1ea24ccfae645fa7f928aff98af4480 Mon Sep 17 00:00:00 2001 From: Hor911 Date: Mon, 16 Dec 2024 15:31:16 +0300 Subject: Per Operator Stats (#12522) Co-authored-by: Aleksandr Khoroshilov --- ydb/core/kqp/executer_actor/kqp_executer_stats.cpp | 195 +++++++++++----- ydb/core/kqp/executer_actor/kqp_executer_stats.h | 23 +- ydb/core/kqp/opt/kqp_query_plan.cpp | 251 +++++++++++++++------ ydb/core/kqp/ut/query/kqp_explain_ut.cpp | 3 +- .../dq/actors/compute/dq_compute_actor_stats.cpp | 23 ++ ydb/library/yql/dq/actors/protos/dq_stats.proto | 49 ++++ ydb/library/yql/dq/runtime/dq_tasks_counters.cpp | 44 ++++ ydb/library/yql/dq/runtime/dq_tasks_counters.h | 38 ++++ ydb/library/yql/dq/runtime/dq_tasks_runner.cpp | 10 +- ydb/library/yql/dq/runtime/dq_tasks_runner.h | 3 + ydb/library/yql/dq/runtime/ya.make | 2 + ydb/library/yql/utils/plan/plan_utils.cpp | 62 ++++- ydb/public/lib/ydb_cli/common/plan2svg.cpp | 50 +++- ydb/public/lib/ydb_cli/common/plan2svg.h | 1 + .../explain.script.plan | 76 +++++-- .../join_group_by_lookup.script.plan | 20 +- .../write_write_group_by.script.plan | 18 +- .../queries-original-plan-column-0 | 16 +- .../queries-original-plan-column-1 | 16 +- .../queries-original-plan-column-10 | 34 ++- .../queries-original-plan-column-11 | 36 ++- .../queries-original-plan-column-12 | 13 +- .../queries-original-plan-column-13 | 34 ++- .../queries-original-plan-column-14 | 13 +- .../queries-original-plan-column-15 | 13 +- .../queries-original-plan-column-16 | 13 +- .../queries-original-plan-column-17 | 13 +- .../queries-original-plan-column-18 | 20 +- .../queries-original-plan-column-2 | 16 +- .../queries-original-plan-column-20 | 16 +- .../queries-original-plan-column-21 | 13 +- .../queries-original-plan-column-22 | 29 ++- .../queries-original-plan-column-26 | 2 +- .../queries-original-plan-column-27 | 18 +- .../queries-original-plan-column-28 | 18 +- .../queries-original-plan-column-29 | 19 +- .../queries-original-plan-column-3 | 16 +- .../queries-original-plan-column-30 | 13 +- .../queries-original-plan-column-31 | 13 +- .../queries-original-plan-column-32 | 13 +- .../queries-original-plan-column-33 | 13 +- .../queries-original-plan-column-34 | 13 +- .../queries-original-plan-column-35 | 20 +- .../queries-original-plan-column-36 | 13 +- .../queries-original-plan-column-37 | 13 +- .../queries-original-plan-column-38 | 13 +- .../queries-original-plan-column-39 | 20 +- .../queries-original-plan-column-4 | 33 ++- .../queries-original-plan-column-40 | 13 +- .../queries-original-plan-column-41 | 13 +- .../queries-original-plan-column-42 | 18 +- .../queries-original-plan-column-5 | 33 ++- .../queries-original-plan-column-6 | 16 +- .../queries-original-plan-column-7 | 13 +- .../queries-original-plan-column-8 | 34 ++- .../queries-original-plan-column-9 | 29 ++- .../queries-original-plan-row-0 | 19 +- .../queries-original-plan-row-1 | 19 +- .../queries-original-plan-row-10 | 34 ++- .../queries-original-plan-row-11 | 36 ++- .../queries-original-plan-row-12 | 18 +- .../queries-original-plan-row-13 | 34 ++- .../queries-original-plan-row-14 | 20 +- .../queries-original-plan-row-15 | 18 +- .../queries-original-plan-row-16 | 20 +- .../queries-original-plan-row-17 | 20 +- .../queries-original-plan-row-18 | 20 +- .../queries-original-plan-row-2 | 19 +- .../queries-original-plan-row-20 | 19 +- .../queries-original-plan-row-21 | 18 +- .../queries-original-plan-row-22 | 29 ++- .../queries-original-plan-row-26 | 2 +- .../queries-original-plan-row-27 | 18 +- .../queries-original-plan-row-28 | 18 +- .../queries-original-plan-row-29 | 19 +- .../queries-original-plan-row-3 | 19 +- .../queries-original-plan-row-30 | 20 +- .../queries-original-plan-row-31 | 20 +- .../queries-original-plan-row-32 | 20 +- .../queries-original-plan-row-33 | 18 +- .../queries-original-plan-row-34 | 20 +- .../queries-original-plan-row-35 | 20 +- .../queries-original-plan-row-36 | 18 +- .../queries-original-plan-row-37 | 18 +- .../queries-original-plan-row-38 | 18 +- .../queries-original-plan-row-39 | 20 +- .../queries-original-plan-row-4 | 33 ++- .../queries-original-plan-row-40 | 20 +- .../queries-original-plan-row-41 | 20 +- .../queries-original-plan-row-42 | 18 +- .../queries-original-plan-row-5 | 33 ++- .../queries-original-plan-row-6 | 19 +- .../queries-original-plan-row-7 | 18 +- .../queries-original-plan-row-8 | 34 ++- .../queries-original-plan-row-9 | 29 ++- .../query_2.plan | 18 +- .../query_3.plan | 18 +- .../query_4.plan | 18 +- .../query_5.plan | 18 +- .../query_1.plan | 4 +- .../query_16.plan | 19 +- .../query_2.plan | 19 +- .../query_3.plan | 19 +- .../query_7.plan | 19 +- .../query_8.plan | 19 +- .../query_1.plan | 2 +- .../query_10.plan | 2 +- .../query_11.plan | 2 +- .../query_12.plan | 2 +- .../query_2.plan | 2 +- .../query_3.plan | 2 +- .../query_4.plan | 2 +- .../query_5.plan | 2 +- .../query_7.plan | 2 +- .../query_8.plan | 2 +- .../query_9.plan | 2 +- .../query_7.plan | 2 +- .../query_8.plan | 2 +- .../query_1.plan | 2 +- .../query_8.plan | 2 +- .../query_13.plan | 2 +- .../query_4.plan | 18 +- .../query_8.plan | 2 +- .../query_9.plan | 2 +- .../query_14.plan | 6 +- .../query_4.plan | 2 +- .../query_5.plan | 2 +- .../query_6.plan | 2 +- .../query_7.plan | 2 +- .../query_1.plan | 16 +- .../query_2.plan | 16 +- .../query_3.plan | 16 +- .../query_4.plan | 20 +- .../query_5.plan | 35 ++- .../query_1.plan | 2 +- .../query_2.plan | 2 +- .../query_3.plan | 2 +- .../query_4.plan | 2 +- .../query_5.plan | 21 +- .../query_6.plan | 3 +- .../query_1.plan | 19 +- .../query_2.plan | 19 +- .../query_100.plan | 2 +- .../query_101.plan | 21 +- .../query_102.plan | 2 +- .../query_103.plan | 21 +- .../query_104.plan | 2 +- .../query_105.plan | 2 +- .../query_106.plan | 2 +- .../query_107.plan | 2 +- .../query_108.plan | 2 +- .../query_109.plan | 2 +- .../query_11.plan | 21 +- .../query_110.plan | 2 +- .../query_111.plan | 2 +- .../query_112.plan | 2 +- .../query_114.plan | 21 +- .../query_115.plan | 21 +- .../query_117.plan | 2 +- .../query_119.plan | 2 +- .../query_12.plan | 2 +- .../query_120.plan | 2 +- .../query_121.plan | 21 +- .../query_122.plan | 2 +- .../query_123.plan | 2 +- .../query_125.plan | 2 +- .../query_127.plan | 2 +- .../query_13.plan | 21 +- .../query_14.plan | 2 +- .../query_15.plan | 2 +- .../query_16.plan | 19 +- .../query_17.plan | 21 +- .../query_18.plan | 21 +- .../query_19.plan | 2 +- .../query_2.plan | 19 +- .../query_20.plan | 21 +- .../query_21.plan | 2 +- .../query_22.plan | 2 +- .../query_23.plan | 2 +- .../query_24.plan | 2 +- .../query_25.plan | 21 +- .../query_27.plan | 2 +- .../query_28.plan | 2 +- .../query_29.plan | 2 +- .../query_3.plan | 2 +- .../query_30.plan | 2 +- .../query_31.plan | 21 +- .../query_33.plan | 2 +- .../query_34.plan | 2 +- .../query_36.plan | 2 +- .../query_37.plan | 2 +- .../query_38.plan | 2 +- .../query_39.plan | 2 +- .../query_4.plan | 2 +- .../query_40.plan | 2 +- .../query_42.plan | 2 +- .../query_44.plan | 2 +- .../query_45.plan | 2 +- .../query_46.plan | 2 +- .../query_47.plan | 2 +- .../query_48.plan | 2 +- .../query_49.plan | 21 +- .../query_5.plan | 2 +- .../query_50.plan | 2 +- .../query_51.plan | 2 +- .../query_52.plan | 2 +- .../query_53.plan | 2 +- .../query_54.plan | 2 +- .../query_55.plan | 2 +- .../query_56.plan | 2 +- .../query_57.plan | 2 +- .../query_6.plan | 2 +- .../query_60.plan | 2 +- .../query_61.plan | 2 +- .../query_62.plan | 2 +- .../query_63.plan | 2 +- .../query_65.plan | 2 +- .../query_67.plan | 2 +- .../query_68.plan | 2 +- .../query_69.plan | 2 +- .../query_70.plan | 2 +- .../query_71.plan | 2 +- .../query_73.plan | 2 +- .../query_74.plan | 19 +- .../query_75.plan | 2 +- .../query_76.plan | 21 +- .../query_77.plan | 2 +- .../query_78.plan | 2 +- .../query_79.plan | 2 +- .../query_8.plan | 21 +- .../query_80.plan | 2 +- .../query_82.plan | 21 +- .../query_83.plan | 2 +- .../query_84.plan | 2 +- .../query_85.plan | 21 +- .../query_86.plan | 2 +- .../query_87.plan | 2 +- .../query_88.plan | 2 +- .../query_89.plan | 2 +- .../query_9.plan | 2 +- .../query_90.plan | 2 +- .../query_91.plan | 2 +- .../query_94.plan | 2 +- .../query_95.plan | 2 +- .../query_97.plan | 2 +- .../query_98.plan | 2 +- .../query_99.plan | 2 +- .../query_1.plan | 2 +- .../query_10.plan | 2 +- .../query_101.plan | 2 +- .../query_102.plan | 21 +- .../query_103.plan | 2 +- .../query_104.plan | 2 +- .../query_106.plan | 2 +- .../query_107.plan | 2 +- .../query_108.plan | 2 +- .../query_11.plan | 2 +- .../query_110.plan | 21 +- .../query_111.plan | 2 +- .../query_112.plan | 21 +- .../query_113.plan | 19 +- .../query_114.plan | 2 +- .../query_115.plan | 2 +- .../query_116.plan | 2 +- .../query_118.plan | 2 +- .../query_121.plan | 2 +- .../query_122.plan | 2 +- .../query_123.plan | 2 +- .../query_125.plan | 2 +- .../query_126.plan | 2 +- .../query_128.plan | 2 +- .../query_129.plan | 2 +- .../query_130.plan | 21 +- .../query_131.plan | 2 +- .../query_133.plan | 2 +- .../query_134.plan | 2 +- .../query_135.plan | 2 +- .../query_136.plan | 2 +- .../query_138.plan | 2 +- .../query_14.plan | 2 +- .../query_141.plan | 2 +- .../query_142.plan | 2 +- .../query_143.plan | 2 +- .../query_15.plan | 21 +- .../query_17.plan | 2 +- .../query_19.plan | 2 +- .../query_2.plan | 21 +- .../query_20.plan | 2 +- .../query_21.plan | 2 +- .../query_22.plan | 2 +- .../query_23.plan | 2 +- .../query_24.plan | 2 +- .../query_26.plan | 2 +- .../query_27.plan | 2 +- .../query_28.plan | 2 +- .../query_29.plan | 2 +- .../query_31.plan | 2 +- .../query_32.plan | 2 +- .../query_33.plan | 2 +- .../query_34.plan | 2 +- .../query_35.plan | 2 +- .../query_36.plan | 2 +- .../query_39.plan | 2 +- .../query_4.plan | 2 +- .../query_40.plan | 2 +- .../query_41.plan | 2 +- .../query_42.plan | 21 +- .../query_43.plan | 2 +- .../query_44.plan | 21 +- .../query_45.plan | 2 +- .../query_46.plan | 2 +- .../query_47.plan | 2 +- .../query_48.plan | 2 +- .../query_49.plan | 2 +- .../query_50.plan | 2 +- .../query_51.plan | 2 +- .../query_52.plan | 2 +- .../query_54.plan | 21 +- .../query_55.plan | 21 +- .../query_59.plan | 2 +- .../query_60.plan | 21 +- .../query_61.plan | 2 +- .../query_62.plan | 2 +- .../query_63.plan | 2 +- .../query_64.plan | 2 +- .../query_65.plan | 2 +- .../query_66.plan | 2 +- .../query_67.plan | 2 +- .../query_68.plan | 2 +- .../query_69.plan | 21 +- .../query_7.plan | 21 +- .../query_71.plan | 2 +- .../query_72.plan | 2 +- .../query_73.plan | 2 +- .../query_74.plan | 2 +- .../query_75.plan | 2 +- .../query_76.plan | 2 +- .../query_77.plan | 21 +- .../query_78.plan | 2 +- .../query_79.plan | 2 +- .../query_8.plan | 21 +- .../query_82.plan | 2 +- .../query_83.plan | 19 +- .../query_84.plan | 2 +- .../query_85.plan | 2 +- .../query_86.plan | 2 +- .../query_87.plan | 2 +- .../query_89.plan | 21 +- .../query_9.plan | 2 +- .../query_90.plan | 21 +- .../query_91.plan | 21 +- .../query_92.plan | 21 +- .../query_93.plan | 2 +- .../query_95.plan | 2 +- .../query_96.plan | 2 +- .../query_97.plan | 21 +- .../query_98.plan | 2 +- .../query_99.plan | 21 +- .../query_1.plan | 21 +- .../query_10.plan | 2 +- .../query_100.plan | 2 +- .../query_101.plan | 2 +- .../query_102.plan | 2 +- .../query_103.plan | 2 +- .../query_104.plan | 2 +- .../query_105.plan | 2 +- .../query_106.plan | 2 +- .../query_107.plan | 2 +- .../query_108.plan | 21 +- .../query_109.plan | 2 +- .../query_11.plan | 2 +- .../query_110.plan | 21 +- .../query_111.plan | 21 +- .../query_112.plan | 21 +- .../query_113.plan | 21 +- .../query_114.plan | 21 +- .../query_116.plan | 2 +- .../query_117.plan | 2 +- .../query_119.plan | 21 +- .../query_120.plan | 21 +- .../query_122.plan | 2 +- .../query_125.plan | 2 +- .../query_126.plan | 2 +- .../query_127.plan | 21 +- .../query_128.plan | 19 +- .../query_129.plan | 2 +- .../query_13.plan | 21 +- .../query_131.plan | 2 +- .../query_132.plan | 21 +- .../query_133.plan | 2 +- .../query_134.plan | 2 +- .../query_136.plan | 2 +- .../query_137.plan | 21 +- .../query_139.plan | 2 +- .../query_14.plan | 2 +- .../query_140.plan | 2 +- .../query_141.plan | 21 +- .../query_16.plan | 2 +- .../query_17.plan | 2 +- .../query_18.plan | 2 +- .../query_19.plan | 21 +- .../query_2.plan | 2 +- .../query_20.plan | 2 +- .../query_21.plan | 2 +- .../query_22.plan | 2 +- .../query_23.plan | 2 +- .../query_25.plan | 21 +- .../query_27.plan | 2 +- .../query_29.plan | 2 +- .../query_3.plan | 21 +- .../query_31.plan | 2 +- .../query_33.plan | 21 +- .../query_34.plan | 2 +- .../query_35.plan | 2 +- .../query_36.plan | 2 +- .../query_38.plan | 2 +- .../query_39.plan | 2 +- .../query_4.plan | 2 +- .../query_40.plan | 2 +- .../query_41.plan | 21 +- .../query_42.plan | 2 +- .../query_43.plan | 2 +- .../query_44.plan | 2 +- .../query_45.plan | 2 +- .../query_46.plan | 2 +- .../query_47.plan | 2 +- .../query_49.plan | 21 +- .../query_5.plan | 2 +- .../query_50.plan | 2 +- .../query_52.plan | 21 +- .../query_53.plan | 2 +- .../query_54.plan | 2 +- .../query_55.plan | 2 +- .../query_56.plan | 2 +- .../query_57.plan | 2 +- .../query_58.plan | 2 +- .../query_59.plan | 21 +- .../query_6.plan | 21 +- .../query_60.plan | 2 +- .../query_61.plan | 2 +- .../query_62.plan | 2 +- .../query_63.plan | 21 +- .../query_64.plan | 21 +- .../query_65.plan | 2 +- .../query_67.plan | 2 +- .../query_68.plan | 2 +- .../query_7.plan | 21 +- .../query_71.plan | 2 +- .../query_72.plan | 21 +- .../query_73.plan | 2 +- .../query_76.plan | 2 +- .../query_78.plan | 2 +- .../query_79.plan | 2 +- .../query_8.plan | 21 +- .../query_80.plan | 2 +- .../query_82.plan | 2 +- .../query_83.plan | 2 +- .../query_84.plan | 2 +- .../query_85.plan | 2 +- .../query_86.plan | 2 +- .../query_87.plan | 21 +- .../query_88.plan | 2 +- .../query_9.plan | 2 +- .../query_91.plan | 2 +- .../query_92.plan | 21 +- .../query_93.plan | 2 +- .../query_94.plan | 2 +- .../query_96.plan | 2 +- .../query_97.plan | 2 +- .../query_99.plan | 2 +- .../query_1.plan | 2 +- .../query_10.plan | 2 +- .../query_100.plan | 2 +- .../query_101.plan | 2 +- .../query_102.plan | 2 +- .../query_103.plan | 2 +- .../query_104.plan | 2 +- .../query_106.plan | 2 +- .../query_107.plan | 21 +- .../query_108.plan | 2 +- .../query_109.plan | 2 +- .../query_11.plan | 2 +- .../query_110.plan | 21 +- .../query_111.plan | 21 +- .../query_112.plan | 2 +- .../query_113.plan | 2 +- .../query_114.plan | 21 +- .../query_115.plan | 21 +- .../query_116.plan | 19 +- .../query_117.plan | 2 +- .../query_118.plan | 2 +- .../query_119.plan | 2 +- .../query_12.plan | 21 +- .../query_120.plan | 2 +- .../query_121.plan | 2 +- .../query_123.plan | 21 +- .../query_124.plan | 2 +- .../query_125.plan | 2 +- .../query_126.plan | 21 +- .../query_127.plan | 2 +- .../query_128.plan | 2 +- .../query_129.plan | 2 +- .../query_130.plan | 2 +- .../query_131.plan | 2 +- .../query_133.plan | 21 +- .../query_134.plan | 21 +- .../query_135.plan | 2 +- .../query_14.plan | 2 +- .../query_15.plan | 2 +- .../query_16.plan | 2 +- .../query_17.plan | 2 +- .../query_18.plan | 2 +- .../query_19.plan | 2 +- .../query_2.plan | 21 +- .../query_20.plan | 2 +- .../query_21.plan | 21 +- .../query_23.plan | 2 +- .../query_24.plan | 21 +- .../query_25.plan | 2 +- .../query_26.plan | 2 +- .../query_27.plan | 2 +- .../query_28.plan | 2 +- .../query_3.plan | 21 +- .../query_30.plan | 2 +- .../query_31.plan | 21 +- .../query_32.plan | 2 +- .../query_33.plan | 2 +- .../query_34.plan | 2 +- .../query_35.plan | 2 +- .../query_36.plan | 2 +- .../query_37.plan | 2 +- .../query_38.plan | 2 +- .../query_39.plan | 2 +- .../query_4.plan | 2 +- .../query_40.plan | 21 +- .../query_41.plan | 2 +- .../query_42.plan | 2 +- .../query_43.plan | 2 +- .../query_44.plan | 21 +- .../query_46.plan | 2 +- .../query_47.plan | 2 +- .../query_49.plan | 2 +- .../query_5.plan | 21 +- .../query_50.plan | 2 +- .../query_52.plan | 2 +- .../query_53.plan | 2 +- .../query_55.plan | 21 +- .../query_56.plan | 2 +- .../query_59.plan | 2 +- .../query_6.plan | 2 +- .../query_60.plan | 21 +- .../query_61.plan | 2 +- .../query_63.plan | 2 +- .../query_64.plan | 2 +- .../query_65.plan | 21 +- .../query_66.plan | 2 +- .../query_67.plan | 2 +- .../query_69.plan | 2 +- .../query_7.plan | 2 +- .../query_70.plan | 2 +- .../query_71.plan | 2 +- .../query_72.plan | 2 +- .../query_73.plan | 2 +- .../query_74.plan | 2 +- .../query_77.plan | 2 +- .../query_78.plan | 2 +- .../query_79.plan | 2 +- .../query_8.plan | 2 +- .../query_80.plan | 2 +- .../query_81.plan | 21 +- .../query_82.plan | 2 +- .../query_83.plan | 2 +- .../query_84.plan | 21 +- .../query_85.plan | 2 +- .../query_86.plan | 2 +- .../query_88.plan | 2 +- .../query_89.plan | 21 +- .../query_9.plan | 2 +- .../query_90.plan | 21 +- .../query_91.plan | 21 +- .../query_92.plan | 2 +- .../query_93.plan | 2 +- .../query_94.plan | 2 +- .../query_95.plan | 21 +- .../query_96.plan | 2 +- .../query_97.plan | 2 +- .../query_98.plan | 21 +- .../query_10.plan | 2 +- .../query_11.plan | 21 +- .../query_12.plan | 2 +- .../query_14.plan | 2 +- .../query_15.plan | 2 +- .../query_17.plan | 2 +- .../query_19.plan | 2 +- .../query_2.plan | 2 +- .../query_21.plan | 2 +- .../query_23.plan | 2 +- .../query_24.plan | 21 +- .../query_26.plan | 21 +- .../query_27.plan | 2 +- .../query_28.plan | 2 +- .../query_29.plan | 21 +- .../query_30.plan | 21 +- .../query_32.plan | 2 +- .../query_33.plan | 2 +- .../query_34.plan | 21 +- .../query_35.plan | 2 +- .../query_36.plan | 2 +- .../query_37.plan | 2 +- .../query_38.plan | 2 +- .../query_39.plan | 2 +- .../query_4.plan | 2 +- .../query_5.plan | 2 +- .../query_6.plan | 2 +- .../query_7.plan | 2 +- .../query_8.plan | 21 +- .../query_9.plan | 2 +- .../query_1.plan | 19 +- .../query_10.plan | 21 +- .../query_100.plan | 2 +- .../query_101.plan | 2 +- .../query_102.plan | 2 +- .../query_104.plan | 2 +- .../query_106.plan | 2 +- .../query_107.plan | 19 +- .../query_109.plan | 21 +- .../query_11.plan | 21 +- .../query_111.plan | 21 +- .../query_112.plan | 2 +- .../query_113.plan | 2 +- .../query_116.plan | 21 +- .../query_117.plan | 2 +- .../query_119.plan | 2 +- .../query_12.plan | 2 +- .../query_121.plan | 2 +- .../query_122.plan | 21 +- .../query_123.plan | 2 +- .../query_124.plan | 2 +- .../query_125.plan | 21 +- .../query_126.plan | 2 +- .../query_128.plan | 2 +- .../query_129.plan | 2 +- .../query_13.plan | 2 +- .../query_130.plan | 2 +- .../query_131.plan | 2 +- .../query_132.plan | 2 +- .../query_134.plan | 2 +- .../query_135.plan | 2 +- .../query_137.plan | 21 +- .../query_14.plan | 2 +- .../query_15.plan | 21 +- .../query_16.plan | 2 +- .../query_17.plan | 2 +- .../query_18.plan | 2 +- .../query_19.plan | 2 +- .../query_2.plan | 2 +- .../query_20.plan | 21 +- .../query_21.plan | 2 +- .../query_25.plan | 21 +- .../query_26.plan | 2 +- .../query_27.plan | 2 +- .../query_29.plan | 21 +- .../query_3.plan | 2 +- .../query_31.plan | 2 +- .../query_33.plan | 2 +- .../query_34.plan | 2 +- .../query_37.plan | 2 +- .../query_38.plan | 2 +- .../query_39.plan | 2 +- .../query_40.plan | 19 +- .../query_41.plan | 2 +- .../query_42.plan | 2 +- .../query_43.plan | 2 +- .../query_44.plan | 2 +- .../query_45.plan | 2 +- .../query_46.plan | 2 +- .../query_47.plan | 2 +- .../query_48.plan | 21 +- .../query_49.plan | 2 +- .../query_51.plan | 21 +- .../query_52.plan | 21 +- .../query_53.plan | 2 +- .../query_54.plan | 2 +- .../query_55.plan | 2 +- .../query_56.plan | 2 +- .../query_59.plan | 2 +- .../query_6.plan | 2 +- .../query_60.plan | 21 +- .../query_61.plan | 2 +- .../query_62.plan | 2 +- .../query_63.plan | 2 +- .../query_65.plan | 21 +- .../query_66.plan | 2 +- .../query_68.plan | 2 +- .../query_7.plan | 2 +- .../query_70.plan | 2 +- .../query_71.plan | 2 +- .../query_72.plan | 2 +- .../query_73.plan | 2 +- .../query_74.plan | 2 +- .../query_75.plan | 21 +- .../query_76.plan | 2 +- .../query_77.plan | 2 +- .../query_78.plan | 2 +- .../query_8.plan | 21 +- .../query_80.plan | 2 +- .../query_81.plan | 2 +- .../query_82.plan | 2 +- .../query_84.plan | 2 +- .../query_85.plan | 2 +- .../query_86.plan | 2 +- .../query_87.plan | 2 +- .../query_88.plan | 2 +- .../query_89.plan | 21 +- .../query_9.plan | 2 +- .../query_90.plan | 2 +- .../query_91.plan | 21 +- .../query_92.plan | 2 +- .../query_94.plan | 21 +- .../query_96.plan | 2 +- .../query_98.plan | 2 +- .../query_99.plan | 2 +- .../query_1.plan | 21 +- .../query_10.plan | 2 +- .../query_102.plan | 21 +- .../query_103.plan | 2 +- .../query_104.plan | 2 +- .../query_105.plan | 2 +- .../query_106.plan | 2 +- .../query_107.plan | 2 +- .../query_108.plan | 2 +- .../query_109.plan | 2 +- .../query_11.plan | 2 +- .../query_110.plan | 2 +- .../query_111.plan | 2 +- .../query_112.plan | 2 +- .../query_113.plan | 2 +- .../query_114.plan | 2 +- .../query_115.plan | 2 +- .../query_116.plan | 2 +- .../query_117.plan | 2 +- .../query_118.plan | 2 +- .../query_119.plan | 21 +- .../query_12.plan | 2 +- .../query_121.plan | 21 +- .../query_123.plan | 2 +- .../query_124.plan | 2 +- .../query_125.plan | 2 +- .../query_126.plan | 2 +- .../query_127.plan | 21 +- .../query_128.plan | 2 +- .../query_129.plan | 2 +- .../query_13.plan | 2 +- .../query_130.plan | 2 +- .../query_132.plan | 2 +- .../query_133.plan | 21 +- .../query_135.plan | 2 +- .../query_136.plan | 2 +- .../query_137.plan | 21 +- .../query_138.plan | 2 +- .../query_139.plan | 21 +- .../query_143.plan | 21 +- .../query_144.plan | 2 +- .../query_145.plan | 2 +- .../query_146.plan | 2 +- .../query_147.plan | 2 +- .../query_148.plan | 2 +- .../query_149.plan | 2 +- .../query_15.plan | 2 +- .../query_150.plan | 2 +- .../query_152.plan | 2 +- .../query_153.plan | 2 +- .../query_154.plan | 2 +- .../query_155.plan | 21 +- .../query_157.plan | 21 +- .../query_158.plan | 2 +- .../query_16.plan | 2 +- .../query_17.plan | 2 +- .../query_18.plan | 2 +- .../query_19.plan | 2 +- .../query_2.plan | 21 +- .../query_21.plan | 2 +- .../query_22.plan | 2 +- .../query_23.plan | 2 +- .../query_24.plan | 2 +- .../query_25.plan | 21 +- .../query_26.plan | 2 +- .../query_27.plan | 2 +- .../query_28.plan | 2 +- .../query_3.plan | 2 +- .../query_31.plan | 2 +- .../query_32.plan | 2 +- .../query_34.plan | 2 +- .../query_35.plan | 2 +- .../query_36.plan | 2 +- .../query_38.plan | 21 +- .../query_39.plan | 2 +- .../query_4.plan | 21 +- .../query_40.plan | 21 +- .../query_42.plan | 2 +- .../query_43.plan | 2 +- .../query_44.plan | 2 +- .../query_45.plan | 2 +- .../query_46.plan | 2 +- .../query_47.plan | 2 +- .../query_49.plan | 2 +- .../query_5.plan | 2 +- .../query_50.plan | 2 +- .../query_51.plan | 2 +- .../query_52.plan | 2 +- .../query_53.plan | 2 +- .../query_54.plan | 2 +- .../query_55.plan | 21 +- .../query_56.plan | 2 +- .../query_57.plan | 21 +- .../query_58.plan | 2 +- .../query_59.plan | 2 +- .../query_6.plan | 2 +- .../query_60.plan | 2 +- .../query_61.plan | 21 +- .../query_63.plan | 2 +- .../query_64.plan | 2 +- .../query_65.plan | 2 +- .../query_66.plan | 2 +- .../query_67.plan | 21 +- .../query_68.plan | 2 +- .../query_7.plan | 2 +- .../query_70.plan | 2 +- .../query_71.plan | 2 +- .../query_72.plan | 2 +- .../query_73.plan | 2 +- .../query_74.plan | 2 +- .../query_75.plan | 21 +- .../query_76.plan | 2 +- .../query_77.plan | 19 +- .../query_78.plan | 2 +- .../query_80.plan | 2 +- .../query_81.plan | 2 +- .../query_84.plan | 2 +- .../query_85.plan | 21 +- .../query_86.plan | 2 +- .../query_87.plan | 2 +- .../query_88.plan | 2 +- .../query_89.plan | 21 +- .../query_9.plan | 2 +- .../query_90.plan | 2 +- .../query_91.plan | 21 +- .../query_93.plan | 2 +- .../query_94.plan | 2 +- .../query_95.plan | 2 +- .../query_96.plan | 2 +- .../query_97.plan | 21 +- .../query_98.plan | 21 +- .../query_99.plan | 2 +- .../query_1.plan | 2 +- .../query_10.plan | 21 +- .../query_100.plan | 2 +- .../query_101.plan | 2 +- .../query_102.plan | 2 +- .../query_103.plan | 2 +- .../query_105.plan | 2 +- .../query_107.plan | 19 +- .../query_108.plan | 2 +- .../query_11.plan | 2 +- .../query_110.plan | 2 +- .../query_111.plan | 19 +- .../query_112.plan | 21 +- .../query_113.plan | 2 +- .../query_114.plan | 21 +- .../query_116.plan | 2 +- .../query_117.plan | 21 +- .../query_118.plan | 2 +- .../query_119.plan | 2 +- .../query_12.plan | 2 +- .../query_121.plan | 2 +- .../query_123.plan | 2 +- .../query_124.plan | 2 +- .../query_125.plan | 2 +- .../query_126.plan | 2 +- .../query_127.plan | 2 +- .../query_128.plan | 2 +- .../query_129.plan | 2 +- .../query_13.plan | 21 +- .../query_130.plan | 2 +- .../query_131.plan | 2 +- .../query_132.plan | 2 +- .../query_135.plan | 21 +- .../query_137.plan | 2 +- .../query_138.plan | 2 +- .../query_139.plan | 2 +- .../query_14.plan | 2 +- .../query_140.plan | 21 +- .../query_142.plan | 2 +- .../query_144.plan | 21 +- .../query_145.plan | 21 +- .../query_146.plan | 2 +- .../query_147.plan | 21 +- .../query_15.plan | 2 +- .../query_16.plan | 2 +- .../query_17.plan | 21 +- .../query_18.plan | 2 +- .../query_19.plan | 2 +- .../query_2.plan | 21 +- .../query_21.plan | 2 +- .../query_22.plan | 2 +- .../query_24.plan | 21 +- .../query_25.plan | 2 +- .../query_26.plan | 2 +- .../query_27.plan | 21 +- .../query_29.plan | 2 +- .../query_3.plan | 2 +- .../query_30.plan | 2 +- .../query_31.plan | 21 +- .../query_32.plan | 2 +- .../query_33.plan | 2 +- .../query_34.plan | 2 +- .../query_35.plan | 2 +- .../query_36.plan | 2 +- .../query_37.plan | 2 +- .../query_39.plan | 2 +- .../query_40.plan | 2 +- .../query_41.plan | 2 +- .../query_43.plan | 2 +- .../query_44.plan | 21 +- .../query_47.plan | 2 +- .../query_48.plan | 21 +- .../query_49.plan | 2 +- .../query_5.plan | 21 +- .../query_50.plan | 2 +- .../query_51.plan | 21 +- .../query_52.plan | 2 +- .../query_53.plan | 2 +- .../query_54.plan | 21 +- .../query_56.plan | 2 +- .../query_57.plan | 2 +- .../query_58.plan | 2 +- .../query_59.plan | 21 +- .../query_6.plan | 21 +- .../query_60.plan | 2 +- .../query_61.plan | 2 +- .../query_62.plan | 2 +- .../query_64.plan | 2 +- .../query_67.plan | 2 +- .../query_69.plan | 19 +- .../query_70.plan | 21 +- .../query_71.plan | 2 +- .../query_72.plan | 2 +- .../query_73.plan | 2 +- .../query_74.plan | 21 +- .../query_75.plan | 2 +- .../query_76.plan | 2 +- .../query_77.plan | 2 +- .../query_78.plan | 21 +- .../query_79.plan | 21 +- .../query_8.plan | 21 +- .../query_80.plan | 2 +- .../query_82.plan | 21 +- .../query_83.plan | 2 +- .../query_85.plan | 21 +- .../query_87.plan | 2 +- .../query_88.plan | 2 +- .../query_89.plan | 2 +- .../query_9.plan | 21 +- .../query_90.plan | 2 +- .../query_91.plan | 2 +- .../query_92.plan | 2 +- .../query_93.plan | 2 +- .../query_94.plan | 2 +- .../query_95.plan | 2 +- .../query_97.plan | 2 +- .../query_1.plan | 2 +- .../query_10.plan | 21 +- .../query_100.plan | 2 +- .../query_101.plan | 2 +- .../query_102.plan | 21 +- .../query_105.plan | 2 +- .../query_106.plan | 2 +- .../query_107.plan | 21 +- .../query_108.plan | 2 +- .../query_109.plan | 2 +- .../query_11.plan | 2 +- .../query_111.plan | 21 +- .../query_112.plan | 2 +- .../query_114.plan | 21 +- .../query_115.plan | 2 +- .../query_116.plan | 2 +- .../query_117.plan | 2 +- .../query_118.plan | 2 +- .../query_119.plan | 2 +- .../query_12.plan | 2 +- .../query_120.plan | 21 +- .../query_121.plan | 2 +- .../query_123.plan | 2 +- .../query_125.plan | 2 +- .../query_126.plan | 2 +- .../query_128.plan | 2 +- .../query_129.plan | 2 +- .../query_13.plan | 2 +- .../query_130.plan | 2 +- .../query_131.plan | 2 +- .../query_132.plan | 2 +- .../query_133.plan | 2 +- .../query_134.plan | 21 +- .../query_135.plan | 2 +- .../query_14.plan | 21 +- .../query_15.plan | 2 +- .../query_16.plan | 2 +- .../query_17.plan | 2 +- .../query_18.plan | 2 +- .../query_19.plan | 21 +- .../query_2.plan | 21 +- .../query_20.plan | 21 +- .../query_22.plan | 2 +- .../query_23.plan | 2 +- .../query_24.plan | 2 +- .../query_25.plan | 2 +- .../query_27.plan | 2 +- .../query_28.plan | 21 +- .../query_29.plan | 2 +- .../query_3.plan | 2 +- .../query_32.plan | 2 +- .../query_33.plan | 21 +- .../query_35.plan | 2 +- .../query_36.plan | 2 +- .../query_37.plan | 21 +- .../query_39.plan | 21 +- .../query_40.plan | 2 +- .../query_41.plan | 2 +- .../query_42.plan | 2 +- .../query_43.plan | 2 +- .../query_44.plan | 2 +- .../query_45.plan | 21 +- .../query_48.plan | 2 +- .../query_49.plan | 2 +- .../query_5.plan | 2 +- .../query_50.plan | 2 +- .../query_51.plan | 2 +- .../query_52.plan | 21 +- .../query_55.plan | 2 +- .../query_57.plan | 2 +- .../query_6.plan | 2 +- .../query_60.plan | 2 +- .../query_61.plan | 19 +- .../query_63.plan | 21 +- .../query_65.plan | 2 +- .../query_66.plan | 2 +- .../query_67.plan | 21 +- .../query_68.plan | 21 +- .../query_69.plan | 2 +- .../query_70.plan | 21 +- .../query_71.plan | 21 +- .../query_72.plan | 2 +- .../query_73.plan | 2 +- .../query_74.plan | 21 +- .../query_75.plan | 2 +- .../query_76.plan | 2 +- .../query_77.plan | 2 +- .../query_78.plan | 2 +- .../query_79.plan | 2 +- .../query_8.plan | 21 +- .../query_80.plan | 2 +- .../query_81.plan | 2 +- .../query_82.plan | 21 +- .../query_83.plan | 2 +- .../query_84.plan | 21 +- .../query_85.plan | 2 +- .../query_86.plan | 19 +- .../query_87.plan | 2 +- .../query_88.plan | 2 +- .../query_89.plan | 21 +- .../query_9.plan | 2 +- .../query_90.plan | 2 +- .../query_91.plan | 21 +- .../query_92.plan | 2 +- .../query_93.plan | 2 +- .../query_94.plan | 2 +- .../query_95.plan | 2 +- .../query_96.plan | 21 +- .../query_97.plan | 2 +- .../query_98.plan | 21 +- .../query_99.plan | 2 +- .../query_1.plan | 2 +- .../query_2.plan | 2 +- .../query_3.plan | 2 +- .../query_5.plan | 2 +- .../query_6.plan | 2 +- .../query_7.plan | 2 +- .../query_8.plan | 2 +- .../query_1.plan | 19 +- .../query_10.plan | 2 +- .../query_100.plan | 2 +- .../query_101.plan | 2 +- .../query_102.plan | 2 +- .../query_103.plan | 2 +- .../query_104.plan | 2 +- .../query_105.plan | 2 +- .../query_106.plan | 2 +- .../query_107.plan | 2 +- .../query_108.plan | 2 +- .../query_11.plan | 2 +- .../query_119.plan | 2 +- .../query_12.plan | 2 +- .../query_120.plan | 2 +- .../query_121.plan | 2 +- .../query_122.plan | 2 +- .../query_123.plan | 2 +- .../query_124.plan | 2 +- .../query_125.plan | 2 +- .../query_126.plan | 2 +- .../query_127.plan | 2 +- .../query_128.plan | 2 +- .../query_129.plan | 2 +- .../query_13.plan | 2 +- .../query_130.plan | 2 +- .../query_131.plan | 21 +- .../query_132.plan | 21 +- .../query_133.plan | 2 +- .../query_134.plan | 2 +- .../query_135.plan | 2 +- .../query_136.plan | 2 +- .../query_137.plan | 2 +- .../query_138.plan | 2 +- .../query_139.plan | 2 +- .../query_14.plan | 2 +- .../query_140.plan | 2 +- .../query_141.plan | 2 +- .../query_142.plan | 2 +- .../query_143.plan | 2 +- .../query_144.plan | 2 +- .../query_147.plan | 2 +- .../query_15.plan | 2 +- .../query_16.plan | 2 +- .../query_17.plan | 21 +- .../query_18.plan | 21 +- .../query_19.plan | 21 +- .../query_2.plan | 19 +- .../query_20.plan | 21 +- .../query_29.plan | 2 +- .../query_3.plan | 2 +- .../query_30.plan | 2 +- .../query_31.plan | 2 +- .../query_32.plan | 2 +- .../query_33.plan | 2 +- .../query_34.plan | 2 +- .../query_35.plan | 2 +- .../query_36.plan | 2 +- .../query_37.plan | 2 +- .../query_38.plan | 2 +- .../query_39.plan | 21 +- .../query_4.plan | 2 +- .../query_40.plan | 21 +- .../query_41.plan | 2 +- .../query_42.plan | 2 +- .../query_43.plan | 2 +- .../query_44.plan | 2 +- .../query_45.plan | 2 +- .../query_46.plan | 2 +- .../query_47.plan | 2 +- .../query_48.plan | 2 +- .../query_49.plan | 2 +- .../query_5.plan | 2 +- .../query_50.plan | 2 +- .../query_51.plan | 2 +- .../query_52.plan | 2 +- .../query_53.plan | 2 +- .../query_54.plan | 2 +- .../query_55.plan | 2 +- .../query_56.plan | 2 +- .../query_57.plan | 2 +- .../query_58.plan | 2 +- .../query_59.plan | 2 +- .../query_6.plan | 2 +- .../query_60.plan | 2 +- .../query_61.plan | 2 +- .../query_62.plan | 2 +- .../query_63.plan | 2 +- .../query_64.plan | 2 +- .../query_65.plan | 2 +- .../query_66.plan | 2 +- .../query_67.plan | 2 +- .../query_68.plan | 2 +- .../query_69.plan | 2 +- .../query_7.plan | 2 +- .../query_70.plan | 2 +- .../query_71.plan | 2 +- .../query_72.plan | 2 +- .../query_73.plan | 2 +- .../query_74.plan | 2 +- .../query_75.plan | 2 +- .../query_76.plan | 2 +- .../query_79.plan | 2 +- .../query_8.plan | 2 +- .../query_80.plan | 2 +- .../query_81.plan | 2 +- .../query_82.plan | 2 +- .../query_83.plan | 21 +- .../query_84.plan | 21 +- .../query_85.plan | 2 +- .../query_86.plan | 2 +- .../query_9.plan | 2 +- .../query_91.plan | 2 +- .../query_92.plan | 2 +- .../query_93.plan | 2 +- .../query_94.plan | 2 +- .../query_95.plan | 2 +- .../query_96.plan | 2 +- .../query_97.plan | 2 +- .../query_98.plan | 2 +- .../query_99.plan | 2 +- .../query_1.plan | 2 +- .../query_10.plan | 2 +- .../query_100.plan | 2 +- .../query_101.plan | 2 +- .../query_102.plan | 2 +- .../query_103.plan | 2 +- .../query_104.plan | 2 +- .../query_105.plan | 2 +- .../query_106.plan | 2 +- .../query_107.plan | 2 +- .../query_108.plan | 2 +- .../query_109.plan | 2 +- .../query_11.plan | 21 +- .../query_110.plan | 2 +- .../query_115.plan | 2 +- .../query_116.plan | 2 +- .../query_12.plan | 21 +- .../query_123.plan | 2 +- .../query_124.plan | 2 +- .../query_125.plan | 2 +- .../query_126.plan | 2 +- .../query_127.plan | 2 +- .../query_128.plan | 2 +- .../query_129.plan | 2 +- .../query_13.plan | 2 +- .../query_130.plan | 2 +- .../query_131.plan | 2 +- .../query_132.plan | 2 +- .../query_14.plan | 2 +- .../query_2.plan | 2 +- .../query_21.plan | 2 +- .../query_22.plan | 2 +- .../query_23.plan | 21 +- .../query_24.plan | 21 +- .../query_25.plan | 2 +- .../query_26.plan | 2 +- .../query_27.plan | 2 +- .../query_28.plan | 2 +- .../query_29.plan | 2 +- .../query_3.plan | 2 +- .../query_30.plan | 2 +- .../query_31.plan | 2 +- .../query_32.plan | 2 +- .../query_37.plan | 2 +- .../query_38.plan | 2 +- .../query_39.plan | 2 +- .../query_4.plan | 2 +- .../query_40.plan | 2 +- .../query_41.plan | 2 +- .../query_42.plan | 2 +- .../query_43.plan | 2 +- .../query_44.plan | 2 +- .../query_47.plan | 2 +- .../query_48.plan | 2 +- .../query_5.plan | 2 +- .../query_55.plan | 2 +- .../query_56.plan | 2 +- .../query_57.plan | 2 +- .../query_58.plan | 2 +- .../query_59.plan | 2 +- .../query_6.plan | 2 +- .../query_60.plan | 2 +- .../query_61.plan | 2 +- .../query_62.plan | 2 +- .../query_65.plan | 2 +- .../query_66.plan | 2 +- .../query_67.plan | 2 +- .../query_68.plan | 2 +- .../query_69.plan | 21 +- .../query_7.plan | 2 +- .../query_70.plan | 21 +- .../query_71.plan | 2 +- .../query_72.plan | 2 +- .../query_73.plan | 2 +- .../query_74.plan | 2 +- .../query_75.plan | 21 +- .../query_76.plan | 21 +- .../query_77.plan | 2 +- .../query_78.plan | 2 +- .../query_79.plan | 2 +- .../query_8.plan | 2 +- .../query_80.plan | 2 +- .../query_81.plan | 2 +- .../query_82.plan | 2 +- .../query_83.plan | 2 +- .../query_84.plan | 2 +- .../query_9.plan | 2 +- .../query_93.plan | 21 +- .../query_94.plan | 21 +- .../query_95.plan | 2 +- .../query_96.plan | 2 +- .../query_97.plan | 21 +- .../query_98.plan | 21 +- .../query_99.plan | 2 +- .../query_1.plan | 2 +- .../query_10.plan | 2 +- .../query_100.plan | 2 +- .../query_105.plan | 21 +- .../query_106.plan | 21 +- .../query_11.plan | 2 +- .../query_12.plan | 2 +- .../query_15.plan | 2 +- .../query_16.plan | 2 +- .../query_17.plan | 2 +- .../query_18.plan | 2 +- .../query_19.plan | 21 +- .../query_2.plan | 2 +- .../query_20.plan | 21 +- .../query_29.plan | 2 +- .../query_3.plan | 2 +- .../query_30.plan | 2 +- .../query_31.plan | 19 +- .../query_32.plan | 19 +- .../query_33.plan | 2 +- .../query_34.plan | 2 +- .../query_35.plan | 2 +- .../query_36.plan | 2 +- .../query_37.plan | 2 +- .../query_38.plan | 2 +- .../query_39.plan | 2 +- .../query_4.plan | 2 +- .../query_40.plan | 2 +- .../query_43.plan | 21 +- .../query_44.plan | 21 +- .../query_45.plan | 21 +- .../query_46.plan | 21 +- .../query_47.plan | 21 +- .../query_48.plan | 21 +- .../query_49.plan | 2 +- .../query_5.plan | 21 +- .../query_50.plan | 2 +- .../query_51.plan | 2 +- .../query_52.plan | 2 +- .../query_53.plan | 2 +- .../query_54.plan | 2 +- .../query_55.plan | 2 +- .../query_56.plan | 2 +- .../query_57.plan | 2 +- .../query_58.plan | 2 +- .../query_6.plan | 21 +- .../query_61.plan | 2 +- .../query_62.plan | 2 +- .../query_63.plan | 2 +- .../query_64.plan | 2 +- .../query_65.plan | 2 +- .../query_66.plan | 2 +- .../query_67.plan | 2 +- .../query_68.plan | 2 +- .../query_69.plan | 2 +- .../query_7.plan | 2 +- .../query_70.plan | 2 +- .../query_73.plan | 2 +- .../query_74.plan | 2 +- .../query_75.plan | 2 +- .../query_76.plan | 2 +- .../query_77.plan | 2 +- .../query_78.plan | 2 +- .../query_79.plan | 2 +- .../query_8.plan | 2 +- .../query_80.plan | 2 +- .../query_81.plan | 2 +- .../query_82.plan | 2 +- .../query_83.plan | 2 +- .../query_84.plan | 2 +- .../query_85.plan | 2 +- .../query_86.plan | 2 +- .../query_87.plan | 2 +- .../query_88.plan | 2 +- .../query_89.plan | 2 +- .../query_9.plan | 2 +- .../query_90.plan | 2 +- .../query_91.plan | 2 +- .../query_92.plan | 2 +- .../query_93.plan | 2 +- .../query_94.plan | 2 +- .../query_95.plan | 2 +- .../query_96.plan | 2 +- .../query_97.plan | 2 +- .../query_98.plan | 2 +- .../query_99.plan | 2 +- .../query_10.plan | 2 +- .../query_100.plan | 2 +- .../query_101.plan | 2 +- .../query_102.plan | 2 +- .../query_103.plan | 2 +- .../query_104.plan | 2 +- .../query_105.plan | 21 +- .../query_106.plan | 21 +- .../query_107.plan | 21 +- .../query_108.plan | 21 +- .../query_109.plan | 21 +- .../query_11.plan | 2 +- .../query_110.plan | 21 +- .../query_111.plan | 21 +- .../query_112.plan | 21 +- .../query_113.plan | 2 +- .../query_114.plan | 2 +- .../query_12.plan | 2 +- .../query_121.plan | 2 +- .../query_122.plan | 2 +- .../query_123.plan | 2 +- .../query_124.plan | 2 +- .../query_125.plan | 2 +- .../query_126.plan | 2 +- .../query_13.plan | 2 +- .../query_131.plan | 2 +- .../query_132.plan | 2 +- .../query_133.plan | 2 +- .../query_134.plan | 2 +- .../query_135.plan | 2 +- .../query_136.plan | 2 +- .../query_137.plan | 2 +- .../query_138.plan | 2 +- .../query_139.plan | 21 +- .../query_14.plan | 2 +- .../query_140.plan | 21 +- .../query_141.plan | 2 +- .../query_142.plan | 2 +- .../query_143.plan | 2 +- .../query_144.plan | 2 +- .../query_145.plan | 2 +- .../query_146.plan | 2 +- .../query_147.plan | 2 +- .../query_148.plan | 2 +- .../query_149.plan | 2 +- .../query_15.plan | 2 +- .../query_150.plan | 2 +- .../query_151.plan | 2 +- .../query_152.plan | 2 +- .../query_153.plan | 2 +- .../query_16.plan | 2 +- .../query_17.plan | 2 +- .../query_18.plan | 2 +- .../query_19.plan | 2 +- .../query_20.plan | 2 +- .../query_21.plan | 2 +- .../query_22.plan | 2 +- .../query_23.plan | 2 +- .../query_24.plan | 2 +- .../query_25.plan | 2 +- .../query_26.plan | 2 +- .../query_27.plan | 2 +- .../query_28.plan | 2 +- .../query_29.plan | 2 +- .../query_30.plan | 2 +- .../query_31.plan | 2 +- .../query_32.plan | 2 +- .../query_33.plan | 2 +- .../query_34.plan | 2 +- .../query_35.plan | 2 +- .../query_36.plan | 2 +- .../query_37.plan | 21 +- .../query_38.plan | 21 +- .../query_45.plan | 21 +- .../query_46.plan | 21 +- .../query_47.plan | 21 +- .../query_48.plan | 21 +- .../query_49.plan | 2 +- .../query_50.plan | 2 +- .../query_51.plan | 2 +- .../query_52.plan | 2 +- .../query_53.plan | 2 +- .../query_54.plan | 2 +- .../query_55.plan | 2 +- .../query_56.plan | 2 +- .../query_57.plan | 2 +- .../query_58.plan | 2 +- .../query_61.plan | 2 +- .../query_62.plan | 2 +- .../query_67.plan | 2 +- .../query_68.plan | 2 +- .../query_69.plan | 2 +- .../query_70.plan | 2 +- .../query_71.plan | 2 +- .../query_72.plan | 2 +- .../query_73.plan | 21 +- .../query_74.plan | 21 +- .../query_75.plan | 2 +- .../query_76.plan | 2 +- .../query_77.plan | 21 +- .../query_78.plan | 21 +- .../query_79.plan | 21 +- .../query_80.plan | 21 +- .../query_81.plan | 21 +- .../query_82.plan | 21 +- .../query_83.plan | 2 +- .../query_84.plan | 2 +- .../query_85.plan | 21 +- .../query_86.plan | 21 +- .../query_87.plan | 2 +- .../query_88.plan | 2 +- .../query_9.plan | 2 +- .../query_91.plan | 2 +- .../query_92.plan | 2 +- .../query_93.plan | 2 +- .../query_94.plan | 2 +- .../query_95.plan | 2 +- .../query_96.plan | 2 +- .../query_97.plan | 2 +- .../query_98.plan | 2 +- .../query_99.plan | 2 +- .../query_1.plan | 2 +- .../query_10.plan | 21 +- .../query_100.plan | 2 +- .../query_101.plan | 2 +- .../query_102.plan | 2 +- .../query_103.plan | 2 +- .../query_104.plan | 2 +- .../query_105.plan | 2 +- .../query_106.plan | 2 +- .../query_11.plan | 21 +- .../query_12.plan | 21 +- .../query_13.plan | 21 +- .../query_14.plan | 21 +- .../query_15.plan | 21 +- .../query_16.plan | 21 +- .../query_17.plan | 21 +- .../query_18.plan | 2 +- .../query_19.plan | 2 +- .../query_2.plan | 2 +- .../query_20.plan | 2 +- .../query_21.plan | 2 +- .../query_24.plan | 21 +- .../query_25.plan | 21 +- .../query_26.plan | 21 +- .../query_27.plan | 21 +- .../query_28.plan | 2 +- .../query_29.plan | 2 +- .../query_3.plan | 2 +- .../query_34.plan | 21 +- .../query_35.plan | 21 +- .../query_36.plan | 21 +- .../query_37.plan | 21 +- .../query_38.plan | 21 +- .../query_39.plan | 21 +- .../query_4.plan | 2 +- .../query_40.plan | 2 +- .../query_41.plan | 2 +- .../query_46.plan | 2 +- .../query_47.plan | 2 +- .../query_48.plan | 2 +- .../query_49.plan | 2 +- .../query_5.plan | 2 +- .../query_50.plan | 2 +- .../query_51.plan | 2 +- .../query_52.plan | 2 +- .../query_53.plan | 2 +- .../query_54.plan | 2 +- .../query_55.plan | 2 +- .../query_56.plan | 2 +- .../query_57.plan | 2 +- .../query_58.plan | 2 +- .../query_59.plan | 2 +- .../query_6.plan | 2 +- .../query_60.plan | 2 +- .../query_61.plan | 2 +- .../query_62.plan | 19 +- .../query_63.plan | 19 +- .../query_64.plan | 2 +- .../query_65.plan | 2 +- .../query_66.plan | 2 +- .../query_67.plan | 2 +- .../query_68.plan | 2 +- .../query_69.plan | 2 +- .../query_7.plan | 2 +- .../query_70.plan | 2 +- .../query_71.plan | 2 +- .../query_72.plan | 2 +- .../query_73.plan | 2 +- .../query_74.plan | 2 +- .../query_75.plan | 2 +- .../query_76.plan | 2 +- .../query_77.plan | 2 +- .../query_78.plan | 2 +- .../query_79.plan | 2 +- .../query_8.plan | 21 +- .../query_80.plan | 2 +- .../query_81.plan | 2 +- .../query_82.plan | 2 +- .../query_83.plan | 2 +- .../query_88.plan | 2 +- .../query_89.plan | 2 +- .../query_9.plan | 21 +- .../query_90.plan | 2 +- .../query_91.plan | 2 +- .../query_94.plan | 2 +- .../query_95.plan | 2 +- .../query_96.plan | 2 +- .../query_97.plan | 2 +- .../query_98.plan | 2 +- .../query_99.plan | 2 +- .../query_1.plan | 2 +- .../query_10.plan | 2 +- .../query_100.plan | 2 +- .../query_101.plan | 2 +- .../query_102.plan | 2 +- .../query_103.plan | 2 +- .../query_104.plan | 2 +- .../query_105.plan | 2 +- .../query_11.plan | 2 +- .../query_12.plan | 2 +- .../query_13.plan | 2 +- .../query_14.plan | 2 +- .../query_15.plan | 2 +- .../query_16.plan | 2 +- .../query_17.plan | 2 +- .../query_18.plan | 2 +- .../query_19.plan | 2 +- .../query_2.plan | 2 +- .../query_20.plan | 2 +- .../query_21.plan | 2 +- .../query_22.plan | 21 +- .../query_23.plan | 21 +- .../query_24.plan | 2 +- .../query_25.plan | 2 +- .../query_26.plan | 2 +- .../query_27.plan | 2 +- .../query_28.plan | 21 +- .../query_29.plan | 21 +- .../query_3.plan | 2 +- .../query_30.plan | 21 +- .../query_31.plan | 21 +- .../query_32.plan | 2 +- .../query_33.plan | 2 +- .../query_34.plan | 2 +- .../query_35.plan | 2 +- .../query_36.plan | 2 +- .../query_37.plan | 2 +- .../query_38.plan | 2 +- .../query_39.plan | 2 +- .../query_4.plan | 2 +- .../query_42.plan | 2 +- .../query_43.plan | 2 +- .../query_5.plan | 2 +- .../query_50.plan | 2 +- .../query_51.plan | 2 +- .../query_52.plan | 2 +- .../query_53.plan | 2 +- .../query_54.plan | 2 +- .../query_55.plan | 2 +- .../query_56.plan | 2 +- .../query_57.plan | 2 +- .../query_58.plan | 2 +- .../query_59.plan | 2 +- .../query_60.plan | 21 +- .../query_61.plan | 21 +- .../query_62.plan | 2 +- .../query_63.plan | 2 +- .../query_64.plan | 2 +- .../query_65.plan | 2 +- .../query_68.plan | 2 +- .../query_69.plan | 2 +- .../query_70.plan | 2 +- .../query_71.plan | 2 +- .../query_72.plan | 2 +- .../query_73.plan | 2 +- .../query_74.plan | 2 +- .../query_75.plan | 2 +- .../query_76.plan | 21 +- .../query_77.plan | 21 +- .../query_78.plan | 21 +- .../query_79.plan | 21 +- .../query_80.plan | 21 +- .../query_81.plan | 21 +- .../query_82.plan | 2 +- .../query_83.plan | 2 +- .../query_84.plan | 2 +- .../query_85.plan | 2 +- .../query_86.plan | 2 +- .../query_87.plan | 2 +- .../query_88.plan | 21 +- .../query_89.plan | 21 +- .../query_90.plan | 2 +- .../query_91.plan | 2 +- .../query_1.plan | 2 +- .../query_10.plan | 2 +- .../query_11.plan | 21 +- .../query_12.plan | 21 +- .../query_13.plan | 2 +- .../query_14.plan | 2 +- .../query_15.plan | 2 +- .../query_16.plan | 2 +- .../query_17.plan | 19 +- .../query_18.plan | 19 +- .../query_19.plan | 19 +- .../query_2.plan | 2 +- .../query_20.plan | 19 +- .../query_21.plan | 2 +- .../query_22.plan | 2 +- .../query_23.plan | 2 +- .../query_24.plan | 2 +- .../query_25.plan | 2 +- .../query_26.plan | 2 +- .../query_27.plan | 2 +- .../query_28.plan | 2 +- .../query_29.plan | 2 +- .../query_3.plan | 21 +- .../query_30.plan | 2 +- .../query_31.plan | 2 +- .../query_32.plan | 2 +- .../query_4.plan | 21 +- .../query_5.plan | 2 +- .../query_6.plan | 2 +- .../query_7.plan | 2 +- .../query_8.plan | 2 +- .../query_9.plan | 2 +- .../query_1.plan | 2 +- .../query_100.plan | 21 +- .../query_101.plan | 21 +- .../query_102.plan | 2 +- .../query_103.plan | 2 +- .../query_104.plan | 2 +- .../query_105.plan | 2 +- .../query_106.plan | 2 +- .../query_107.plan | 2 +- .../query_108.plan | 2 +- .../query_109.plan | 2 +- .../query_110.plan | 2 +- .../query_111.plan | 2 +- .../query_112.plan | 2 +- .../query_113.plan | 2 +- .../query_118.plan | 2 +- .../query_119.plan | 2 +- .../query_12.plan | 21 +- .../query_120.plan | 2 +- .../query_121.plan | 2 +- .../query_122.plan | 2 +- .../query_123.plan | 2 +- .../query_124.plan | 2 +- .../query_125.plan | 2 +- .../query_126.plan | 2 +- .../query_127.plan | 2 +- .../query_128.plan | 2 +- .../query_129.plan | 2 +- .../query_13.plan | 21 +- .../query_130.plan | 2 +- .../query_131.plan | 2 +- .../query_132.plan | 2 +- .../query_133.plan | 2 +- .../query_134.plan | 2 +- .../query_135.plan | 2 +- .../query_136.plan | 2 +- .../query_137.plan | 2 +- .../query_138.plan | 2 +- .../query_139.plan | 2 +- .../query_14.plan | 21 +- .../query_140.plan | 21 +- .../query_141.plan | 21 +- .../query_142.plan | 2 +- .../query_143.plan | 2 +- .../query_144.plan | 2 +- .../query_145.plan | 2 +- .../query_15.plan | 21 +- .../query_16.plan | 21 +- .../query_17.plan | 21 +- .../query_18.plan | 2 +- .../query_19.plan | 2 +- .../query_2.plan | 2 +- .../query_20.plan | 2 +- .../query_21.plan | 2 +- .../query_22.plan | 21 +- .../query_23.plan | 21 +- .../query_24.plan | 21 +- .../query_25.plan | 21 +- .../query_26.plan | 2 +- .../query_27.plan | 2 +- .../query_28.plan | 2 +- .../query_29.plan | 2 +- .../query_3.plan | 2 +- .../query_30.plan | 2 +- .../query_31.plan | 2 +- .../query_32.plan | 2 +- .../query_33.plan | 2 +- .../query_34.plan | 2 +- .../query_35.plan | 2 +- .../query_36.plan | 2 +- .../query_37.plan | 2 +- .../query_38.plan | 2 +- .../query_39.plan | 2 +- .../query_4.plan | 2 +- .../query_40.plan | 21 +- .../query_41.plan | 21 +- .../query_42.plan | 2 +- .../query_43.plan | 2 +- .../query_44.plan | 21 +- .../query_45.plan | 21 +- .../query_46.plan | 2 +- .../query_47.plan | 2 +- .../query_48.plan | 2 +- .../query_49.plan | 2 +- .../query_5.plan | 2 +- .../query_50.plan | 2 +- .../query_51.plan | 2 +- .../query_52.plan | 2 +- .../query_53.plan | 2 +- .../query_54.plan | 21 +- .../query_55.plan | 21 +- .../query_56.plan | 2 +- .../query_57.plan | 2 +- .../query_58.plan | 2 +- .../query_59.plan | 2 +- .../query_6.plan | 2 +- .../query_60.plan | 2 +- .../query_61.plan | 2 +- .../query_62.plan | 2 +- .../query_63.plan | 2 +- .../query_64.plan | 21 +- .../query_65.plan | 21 +- .../query_66.plan | 21 +- .../query_67.plan | 21 +- .../query_68.plan | 2 +- .../query_69.plan | 2 +- .../query_7.plan | 2 +- .../query_70.plan | 2 +- .../query_71.plan | 2 +- .../query_72.plan | 21 +- .../query_73.plan | 21 +- .../query_74.plan | 2 +- .../query_75.plan | 2 +- .../query_76.plan | 2 +- .../query_77.plan | 2 +- .../query_78.plan | 2 +- .../query_79.plan | 2 +- .../query_80.plan | 2 +- .../query_81.plan | 2 +- .../query_82.plan | 2 +- .../query_83.plan | 2 +- .../query_84.plan | 2 +- .../query_85.plan | 2 +- .../query_86.plan | 2 +- .../query_87.plan | 2 +- .../query_88.plan | 2 +- .../query_89.plan | 2 +- .../query_90.plan | 2 +- .../query_91.plan | 2 +- .../query_92.plan | 2 +- .../query_93.plan | 2 +- .../query_94.plan | 21 +- .../query_95.plan | 21 +- .../query_96.plan | 2 +- .../query_97.plan | 2 +- .../query_98.plan | 21 +- .../query_99.plan | 21 +- .../query_1.plan | 21 +- .../query_10.plan | 2 +- .../query_100.plan | 21 +- .../query_101.plan | 21 +- .../query_102.plan | 21 +- .../query_103.plan | 2 +- .../query_104.plan | 2 +- .../query_105.plan | 2 +- .../query_106.plan | 2 +- .../query_107.plan | 21 +- .../query_108.plan | 21 +- .../query_109.plan | 2 +- .../query_11.plan | 2 +- .../query_110.plan | 2 +- .../query_111.plan | 2 +- .../query_112.plan | 2 +- .../query_113.plan | 2 +- .../query_114.plan | 2 +- .../query_115.plan | 2 +- .../query_116.plan | 2 +- .../query_119.plan | 21 +- .../query_12.plan | 2 +- .../query_120.plan | 21 +- .../query_121.plan | 2 +- .../query_122.plan | 2 +- .../query_125.plan | 2 +- .../query_126.plan | 2 +- .../query_127.plan | 2 +- .../query_13.plan | 2 +- .../query_14.plan | 2 +- .../query_15.plan | 2 +- .../query_16.plan | 2 +- .../query_19.plan | 2 +- .../query_2.plan | 21 +- .../query_20.plan | 2 +- .../query_21.plan | 2 +- .../query_22.plan | 2 +- .../query_27.plan | 2 +- .../query_28.plan | 2 +- .../query_29.plan | 21 +- .../query_3.plan | 21 +- .../query_30.plan | 21 +- .../query_31.plan | 2 +- .../query_32.plan | 2 +- .../query_33.plan | 2 +- .../query_34.plan | 2 +- .../query_35.plan | 2 +- .../query_36.plan | 2 +- .../query_37.plan | 2 +- .../query_38.plan | 2 +- .../query_39.plan | 2 +- .../query_4.plan | 21 +- .../query_40.plan | 2 +- .../query_43.plan | 21 +- .../query_44.plan | 21 +- .../query_45.plan | 21 +- .../query_46.plan | 21 +- .../query_47.plan | 2 +- .../query_48.plan | 2 +- .../query_49.plan | 2 +- .../query_5.plan | 2 +- .../query_50.plan | 2 +- .../query_51.plan | 2 +- .../query_52.plan | 2 +- .../query_53.plan | 2 +- .../query_54.plan | 2 +- .../query_55.plan | 2 +- .../query_56.plan | 2 +- .../query_6.plan | 2 +- .../query_61.plan | 2 +- .../query_62.plan | 2 +- .../query_7.plan | 2 +- .../query_73.plan | 2 +- .../query_74.plan | 2 +- .../query_75.plan | 2 +- .../query_76.plan | 2 +- .../query_77.plan | 2 +- .../query_78.plan | 2 +- .../query_79.plan | 2 +- .../query_8.plan | 2 +- .../query_80.plan | 2 +- .../query_81.plan | 2 +- .../query_82.plan | 2 +- .../query_83.plan | 2 +- .../query_84.plan | 2 +- .../query_87.plan | 2 +- .../query_88.plan | 2 +- .../query_89.plan | 2 +- .../query_9.plan | 2 +- .../query_90.plan | 2 +- .../query_91.plan | 2 +- .../query_92.plan | 2 +- .../query_93.plan | 2 +- .../query_94.plan | 2 +- .../query_95.plan | 2 +- .../query_96.plan | 2 +- .../query_97.plan | 21 +- .../query_98.plan | 21 +- .../query_99.plan | 21 +- .../query_1.plan | 2 +- .../query_10.plan | 2 +- .../query_100.plan | 2 +- .../query_101.plan | 2 +- .../query_11.plan | 2 +- .../query_12.plan | 2 +- .../query_13.plan | 2 +- .../query_14.plan | 2 +- .../query_15.plan | 2 +- .../query_16.plan | 21 +- .../query_17.plan | 21 +- .../query_20.plan | 2 +- .../query_21.plan | 2 +- .../query_22.plan | 2 +- .../query_23.plan | 2 +- .../query_24.plan | 2 +- .../query_25.plan | 2 +- .../query_26.plan | 2 +- .../query_27.plan | 2 +- .../query_28.plan | 21 +- .../query_29.plan | 21 +- .../query_34.plan | 2 +- .../query_35.plan | 2 +- .../query_36.plan | 2 +- .../query_37.plan | 2 +- .../query_40.plan | 21 +- .../query_41.plan | 21 +- .../query_42.plan | 21 +- .../query_43.plan | 21 +- .../query_44.plan | 2 +- .../query_45.plan | 2 +- .../query_46.plan | 2 +- .../query_47.plan | 2 +- .../query_48.plan | 2 +- .../query_49.plan | 2 +- .../query_50.plan | 2 +- .../query_51.plan | 2 +- .../query_52.plan | 2 +- .../query_53.plan | 2 +- .../query_54.plan | 2 +- .../query_55.plan | 2 +- .../query_56.plan | 2 +- .../query_57.plan | 2 +- .../query_6.plan | 2 +- .../query_60.plan | 2 +- .../query_61.plan | 2 +- .../query_62.plan | 2 +- .../query_63.plan | 2 +- .../query_64.plan | 2 +- .../query_65.plan | 2 +- .../query_66.plan | 2 +- .../query_67.plan | 2 +- .../query_68.plan | 21 +- .../query_69.plan | 21 +- .../query_7.plan | 2 +- .../query_70.plan | 21 +- .../query_71.plan | 21 +- .../query_76.plan | 21 +- .../query_77.plan | 21 +- .../query_78.plan | 2 +- .../query_79.plan | 2 +- .../query_80.plan | 2 +- .../query_81.plan | 2 +- .../query_82.plan | 2 +- .../query_83.plan | 2 +- .../query_84.plan | 2 +- .../query_85.plan | 2 +- .../query_88.plan | 2 +- .../query_89.plan | 2 +- .../query_90.plan | 2 +- .../query_91.plan | 2 +- .../query_92.plan | 2 +- .../query_93.plan | 2 +- .../query_94.plan | 2 +- .../query_95.plan | 2 +- .../query_96.plan | 2 +- .../query_97.plan | 2 +- .../query_98.plan | 2 +- .../query_99.plan | 2 +- .../query_1.plan | 2 +- .../query_10.plan | 2 +- .../query_103.plan | 2 +- .../query_104.plan | 2 +- .../query_105.plan | 2 +- .../query_106.plan | 2 +- .../query_107.plan | 2 +- .../query_108.plan | 2 +- .../query_11.plan | 2 +- .../query_12.plan | 2 +- .../query_13.plan | 21 +- .../query_14.plan | 21 +- .../query_15.plan | 2 +- .../query_16.plan | 2 +- .../query_17.plan | 2 +- .../query_18.plan | 2 +- .../query_19.plan | 2 +- .../query_2.plan | 2 +- .../query_20.plan | 2 +- .../query_21.plan | 19 +- .../query_22.plan | 19 +- .../query_23.plan | 2 +- .../query_24.plan | 2 +- .../query_25.plan | 2 +- .../query_26.plan | 2 +- .../query_27.plan | 21 +- .../query_28.plan | 21 +- .../query_29.plan | 2 +- .../query_3.plan | 2 +- .../query_30.plan | 2 +- .../query_31.plan | 2 +- .../query_32.plan | 2 +- .../query_33.plan | 2 +- .../query_34.plan | 2 +- .../query_35.plan | 2 +- .../query_36.plan | 2 +- .../query_37.plan | 2 +- .../query_38.plan | 2 +- .../query_39.plan | 2 +- .../query_4.plan | 2 +- .../query_40.plan | 2 +- .../query_41.plan | 2 +- .../query_42.plan | 2 +- .../query_43.plan | 2 +- .../query_44.plan | 2 +- .../query_45.plan | 2 +- .../query_46.plan | 2 +- .../query_47.plan | 2 +- .../query_48.plan | 2 +- .../query_49.plan | 2 +- .../query_5.plan | 2 +- .../query_50.plan | 2 +- .../query_51.plan | 2 +- .../query_52.plan | 2 +- .../query_53.plan | 2 +- .../query_54.plan | 2 +- .../query_55.plan | 19 +- .../query_56.plan | 19 +- .../query_59.plan | 2 +- .../query_6.plan | 2 +- .../query_60.plan | 2 +- .../query_61.plan | 2 +- .../query_62.plan | 2 +- .../query_63.plan | 2 +- .../query_64.plan | 2 +- .../query_65.plan | 2 +- .../query_66.plan | 2 +- .../query_69.plan | 2 +- .../query_7.plan | 2 +- .../query_70.plan | 2 +- .../query_71.plan | 2 +- .../query_72.plan | 2 +- .../query_73.plan | 2 +- .../query_74.plan | 2 +- .../query_75.plan | 21 +- .../query_76.plan | 21 +- .../query_77.plan | 2 +- .../query_78.plan | 2 +- .../query_79.plan | 2 +- .../query_8.plan | 2 +- .../query_80.plan | 2 +- .../query_83.plan | 2 +- .../query_84.plan | 2 +- .../query_85.plan | 2 +- .../query_86.plan | 2 +- .../query_87.plan | 2 +- .../query_88.plan | 2 +- .../query_89.plan | 2 +- .../query_9.plan | 2 +- .../query_90.plan | 2 +- .../query_91.plan | 2 +- .../query_92.plan | 2 +- .../query_93.plan | 2 +- .../query_94.plan | 2 +- .../query_95.plan | 2 +- .../query_96.plan | 2 +- .../query_1.plan | 2 +- .../query_10.plan | 2 +- .../query_100.plan | 2 +- .../query_101.plan | 2 +- .../query_102.plan | 2 +- .../query_103.plan | 21 +- .../query_104.plan | 21 +- .../query_105.plan | 2 +- .../query_106.plan | 2 +- .../query_107.plan | 21 +- .../query_108.plan | 21 +- .../query_109.plan | 2 +- .../query_11.plan | 2 +- .../query_110.plan | 2 +- .../query_111.plan | 2 +- .../query_112.plan | 2 +- .../query_113.plan | 2 +- .../query_114.plan | 2 +- .../query_115.plan | 2 +- .../query_116.plan | 2 +- .../query_117.plan | 2 +- .../query_118.plan | 2 +- .../query_12.plan | 2 +- .../query_131.plan | 21 +- .../query_132.plan | 21 +- .../query_133.plan | 21 +- .../query_134.plan | 21 +- .../query_135.plan | 2 +- .../query_136.plan | 2 +- .../query_15.plan | 2 +- .../query_16.plan | 2 +- .../query_17.plan | 2 +- .../query_18.plan | 2 +- .../query_19.plan | 2 +- .../query_2.plan | 2 +- .../query_20.plan | 2 +- .../query_21.plan | 2 +- .../query_22.plan | 2 +- .../query_23.plan | 2 +- .../query_24.plan | 2 +- .../query_25.plan | 2 +- .../query_26.plan | 2 +- .../query_27.plan | 2 +- .../query_28.plan | 2 +- .../query_29.plan | 2 +- .../query_3.plan | 2 +- .../query_30.plan | 2 +- .../query_31.plan | 2 +- .../query_32.plan | 2 +- .../query_33.plan | 19 +- .../query_34.plan | 19 +- .../query_35.plan | 19 +- .../query_36.plan | 19 +- .../query_37.plan | 2 +- .../query_38.plan | 2 +- .../query_39.plan | 2 +- .../query_4.plan | 2 +- .../query_40.plan | 2 +- .../query_41.plan | 2 +- .../query_42.plan | 2 +- .../query_43.plan | 2 +- .../query_44.plan | 2 +- .../query_45.plan | 2 +- .../query_46.plan | 2 +- .../query_47.plan | 2 +- .../query_48.plan | 2 +- .../query_49.plan | 21 +- .../query_5.plan | 2 +- .../query_50.plan | 21 +- .../query_51.plan | 2 +- .../query_52.plan | 2 +- .../query_53.plan | 2 +- .../query_54.plan | 2 +- .../query_55.plan | 2 +- .../query_56.plan | 2 +- .../query_57.plan | 2 +- .../query_58.plan | 2 +- .../query_6.plan | 2 +- .../query_65.plan | 2 +- .../query_66.plan | 2 +- .../query_67.plan | 2 +- .../query_68.plan | 2 +- .../query_69.plan | 2 +- .../query_7.plan | 2 +- .../query_70.plan | 2 +- .../query_71.plan | 2 +- .../query_72.plan | 2 +- .../query_73.plan | 2 +- .../query_74.plan | 2 +- .../query_77.plan | 2 +- .../query_78.plan | 2 +- .../query_79.plan | 2 +- .../query_8.plan | 2 +- .../query_80.plan | 2 +- .../query_81.plan | 2 +- .../query_82.plan | 2 +- .../query_83.plan | 2 +- .../query_84.plan | 2 +- .../query_85.plan | 2 +- .../query_86.plan | 2 +- .../query_87.plan | 2 +- .../query_88.plan | 2 +- .../query_89.plan | 2 +- .../query_9.plan | 2 +- .../query_90.plan | 2 +- .../query_91.plan | 2 +- .../query_92.plan | 2 +- .../query_93.plan | 2 +- .../query_94.plan | 2 +- .../query_99.plan | 2 +- .../query_1.plan | 21 +- .../query_10.plan | 2 +- .../query_100.plan | 2 +- .../query_101.plan | 2 +- .../query_102.plan | 2 +- .../query_103.plan | 2 +- .../query_104.plan | 2 +- .../query_105.plan | 2 +- .../query_106.plan | 2 +- .../query_107.plan | 2 +- .../query_108.plan | 2 +- .../query_109.plan | 21 +- .../query_11.plan | 2 +- .../query_110.plan | 21 +- .../query_111.plan | 2 +- .../query_112.plan | 2 +- .../query_113.plan | 21 +- .../query_114.plan | 21 +- .../query_115.plan | 2 +- .../query_116.plan | 2 +- .../query_117.plan | 2 +- .../query_118.plan | 2 +- .../query_119.plan | 21 +- .../query_12.plan | 2 +- .../query_120.plan | 21 +- .../query_121.plan | 21 +- .../query_122.plan | 21 +- .../query_123.plan | 21 +- .../query_13.plan | 2 +- .../query_14.plan | 2 +- .../query_15.plan | 2 +- .../query_16.plan | 2 +- .../query_17.plan | 2 +- .../query_18.plan | 2 +- .../query_19.plan | 2 +- .../query_2.plan | 21 +- .../query_20.plan | 2 +- .../query_21.plan | 2 +- .../query_22.plan | 2 +- .../query_23.plan | 2 +- .../query_24.plan | 2 +- .../query_25.plan | 2 +- .../query_26.plan | 2 +- .../query_27.plan | 2 +- .../query_28.plan | 2 +- .../query_29.plan | 2 +- .../query_3.plan | 2 +- .../query_30.plan | 2 +- .../query_31.plan | 2 +- .../query_32.plan | 2 +- .../query_37.plan | 2 +- .../query_38.plan | 2 +- .../query_39.plan | 2 +- .../query_4.plan | 2 +- .../query_40.plan | 2 +- .../query_41.plan | 2 +- .../query_42.plan | 2 +- .../query_43.plan | 2 +- .../query_44.plan | 2 +- .../query_45.plan | 2 +- .../query_46.plan | 2 +- .../query_47.plan | 2 +- .../query_48.plan | 2 +- .../query_49.plan | 2 +- .../query_5.plan | 2 +- .../query_50.plan | 2 +- .../query_51.plan | 2 +- .../query_52.plan | 2 +- .../query_53.plan | 2 +- .../query_54.plan | 2 +- .../query_6.plan | 2 +- .../query_63.plan | 2 +- .../query_64.plan | 2 +- .../query_65.plan | 2 +- .../query_66.plan | 2 +- .../query_67.plan | 2 +- .../query_68.plan | 2 +- .../query_69.plan | 2 +- .../query_7.plan | 2 +- .../query_70.plan | 2 +- .../query_71.plan | 2 +- .../query_72.plan | 2 +- .../query_73.plan | 2 +- .../query_74.plan | 2 +- .../query_75.plan | 2 +- .../query_76.plan | 2 +- .../query_77.plan | 2 +- .../query_78.plan | 2 +- .../query_79.plan | 2 +- .../query_8.plan | 2 +- .../query_80.plan | 2 +- .../query_81.plan | 2 +- .../query_82.plan | 2 +- .../query_83.plan | 2 +- .../query_84.plan | 2 +- .../query_85.plan | 2 +- .../query_86.plan | 2 +- .../query_87.plan | 2 +- .../query_88.plan | 2 +- .../query_89.plan | 2 +- .../query_9.plan | 2 +- .../query_90.plan | 2 +- .../query_91.plan | 2 +- .../query_92.plan | 2 +- .../query_93.plan | 2 +- .../query_94.plan | 2 +- .../query_95.plan | 2 +- .../query_96.plan | 2 +- .../query_99.plan | 2 +- .../query_1.plan | 21 +- .../query_100.plan | 2 +- .../query_101.plan | 2 +- .../query_102.plan | 2 +- .../query_103.plan | 2 +- .../query_104.plan | 2 +- .../query_105.plan | 2 +- .../query_106.plan | 2 +- .../query_107.plan | 2 +- .../query_108.plan | 21 +- .../query_109.plan | 21 +- .../query_110.plan | 21 +- .../query_111.plan | 21 +- .../query_112.plan | 2 +- .../query_113.plan | 2 +- .../query_114.plan | 21 +- .../query_115.plan | 21 +- .../query_116.plan | 21 +- .../query_117.plan | 21 +- .../query_12.plan | 2 +- .../query_120.plan | 21 +- .../query_121.plan | 21 +- .../query_13.plan | 2 +- .../query_14.plan | 2 +- .../query_15.plan | 2 +- .../query_16.plan | 2 +- .../query_17.plan | 2 +- .../query_18.plan | 2 +- .../query_19.plan | 2 +- .../query_2.plan | 21 +- .../query_20.plan | 2 +- .../query_21.plan | 2 +- .../query_22.plan | 2 +- .../query_23.plan | 2 +- .../query_24.plan | 2 +- .../query_25.plan | 2 +- .../query_26.plan | 2 +- .../query_27.plan | 2 +- .../query_28.plan | 2 +- .../query_29.plan | 2 +- .../query_3.plan | 21 +- .../query_38.plan | 2 +- .../query_39.plan | 2 +- .../query_40.plan | 2 +- .../query_41.plan | 2 +- .../query_42.plan | 2 +- .../query_43.plan | 2 +- .../query_44.plan | 2 +- .../query_45.plan | 2 +- .../query_46.plan | 2 +- .../query_47.plan | 2 +- .../query_48.plan | 2 +- .../query_49.plan | 2 +- .../query_50.plan | 2 +- .../query_51.plan | 2 +- .../query_52.plan | 2 +- .../query_53.plan | 2 +- .../query_54.plan | 2 +- .../query_55.plan | 2 +- .../query_56.plan | 2 +- .../query_57.plan | 2 +- .../query_58.plan | 21 +- .../query_59.plan | 21 +- .../query_6.plan | 2 +- .../query_60.plan | 21 +- .../query_61.plan | 21 +- .../query_62.plan | 21 +- .../query_63.plan | 21 +- .../query_64.plan | 2 +- .../query_65.plan | 2 +- .../query_66.plan | 2 +- .../query_67.plan | 2 +- .../query_68.plan | 2 +- .../query_69.plan | 2 +- .../query_7.plan | 2 +- .../query_70.plan | 2 +- .../query_71.plan | 2 +- .../query_72.plan | 2 +- .../query_73.plan | 2 +- .../query_74.plan | 2 +- .../query_75.plan | 2 +- .../query_76.plan | 2 +- .../query_77.plan | 2 +- .../query_78.plan | 2 +- .../query_79.plan | 2 +- .../query_80.plan | 21 +- .../query_81.plan | 21 +- .../query_82.plan | 21 +- .../query_83.plan | 21 +- .../query_84.plan | 21 +- .../query_85.plan | 21 +- .../query_86.plan | 21 +- .../query_87.plan | 21 +- .../query_92.plan | 21 +- .../query_93.plan | 21 +- .../query_94.plan | 2 +- .../query_95.plan | 2 +- .../query_96.plan | 2 +- .../query_97.plan | 2 +- .../query_98.plan | 2 +- .../query_99.plan | 2 +- .../query_1.plan | 2 +- .../query_10.plan | 2 +- .../query_100.plan | 21 +- .../query_101.plan | 21 +- .../query_102.plan | 21 +- .../query_105.plan | 2 +- .../query_106.plan | 2 +- .../query_107.plan | 2 +- .../query_108.plan | 2 +- .../query_109.plan | 2 +- .../query_110.plan | 2 +- .../query_111.plan | 2 +- .../query_112.plan | 2 +- .../query_113.plan | 2 +- .../query_114.plan | 2 +- .../query_117.plan | 2 +- .../query_118.plan | 2 +- .../query_119.plan | 2 +- .../query_120.plan | 2 +- .../query_121.plan | 2 +- .../query_122.plan | 2 +- .../query_123.plan | 2 +- .../query_124.plan | 2 +- .../query_125.plan | 2 +- .../query_126.plan | 2 +- .../query_127.plan | 2 +- .../query_128.plan | 2 +- .../query_129.plan | 21 +- .../query_130.plan | 21 +- .../query_131.plan | 2 +- .../query_132.plan | 2 +- .../query_133.plan | 21 +- .../query_134.plan | 21 +- .../query_139.plan | 2 +- .../query_140.plan | 2 +- .../query_143.plan | 2 +- .../query_144.plan | 2 +- .../query_145.plan | 2 +- .../query_146.plan | 2 +- .../query_147.plan | 2 +- .../query_148.plan | 2 +- .../query_149.plan | 2 +- .../query_150.plan | 2 +- .../query_17.plan | 2 +- .../query_18.plan | 2 +- .../query_19.plan | 2 +- .../query_2.plan | 2 +- .../query_20.plan | 2 +- .../query_21.plan | 21 +- .../query_22.plan | 21 +- .../query_23.plan | 21 +- .../query_24.plan | 21 +- .../query_25.plan | 2 +- .../query_26.plan | 2 +- .../query_27.plan | 21 +- .../query_28.plan | 21 +- .../query_29.plan | 21 +- .../query_3.plan | 21 +- .../query_30.plan | 21 +- .../query_31.plan | 21 +- .../query_32.plan | 21 +- .../query_33.plan | 2 +- .../query_34.plan | 2 +- .../query_35.plan | 2 +- .../query_36.plan | 2 +- .../query_37.plan | 2 +- .../query_38.plan | 2 +- .../query_39.plan | 2 +- .../query_4.plan | 21 +- .../query_40.plan | 2 +- .../query_45.plan | 2 +- .../query_46.plan | 2 +- .../query_47.plan | 2 +- .../query_48.plan | 2 +- .../query_49.plan | 2 +- .../query_50.plan | 2 +- .../query_51.plan | 2 +- .../query_52.plan | 2 +- .../query_53.plan | 2 +- .../query_54.plan | 2 +- .../query_55.plan | 2 +- .../query_56.plan | 2 +- .../query_57.plan | 2 +- .../query_58.plan | 2 +- .../query_59.plan | 2 +- .../query_60.plan | 2 +- .../query_61.plan | 2 +- .../query_62.plan | 2 +- .../query_63.plan | 21 +- .../query_64.plan | 21 +- .../query_65.plan | 21 +- .../query_66.plan | 21 +- .../query_67.plan | 2 +- .../query_68.plan | 2 +- .../query_69.plan | 2 +- .../query_7.plan | 21 +- .../query_70.plan | 2 +- .../query_71.plan | 2 +- .../query_72.plan | 2 +- .../query_73.plan | 21 +- .../query_74.plan | 21 +- .../query_8.plan | 21 +- .../query_81.plan | 2 +- .../query_82.plan | 2 +- .../query_83.plan | 2 +- .../query_84.plan | 2 +- .../query_85.plan | 2 +- .../query_86.plan | 2 +- .../query_87.plan | 2 +- .../query_88.plan | 2 +- .../query_89.plan | 2 +- .../query_9.plan | 2 +- .../query_90.plan | 2 +- .../query_91.plan | 21 +- .../query_92.plan | 21 +- .../query_93.plan | 21 +- .../query_94.plan | 21 +- .../query_95.plan | 2 +- .../query_96.plan | 2 +- .../query_97.plan | 2 +- .../query_98.plan | 2 +- .../query_99.plan | 21 +- 2568 files changed, 12081 insertions(+), 4975 deletions(-) create mode 100644 ydb/library/yql/dq/runtime/dq_tasks_counters.cpp create mode 100644 ydb/library/yql/dq/runtime/dq_tasks_counters.h diff --git a/ydb/core/kqp/executer_actor/kqp_executer_stats.cpp b/ydb/core/kqp/executer_actor/kqp_executer_stats.cpp index 1a75bdde156..697beec3f32 100644 --- a/ydb/core/kqp/executer_actor/kqp_executer_stats.cpp +++ b/ydb/core/kqp/executer_actor/kqp_executer_stats.cpp @@ -165,6 +165,11 @@ void TTableStats::Resize(ui32 taskCount) { AffectedPartitions.resize(taskCount); } +void TOperatorStats::Resize(ui32 taskCount) { + Rows.resize(taskCount); + Bytes.resize(taskCount); +} + void TStageExecutionStats::Resize(ui32 taskCount) { CpuTimeUs.Resize(taskCount); SourceCpuTimeUs.resize(taskCount); @@ -197,6 +202,10 @@ void TStageExecutionStats::Resize(ui32 taskCount) { for (auto& p : Output) p.second.Resize(taskCount); for (auto& p : Egress) p.second.Resize(taskCount); + for (auto& [id, j] : Joins) j.Resize(taskCount); + for (auto& [id, f] : Filters) f.Resize(taskCount); + for (auto& [id, a] : Aggregations) a.Resize(taskCount); + MaxMemoryUsage.Resize(taskCount); } @@ -261,7 +270,7 @@ void SetNonZero(ui64& target, ui64 source) { } } -ui64 TStageExecutionStats::UpdateAsyncStats(i32 index, TAsyncStats& aggrAsyncStats, const NYql::NDqProto::TDqAsyncBufferStats& asyncStats) { +ui64 TStageExecutionStats::UpdateAsyncStats(ui32 index, TAsyncStats& aggrAsyncStats, const NYql::NDqProto::TDqAsyncBufferStats& asyncStats) { ui64 baseTimeMs = 0; aggrAsyncStats.Bytes.SetNonZero(index, asyncStats.GetBytes()); @@ -406,6 +415,37 @@ ui64 TStageExecutionStats::UpdateStats(const NYql::NDqProto::TDqTaskStats& taskS } } + for (auto& operatorStat : taskStats.GetOperators()) { + auto operatorId = operatorStat.GetOperatorId(); + if (operatorId) { + switch (operatorStat.GetTypeCase()) { + case NYql::NDqProto::TDqOperatorStats::kJoin: { + auto [it, inserted] = Joins.try_emplace(operatorId, taskCount); + auto& joinStats = it->second; + SetNonZero(joinStats.Rows[index], operatorStat.GetRows()); + SetNonZero(joinStats.Bytes[index], operatorStat.GetBytes()); + break; + } + case NYql::NDqProto::TDqOperatorStats::kFilter: { + auto [it, inserted] = Filters.try_emplace(operatorId, taskCount); + auto& filterStats = it->second; + SetNonZero(filterStats.Rows[index], operatorStat.GetRows()); + SetNonZero(filterStats.Bytes[index], operatorStat.GetBytes()); + break; + } + case NYql::NDqProto::TDqOperatorStats::kAggregation: { + auto [it, inserted] = Aggregations.try_emplace(operatorId, taskCount); + auto& aggStats = it->second; + SetNonZero(aggStats.Rows[index], operatorStat.GetRows()); + SetNonZero(aggStats.Bytes[index], operatorStat.GetBytes()); + break; + } + default: + break; + } + } + } + MaxMemoryUsage.SetNonZero(index, maxMemoryUsage); return baseTimeMs; @@ -437,21 +477,6 @@ void UpdateAggr(NDqProto::TDqStatsAggr* aggr, ui64 value) noexcept { } } -struct TAsyncGroupStat { - ui64 Bytes = 0; - ui64 DecompressedBytes = 0; - ui64 Rows = 0; - ui64 Chunks = 0; - ui64 Splits = 0; - ui64 FirstMessageMs = 0; - ui64 PauseMessageMs = 0; - ui64 ResumeMessageMs = 0; - ui64 LastMessageMs = 0; - ui64 WaitTimeUs = 0; - ui64 WaitPeriods = 0; - ui64 Count = 0; -}; - ui64 UpdateAsyncAggr(NDqProto::TDqAsyncStatsAggr& asyncAggr, const NDqProto::TDqAsyncBufferStats& asyncStat) noexcept { ui64 baseTimeMs = 0; @@ -642,6 +667,34 @@ void TQueryExecutionStats::AddComputeActorFullStatsByTask( BaseTimeMs = NonZeroMin(BaseTimeMs, UpdateAsyncAggr(*(*stageStats->MutableEgress())[sinksStat.GetEgressName()].MutablePop(), sinksStat.GetPop())); BaseTimeMs = NonZeroMin(BaseTimeMs, UpdateAsyncAggr(*(*stageStats->MutableEgress())[sinksStat.GetEgressName()].MutableEgress(), sinksStat.GetEgress())); } + for (auto& operatorStat : task.GetOperators()) { + switch (operatorStat.GetTypeCase()) { + case NYql::NDqProto::TDqOperatorStats::kJoin: { + auto& joinStats = (*stageStats->MutableOperatorJoin())[operatorStat.GetOperatorId()]; + joinStats.SetOperatorId(operatorStat.GetOperatorId()); + UpdateAggr(joinStats.MutableBytes(), operatorStat.GetBytes()); + UpdateAggr(joinStats.MutableRows(), operatorStat.GetRows()); + break; + } + case NYql::NDqProto::TDqOperatorStats::kFilter: { + auto& filterStats = (*stageStats->MutableOperatorFilter())[operatorStat.GetOperatorId()]; + filterStats.SetOperatorId(operatorStat.GetOperatorId()); + UpdateAggr(filterStats.MutableBytes(), operatorStat.GetBytes()); + UpdateAggr(filterStats.MutableRows(), operatorStat.GetRows()); + break; + } + case NYql::NDqProto::TDqOperatorStats::kAggregation: { + auto& aggrStats = (*stageStats->MutableOperatorAggregation())[operatorStat.GetOperatorId()]; + aggrStats.SetOperatorId(operatorStat.GetOperatorId()); + UpdateAggr(aggrStats.MutableBytes(), operatorStat.GetBytes()); + UpdateAggr(aggrStats.MutableRows(), operatorStat.GetRows()); + break; + } + default: + break; + } + + } } void TQueryExecutionStats::AddComputeActorProfileStatsByTask( @@ -1010,62 +1063,80 @@ void TQueryExecutionStats::ExportExecStats(NYql::NDqProto::TDqExecutionStats& st protoStages.emplace(stageId.StageId, GetOrCreateStageStats(stageId, *TasksGraph, stats)); } - for (auto& p : StageStats) { - auto& stageStats = *protoStages[p.second.StageId.StageId]; - stageStats.SetTotalTasksCount(p.second.Task2Index.size()); + for (auto& [stageId, stageStat] : StageStats) { + auto& stageStats = *protoStages[stageStat.StageId.StageId]; + stageStats.SetTotalTasksCount(stageStat.Task2Index.size()); stageStats.SetBaseTimeMs(BaseTimeMs); - p.second.CpuTimeUs.ExportAggStats(BaseTimeMs, *stageStats.MutableCpuTimeUs()); - ExportAggStats(p.second.SourceCpuTimeUs, *stageStats.MutableSourceCpuTimeUs()); - p.second.MaxMemoryUsage.ExportAggStats(BaseTimeMs, *stageStats.MutableMaxMemoryUsage()); - - ExportAggStats(p.second.InputRows, *stageStats.MutableInputRows()); - ExportAggStats(p.second.InputBytes, *stageStats.MutableInputBytes()); - ExportAggStats(p.second.OutputRows, *stageStats.MutableOutputRows()); - ExportAggStats(p.second.OutputBytes, *stageStats.MutableOutputBytes()); - ExportAggStats(p.second.ResultRows, *stageStats.MutableResultRows()); - ExportAggStats(p.second.ResultBytes, *stageStats.MutableResultBytes()); - ExportAggStats(p.second.IngressRows, *stageStats.MutableIngressRows()); - ExportAggStats(p.second.IngressBytes, *stageStats.MutableIngressBytes()); - ExportAggStats(p.second.IngressDecompressedBytes, *stageStats.MutableIngressDecompressedBytes()); - ExportAggStats(p.second.EgressRows, *stageStats.MutableEgressRows()); - ExportAggStats(p.second.EgressBytes, *stageStats.MutableEgressBytes()); - - ExportOffsetAggStats(p.second.StartTimeMs, *stageStats.MutableStartTimeMs(), BaseTimeMs); - ExportOffsetAggStats(p.second.FinishTimeMs, *stageStats.MutableFinishTimeMs(), BaseTimeMs); - ExportAggStats(p.second.DurationUs, *stageStats.MutableDurationUs()); - ExportAggStats(p.second.WaitInputTimeUs, *stageStats.MutableWaitInputTimeUs()); - ExportAggStats(p.second.WaitOutputTimeUs, *stageStats.MutableWaitOutputTimeUs()); - - p.second.SpillingComputeBytes.ExportAggStats(BaseTimeMs, *stageStats.MutableSpillingComputeBytes()); - p.second.SpillingChannelBytes.ExportAggStats(BaseTimeMs, *stageStats.MutableSpillingChannelBytes()); - p.second.SpillingComputeTimeUs.ExportAggStats(BaseTimeMs, *stageStats.MutableSpillingComputeTimeUs()); - p.second.SpillingChannelTimeUs.ExportAggStats(BaseTimeMs, *stageStats.MutableSpillingChannelTimeUs()); + stageStat.CpuTimeUs.ExportAggStats(BaseTimeMs, *stageStats.MutableCpuTimeUs()); + ExportAggStats(stageStat.SourceCpuTimeUs, *stageStats.MutableSourceCpuTimeUs()); + stageStat.MaxMemoryUsage.ExportAggStats(BaseTimeMs, *stageStats.MutableMaxMemoryUsage()); + + ExportAggStats(stageStat.InputRows, *stageStats.MutableInputRows()); + ExportAggStats(stageStat.InputBytes, *stageStats.MutableInputBytes()); + ExportAggStats(stageStat.OutputRows, *stageStats.MutableOutputRows()); + ExportAggStats(stageStat.OutputBytes, *stageStats.MutableOutputBytes()); + ExportAggStats(stageStat.ResultRows, *stageStats.MutableResultRows()); + ExportAggStats(stageStat.ResultBytes, *stageStats.MutableResultBytes()); + ExportAggStats(stageStat.IngressRows, *stageStats.MutableIngressRows()); + ExportAggStats(stageStat.IngressBytes, *stageStats.MutableIngressBytes()); + ExportAggStats(stageStat.IngressDecompressedBytes, *stageStats.MutableIngressDecompressedBytes()); + ExportAggStats(stageStat.EgressRows, *stageStats.MutableEgressRows()); + ExportAggStats(stageStat.EgressBytes, *stageStats.MutableEgressBytes()); + + ExportOffsetAggStats(stageStat.StartTimeMs, *stageStats.MutableStartTimeMs(), BaseTimeMs); + ExportOffsetAggStats(stageStat.FinishTimeMs, *stageStats.MutableFinishTimeMs(), BaseTimeMs); + ExportAggStats(stageStat.DurationUs, *stageStats.MutableDurationUs()); + ExportAggStats(stageStat.WaitInputTimeUs, *stageStats.MutableWaitInputTimeUs()); + ExportAggStats(stageStat.WaitOutputTimeUs, *stageStats.MutableWaitOutputTimeUs()); + + stageStat.SpillingComputeBytes.ExportAggStats(BaseTimeMs, *stageStats.MutableSpillingComputeBytes()); + stageStat.SpillingChannelBytes.ExportAggStats(BaseTimeMs, *stageStats.MutableSpillingChannelBytes()); + stageStat.SpillingComputeTimeUs.ExportAggStats(BaseTimeMs, *stageStats.MutableSpillingComputeTimeUs()); + stageStat.SpillingChannelTimeUs.ExportAggStats(BaseTimeMs, *stageStats.MutableSpillingChannelTimeUs()); FillStageDurationUs(stageStats); - for (auto& p2 : p.second.Tables) { + for (auto& [path, t] : stageStat.Tables) { auto& table = *stageStats.AddTables(); - table.SetTablePath(p2.first); - ExportAggStats(p2.second.ReadRows, *table.MutableReadRows()); - ExportAggStats(p2.second.ReadBytes, *table.MutableReadBytes()); - ExportAggStats(p2.second.WriteRows, *table.MutableWriteRows()); - ExportAggStats(p2.second.WriteBytes, *table.MutableWriteBytes()); - ExportAggStats(p2.second.EraseRows, *table.MutableEraseRows()); - ExportAggStats(p2.second.EraseBytes, *table.MutableEraseBytes()); - table.SetAffectedPartitions(ExportAggStats(p2.second.AffectedPartitions)); + table.SetTablePath(path); + ExportAggStats(t.ReadRows, *table.MutableReadRows()); + ExportAggStats(t.ReadBytes, *table.MutableReadBytes()); + ExportAggStats(t.WriteRows, *table.MutableWriteRows()); + ExportAggStats(t.WriteBytes, *table.MutableWriteBytes()); + ExportAggStats(t.EraseRows, *table.MutableEraseRows()); + ExportAggStats(t.EraseBytes, *table.MutableEraseBytes()); + table.SetAffectedPartitions(ExportAggStats(t.AffectedPartitions)); + } + for (auto& [id, i] : stageStat.Ingress) { + ExportAggAsyncBufferStats(i, (*stageStats.MutableIngress())[id]); + } + for (auto& [id, i] : stageStat.Input) { + ExportAggAsyncBufferStats(i, (*stageStats.MutableInput())[id]); + } + for (auto& [id, o] : stageStat.Output) { + ExportAggAsyncBufferStats(o, (*stageStats.MutableOutput())[id]); } - for (auto& p2 : p.second.Ingress) { - ExportAggAsyncBufferStats(p2.second, (*stageStats.MutableIngress())[p2.first]); + for (auto& [id, e] : stageStat.Egress) { + ExportAggAsyncBufferStats(e, (*stageStats.MutableEgress())[id]); } - for (auto& p2 : p.second.Input) { - ExportAggAsyncBufferStats(p2.second, (*stageStats.MutableInput())[p2.first]); + for (auto& [id, j] : stageStat.Joins) { + auto& joinStat = (*stageStats.MutableOperatorJoin())[id]; + joinStat.SetOperatorId(id); + ExportAggStats(j.Bytes, *joinStat.MutableBytes()); + ExportAggStats(j.Rows, *joinStat.MutableRows()); } - for (auto& p2 : p.second.Output) { - ExportAggAsyncBufferStats(p2.second, (*stageStats.MutableOutput())[p2.first]); + for (auto& [id, f] : stageStat.Filters) { + auto& filterStat = (*stageStats.MutableOperatorFilter())[id]; + filterStat.SetOperatorId(id); + ExportAggStats(f.Bytes, *filterStat.MutableBytes()); + ExportAggStats(f.Rows, *filterStat.MutableRows()); } - for (auto& p2 : p.second.Egress) { - ExportAggAsyncBufferStats(p2.second, (*stageStats.MutableEgress())[p2.first]); + for (auto& [id, a] : stageStat.Aggregations) { + auto& aggrStat = (*stageStats.MutableOperatorAggregation())[id]; + aggrStat.SetOperatorId(id); + ExportAggStats(a.Bytes, *aggrStat.MutableBytes()); + ExportAggStats(a.Rows, *aggrStat.MutableRows()); } } } diff --git a/ydb/core/kqp/executer_actor/kqp_executer_stats.h b/ydb/core/kqp/executer_actor/kqp_executer_stats.h index 42f5e6c181c..6d0b77a78c1 100644 --- a/ydb/core/kqp/executer_actor/kqp_executer_stats.h +++ b/ydb/core/kqp/executer_actor/kqp_executer_stats.h @@ -4,6 +4,7 @@ #include #include #include +#include namespace NKikimr { namespace NKqp { @@ -84,6 +85,22 @@ struct TTableStats { void Resize(ui32 taskCount); }; +struct TOperatorStats { + + TOperatorStats() = default; + + TOperatorStats(ui32 taskCount) { + Resize(taskCount); + } + + std::vector Rows; + std::vector Bytes; + + NYql::NDq::TOperatorType OperatorType; + + void Resize(ui32 taskCount); +}; + struct TStageExecutionStats { NYql::NDq::TStageId StageId; @@ -122,13 +139,17 @@ struct TStageExecutionStats { std::map Input; std::map Output; + std::map Joins; + std::map Filters; + std::map Aggregations; + TTimeSeriesStats MaxMemoryUsage; ui32 HistorySampleCount; void Resize(ui32 taskCount); void SetHistorySampleCount(ui32 historySampleCount); void ExportHistory(ui64 baseTimeMs, NYql::NDqProto::TDqStageStats& stageStats); - ui64 UpdateAsyncStats(i32 index, TAsyncStats& aggrAsyncStats, const NYql::NDqProto::TDqAsyncBufferStats& asyncStats); + ui64 UpdateAsyncStats(ui32 index, TAsyncStats& aggrAsyncStats, const NYql::NDqProto::TDqAsyncBufferStats& asyncStats); ui64 UpdateStats(const NYql::NDqProto::TDqTaskStats& taskStats, ui64 maxMemoryUsage, ui64 durationUs); }; diff --git a/ydb/core/kqp/opt/kqp_query_plan.cpp b/ydb/core/kqp/opt/kqp_query_plan.cpp index 0f50f2d6fc4..2352541c340 100644 --- a/ydb/core/kqp/opt/kqp_query_plan.cpp +++ b/ydb/core/kqp/opt/kqp_query_plan.cpp @@ -608,7 +608,7 @@ private: Visit(table, range, sourceSettings, planNode); return; } - + const auto table = TString(sourceSettings.Table().Path()); const auto explainPrompt = TKqpReadTableExplainPrompt::Parse(sourceSettings.ExplainPrompt().Cast()); @@ -962,6 +962,8 @@ private: operatorId = Visit(maybeCombiner.Cast(), planNode); } else if (auto maybeBlockCombine = TMaybeNode(node)) { operatorId = Visit(maybeBlockCombine.Cast(), planNode); + } else if (auto maybeCombiner = TMaybeNode(node)) { + operatorId = Visit(maybeCombiner.Cast(), planNode); } else if (auto maybeSort = TMaybeNode(node)) { operatorId = Visit(maybeSort.Cast(), planNode); } else if (auto maybeTop = TMaybeNode(node)) { @@ -1016,8 +1018,8 @@ private: } else if (TMaybeNode(node)) { auto olapTable = TExprBase(node).Cast(); - auto pred = [](const TExprNode::TPtr& n) -> bool { - if (auto maybeFilter = TMaybeNode(n)) { return true; } return false; + auto pred = [](const TExprNode::TPtr& n) -> bool { + if (auto maybeFilter = TMaybeNode(n)) { return true; } return false; }; if (auto maybeKqpOlapFilter = FindNode(olapTable.Process().Body().Ptr(), pred)) { @@ -1094,7 +1096,7 @@ private: } else if (listPtr->Child(2)->ChildrenSize() == 0 && listPtr->Child(2)->Content()) { value = TString(listPtr->Child(2)->Content()); } - + return TStringBuilder() << attr << strComp[compSign] << value; } else if (strRegexp.contains(compSign)) { TString attr = TString(listPtr->Child(1)->Content()); @@ -1104,7 +1106,7 @@ private: } else if (listPtr->Child(2)->ChildrenSize() == 0 && listPtr->Child(2)->Content()) { value = TString(listPtr->Child(2)->Content()); } - + return Sprintf(strRegexp[compSign].c_str(), attr.c_str(), value.c_str()); } } @@ -1122,7 +1124,7 @@ private: delim = " AND "; } else if (TMaybeNode(node)) { delim = " OR "; - } + } return JoinStrings(s, delim); } @@ -1177,6 +1179,7 @@ private: std::variant Visit(const TCoCondense1& /*condense*/, TQueryPlanNode& planNode) { TOperator op; op.Properties["Name"] = "Aggregate"; + op.Properties["Phase"] = "Intermediate"; return AddOperator(planNode, "Aggregate", std::move(op)); } @@ -1184,6 +1187,7 @@ private: std::variant Visit(const TCoCondense& /*condense*/, TQueryPlanNode& planNode) { TOperator op; op.Properties["Name"] = "Aggregate"; + op.Properties["Phase"] = "Final"; return AddOperator(planNode, "Aggregate", std::move(op)); } @@ -1193,6 +1197,7 @@ private: op.Properties["Name"] = "Aggregate"; op.Properties["GroupBy"] = NPlanUtils::PrettyExprStr(combiner.KeyExtractor()); op.Properties["Aggregation"] = NPlanUtils::PrettyExprStr(combiner.UpdateHandler()); + op.Properties["Phase"] = "Intermediate"; return AddOperator(planNode, "Aggregate", std::move(op)); } @@ -1227,7 +1232,18 @@ private: } op.Properties["Aggregation"] = JoinStrings(std::move(aggrs), ","); } + op.Properties["Phase"] = "Intermediate"; + + return AddOperator(planNode, "Aggregate", std::move(op)); + } + std::variant Visit(const TCoWideCombiner& combiner, TQueryPlanNode& planNode) { + TOperator op; + op.Properties["Name"] = "Aggregate"; + // op.Properties["GroupBy"] = NPlanUtils::PrettyExprStr(combiner.KeyExtractor()); + // op.Properties["Aggregation"] = NPlanUtils::PrettyExprStr(combiner.UpdateHandler()); + // op.Properties["Finish"] = NPlanUtils::PrettyExprStr(combiner.FinishHandler()); + op.Properties["Phase"] = "Final"; return AddOperator(planNode, "Aggregate", std::move(op)); } @@ -1371,7 +1387,6 @@ private: std::variant Visit(const TCoPartitionByKey& partitionByKey, TQueryPlanNode& planNode) { const auto inputValue = NPlanUtils::PrettyExprStr(partitionByKey.Input()); - TOperator op; op.Properties["Name"] = "PartitionByKey"; @@ -1542,6 +1557,7 @@ private: TOperator op; op.Properties["Name"] = name; op.Properties["Condition"] = MakeJoinConditionString(join.LeftKeysColumnNames(), join.RightKeysColumnNames()); + AddOptimizerEstimates(op, join); return AddOperator(planNode, name, std::move(op)); @@ -1568,7 +1584,6 @@ private: std::variant Visit(const TCoFilterBase& filter, TQueryPlanNode& planNode) { TOperator op; op.Properties["Name"] = "Filter"; - auto pred = NPlanUtils::ExtractPredicate(filter.Lambda()); op.Properties["Predicate"] = pred.Body; @@ -2064,7 +2079,7 @@ struct TQueryPlanReconstructor { TQueryPlanReconstructor( const THashMap& planIndex, const THashMap& precomputes - ) + ) : PlanIndex(planIndex) , Precomputes(precomputes) , NodeIDCounter(0) @@ -2088,11 +2103,11 @@ struct TQueryPlanReconstructor { if (plan.GetMapSafe().contains("PlanNodeType")) { result["PlanNodeType"] = plan.GetMapSafe().at("PlanNodeType").GetStringSafe(); } - +/* if (plan.GetMapSafe().contains("Stats") && operatorIndex==0) { result["Stats"] = plan.GetMapSafe().at("Stats"); } - +*/ if (plan.GetMapSafe().at("Node Type") == "TableLookupJoin" && plan.GetMapSafe().contains("Table")) { result["Node Type"] = "LookupJoin"; NJson::TJsonValue newOps; @@ -2161,14 +2176,14 @@ struct TQueryPlanReconstructor { NJson::TJsonValue newOps; NJson::TJsonValue op; - op["Name"] = "TableLookup"; + op["Name"] = "TableLookup"; op["Columns"] = plan.GetMapSafe().at("Columns"); op["LookupKeyColumns"] = plan.GetMapSafe().at("LookupKeyColumns"); op["Table"] = plan.GetMapSafe().at("Table"); if (plan.GetMapSafe().contains("E-Cost")) { op["E-Cost"] = plan.GetMapSafe().at("E-Cost"); - } + } if (plan.GetMapSafe().contains("E-Rows")) { op["E-Rows"] = plan.GetMapSafe().at("E-Rows"); } @@ -2243,8 +2258,8 @@ struct TQueryPlanReconstructor { op.GetMapSafe().erase("Inputs"); } - if (op.GetMapSafe().contains("Input") - || op.GetMapSafe().contains("ToFlow") + if (op.GetMapSafe().contains("Input") + || op.GetMapSafe().contains("ToFlow") || op.GetMapSafe().contains("Member") || op.GetMapSafe().contains("AssumeSorted") || op.GetMapSafe().contains("Iterator")) { @@ -2267,7 +2282,110 @@ struct TQueryPlanReconstructor { } } - result["Node Type"] = std::move(opName); + result["Node Type"] = opName; + + if (plan.GetMapSafe().contains("Stats")) { + const auto& stats = plan.GetMapSafe().at("Stats").GetMapSafe(); + + auto operatorSize = false; + auto operatorRows = false; + TString opType; + TString opId = "0"; + + if (opName.Contains("Join (")) { + opType = "Join"; + } else if (opName == "Filter") { + opType = "Filter"; + } else if (opName == "Aggregate") { + opType = "Aggregation"; + } + + if (opType) { + if (op.GetMapSafe().contains("Id")) { + opId = op["Id"].GetStringSafe(); + } + + for (ui32 i = 0; i < ops.size(); i++) { + if (i != static_cast(operatorIndex)) { + auto op1 = ops[i]; + auto op1Name = op1.GetMapSafe().at("Name").GetStringSafe(); + TString op1Type; + TString op1Id = "0"; + + if (op1Name.Contains("Join (")) { + op1Type = "Join"; + } else if (op1Name == "Filter") { + if (!op1.GetMapSafe().contains("Pushdown") || op1.GetMapSafe().at("Pushdown").GetStringSafe() != "True") { + op1Type = "Filter"; + } + } else if (op1Name == "Aggregate") { + op1Type = "Aggregation"; + } + + if (op1Type == opType) { + if (op1.GetMapSafe().contains("Id")) { + op1Id = op1["Id"].GetStringSafe(); + } + + if (opId == op1Id) { + // colission detected, do not apply stats + opType = ""; + break; + } + } + } + } + } + + if (opType && stats.contains("Operator")) { + for (auto& opStat : stats.at("Operator").GetArraySafe()) { + if (opStat.IsMap()) { + auto& opMap = opStat.GetMapSafe(); + if (opMap.contains("Type") && opMap.at("Type").GetStringSafe() == opType + && opMap.contains("Id") && opMap.at("Id").GetStringSafe() == opId) { + + if (opMap.contains("Rows")) { + op["A-Rows"] = opMap.at("Rows").GetMapSafe().at("Sum").GetDouble(); + operatorRows = true; + } + if (opMap.contains("Bytes")) { + op["A-Size"] = opMap.at("Bytes").GetMapSafe().at("Sum").GetDouble(); + operatorSize = true; + } + break; + } + } + } + } + + if (operatorIndex == 0) { + + // top level rows/size have to match stage output + if (!operatorRows && stats.contains("OutputRows")) { + auto outputRows = stats.at("OutputRows"); + op["A-Rows"] = outputRows.IsMap() ? outputRows.GetMapSafe().at("Sum").GetDouble() : outputRows.GetDouble(); + } + if (!operatorSize && stats.contains("OutputBytes")) { + auto outputBytes = stats.at("OutputBytes"); + op["A-Size"] = outputBytes.IsMap() ? outputBytes.GetMapSafe().at("Sum").GetDouble() : outputBytes.GetDouble(); + } + + // cpu usage available for stage only, so assign it to top level operator + if (stats.contains("CpuTimeUs")) { + double opCpuTime; + + auto& cpuTime = stats.at("CpuTimeUs"); + if (cpuTime.IsMap()) { + opCpuTime = cpuTime.GetMapSafe().at("Max").GetDoubleSafe(); + } else { + opCpuTime = cpuTime.GetDoubleSafe(); + } + + op["A-SelfCpu"] = opCpuTime / 1000.0; + } + } + } + NJson::TJsonValue newOps; newOps.AppendValue(std::move(op)); result["Operators"] = std::move(newOps); @@ -2287,7 +2405,7 @@ private: const THashMap& PlanIndex; const THashMap& Precomputes; ui32 NodeIDCounter; - i32 Budget; // Prevent bugs with inf recursion + i32 Budget; // Prevent bugs with inf recursion }; double ComputeCpuTimes(NJson::TJsonValue& plan) { @@ -2299,69 +2417,18 @@ double ComputeCpuTimes(NJson::TJsonValue& plan) { } } - if (plan.GetMapSafe().contains("Stats") && plan.GetMapSafe().contains("Operators")) { + if (plan.GetMapSafe().contains("Operators")) { auto& ops = plan.GetMapSafe().at("Operators").GetArraySafe(); - - const auto& stats = plan.GetMapSafe().at("Stats").GetMapSafe(); - - if (stats.contains("CpuTimeUs")) { - double opCpuTime; - - auto& cpuTime = stats.at("CpuTimeUs"); - if (cpuTime.IsMap()) { - opCpuTime = cpuTime.GetMapSafe().at("Max").GetDoubleSafe(); - } else { - opCpuTime = cpuTime.GetDoubleSafe(); - } - - currCpuTime += opCpuTime; + auto& op = ops[0].GetMapSafe(); + if (op.contains("A-SelfCpu")) { + currCpuTime += op["A-SelfCpu"].GetDoubleSafe(); + op["A-Cpu"] = currCpuTime; } - - ops[0]["A-Cpu"] = currCpuTime / 1000.0; } return currCpuTime; } -void ComputeTotalRows(NJson::TJsonValue& plan) { - - if (plan.GetMapSafe().contains("Plans")) { - for (auto& p : plan.GetMapSafe().at("Plans").GetArraySafe()) { - ComputeTotalRows(p); - } - } - - if (plan.GetMapSafe().contains("Stats") && plan.GetMapSafe().contains("Operators")) { - auto& ops = plan.GetMapSafe().at("Operators").GetArraySafe(); - - const auto& stats = plan.GetMapSafe().at("Stats").GetMapSafe(); - - if (stats.contains("OutputRows")) { - auto outputRows = stats.at("OutputRows"); - double nRows; - if (outputRows.IsMap()) { - nRows = outputRows.GetMapSafe().at("Sum").GetDouble(); - } else { - nRows = outputRows.GetDouble(); - } - ops[0]["A-Rows"] = nRows; - } - } -} - -void RemoveStats(NJson::TJsonValue& plan) { - - if (plan.GetMapSafe().contains("Plans")) { - for (auto& p : plan.GetMapSafe().at("Plans").GetArraySafe()) { - RemoveStats(p); - } - } - - if (plan.GetMapSafe().contains("Stats")) { - plan.GetMapSafe().erase("Stats"); - } -} - NJson::TJsonValue SimplifyQueryPlan(NJson::TJsonValue& plan) { static const THashSet redundantNodes = { "UnionAll", @@ -2388,8 +2455,6 @@ NJson::TJsonValue SimplifyQueryPlan(NJson::TJsonValue& plan) { RemoveRedundantNodes(plan, redundantNodes); ComputeCpuTimes(plan); - ComputeTotalRows(plan); - RemoveStats(plan); return plan; } @@ -2883,6 +2948,42 @@ TString AddExecStatsToTxPlan(const TString& txPlanJson, const NYql::NDqProto::TD } } } + if (!(*stat)->GetOperatorJoin().empty() || !(*stat)->GetOperatorFilter().empty() || !(*stat)->GetOperatorAggregation().empty()) { + auto& operatorStats = stats.InsertValue("Operator", NJson::JSON_ARRAY); + for (auto& [id, op] : (*stat)->GetOperatorJoin()) { + auto& operatorInfo = operatorStats.AppendValue(NJson::JSON_MAP); + operatorInfo["Type"] = "Join"; + operatorInfo["Id"] = id; + if (op.HasBytes()) { + FillAggrStat(operatorInfo, op.GetBytes(), "Bytes"); + } + if (op.HasRows()) { + FillAggrStat(operatorInfo, op.GetRows(), "Rows"); + } + } + for (auto& [id, op] : (*stat)->GetOperatorFilter()) { + auto& operatorInfo = operatorStats.AppendValue(NJson::JSON_MAP); + operatorInfo["Type"] = "Filter"; + operatorInfo["Id"] = id; + if (op.HasBytes()) { + FillAggrStat(operatorInfo, op.GetBytes(), "Bytes"); + } + if (op.HasRows()) { + FillAggrStat(operatorInfo, op.GetRows(), "Rows"); + } + } + for (auto& [id, op] : (*stat)->GetOperatorAggregation()) { + auto& operatorInfo = operatorStats.AppendValue(NJson::JSON_MAP); + operatorInfo["Type"] = "Aggregation"; + operatorInfo["Id"] = id; + if (op.HasBytes()) { + FillAggrStat(operatorInfo, op.GetBytes(), "Bytes"); + } + if (op.HasRows()) { + FillAggrStat(operatorInfo, op.GetRows(), "Rows"); + } + } + } NKqpProto::TKqpStageExtraStats kqpStageStats; if ((*stat)->GetExtra().UnpackTo(&kqpStageStats)) { diff --git a/ydb/core/kqp/ut/query/kqp_explain_ut.cpp b/ydb/core/kqp/ut/query/kqp_explain_ut.cpp index 1c8f4e5cd0e..3eefbcc9111 100644 --- a/ydb/core/kqp/ut/query/kqp_explain_ut.cpp +++ b/ydb/core/kqp/ut/query/kqp_explain_ut.cpp @@ -167,8 +167,7 @@ Y_UNIT_TEST_SUITE(KqpExplain) { auto aggregate = FindPlanNodeByKv(read, "Name", "Aggregate"); UNIT_ASSERT(aggregate.IsDefined()); UNIT_ASSERT(aggregate.GetMapSafe().at("GroupBy").GetStringSafe() == "item.App"); - UNIT_ASSERT(aggregate.GetMapSafe().at("Aggregation").GetStringSafe() == - "{_yql_agg_0: MAX(item.Message,state._yql_agg_0),_yql_agg_1: MIN(item.Message,state._yql_agg_1)}"); + UNIT_ASSERT(aggregate.GetMapSafe().at("Aggregation").GetStringSafe() == "{MAX(item.Message),MIN(item.Message)}"); } Y_UNIT_TEST(ComplexJoin) { diff --git a/ydb/library/yql/dq/actors/compute/dq_compute_actor_stats.cpp b/ydb/library/yql/dq/actors/compute/dq_compute_actor_stats.cpp index 8a35905543c..0072d5f2af0 100644 --- a/ydb/library/yql/dq/actors/compute/dq_compute_actor_stats.cpp +++ b/ydb/library/yql/dq/actors/compute/dq_compute_actor_stats.cpp @@ -88,6 +88,29 @@ void FillTaskRunnerStats(ui64 taskId, ui32 stageId, const TTaskRunnerStatsBase& } } + for (const auto& opStat : taskStats.OperatorStat) { + auto& op = *protoTask->MutableOperators()->Add(); + op.SetOperatorId(opStat.OperatorId); + op.SetBytes(std::max(0, opStat.Bytes)); + op.SetRows(std::max(0, opStat.Rows)); + switch (opStat.OperatorType) { + case TOperatorType::Join: { + op.MutableJoin(); + } + break; + case TOperatorType::Filter: { + op.MutableFilter(); + } + break; + case TOperatorType::Aggregation: { + op.MutableAggregation(); + } + break; + default: + break; + } + } + TDqAsyncStats taskPushStats; for (auto& [srcStageId, inputChannels] : taskStats.InputChannels) { diff --git a/ydb/library/yql/dq/actors/protos/dq_stats.proto b/ydb/library/yql/dq/actors/protos/dq_stats.proto index 733bf969dc2..4a6d23038a0 100644 --- a/ydb/library/yql/dq/actors/protos/dq_stats.proto +++ b/ydb/library/yql/dq/actors/protos/dq_stats.proto @@ -161,6 +161,26 @@ message TDqDataProviderStats { uint64 Splits = 5; } +message TDqFilterStats { +} + +message TDqAggregationStats { +} + +message TDqJoinStats { +} + +message TDqOperatorStats { + string OperatorId = 1; + uint64 Bytes = 2; + uint64 Rows = 3; + oneof Type { + TDqJoinStats Join = 4; + TDqFilterStats Filter = 5; + TDqAggregationStats Aggregation = 6; + } +} + message TDqTaskStats { reserved 154; @@ -232,6 +252,8 @@ message TDqTaskStats { reserved 107; reserved 108; reserved 109; + + repeated TDqOperatorStats Operators = 159; } message TDqComputeActorStats { @@ -310,6 +332,26 @@ message TDqTableAggrStats { google.protobuf.Any Extra = 100; } +message TDqFilterStatsAggr { +} + +message TDqAggregationStatsAggr { +} + +message TDqJoinStatsAggr { +} + +message TDqOperatorStatsAggr { + string OperatorId = 1; + TDqStatsAggr Bytes = 2; + TDqStatsAggr Rows = 3; + oneof Type { + TDqJoinStatsAggr Join = 4; + TDqFilterStatsAggr Filter = 5; + TDqAggregationStatsAggr Aggregation = 6; + } +} + // aggregated stats for all tasks of the stage message TDqStageStats { uint32 StageId = 1; @@ -366,6 +408,13 @@ message TDqStageStats { map Egress = 20; // egress to external consumer, per provider map Input = 22; // input from other stage, per stage map Output = 23; // output to other stage, per stage + + // all operators share single default id "0", so put them into diferent maps + // will be joined into common map after unique id are implemented + map OperatorJoin = 43; + map OperatorFilter = 44; + map OperatorAggregation = 45; + TDqStatsAggr MaxMemoryUsage = 24; google.protobuf.Any Extra = 100; diff --git a/ydb/library/yql/dq/runtime/dq_tasks_counters.cpp b/ydb/library/yql/dq/runtime/dq_tasks_counters.cpp new file mode 100644 index 00000000000..e7cd3eab4c0 --- /dev/null +++ b/ydb/library/yql/dq/runtime/dq_tasks_counters.cpp @@ -0,0 +1,44 @@ +#include "dq_tasks_counters.h" + +namespace NYql::NDq { + +NYql::NUdf::TCounter TDqTaskCountersProvider::GetCounter(const NUdf::TStringRef& module, const NUdf::TStringRef& name, bool deriv) { + + TString op = TString(module); + + TOperatorStat* opStat = OperatorStat.FindPtr(op); + + if (!opStat) { + TString id; + TOperatorType opType(TOperatorType::Unknown); + + if (op.StartsWith(NKikimr::NMiniKQL::Operator_Join)) { + opType = TOperatorType::Join; + id = op.substr(NKikimr::NMiniKQL::Operator_Join.size()); + } else if (op.StartsWith(NKikimr::NMiniKQL::Operator_Aggregation)) { + opType = TOperatorType::Aggregation; + id = op.substr(NKikimr::NMiniKQL::Operator_Aggregation.size()); + } else if (op.StartsWith(NKikimr::NMiniKQL::Operator_Filter)) { + opType = TOperatorType::Filter; + id = op.substr(NKikimr::NMiniKQL::Operator_Filter.size()); + } else { + return NYql::NUdf::TCounter(); + } + + opStat = &OperatorStat[op]; + opStat->OperatorType = opType; + opStat->OperatorId = id; + }; + + if (name == NKikimr::NMiniKQL::Counter_OutputRows) { + return NYql::NUdf::TCounter(&opStat->Rows); + } + + return NYql::NUdf::TCounter(); +} + +NYql::NUdf::TScopedProbe TDqTaskCountersProvider::GetScopedProbe(const NUdf::TStringRef& module, const NUdf::TStringRef& name) { + return NYql::NUdf::TScopedProbe(); +} + +} // namespace NYql::NDq diff --git a/ydb/library/yql/dq/runtime/dq_tasks_counters.h b/ydb/library/yql/dq/runtime/dq_tasks_counters.h new file mode 100644 index 00000000000..34e0cc184ec --- /dev/null +++ b/ydb/library/yql/dq/runtime/dq_tasks_counters.h @@ -0,0 +1,38 @@ +#pragma once + +#include + +#include + +namespace NYql::NDq { + +// all values are signed to be NYql::NUdf::TCounter-compatible +// negative values are not used and discarded before export (to proto) + +enum TOperatorType { + Unknown, + Join, + Filter, + Aggregation +}; + +struct TOperatorStat { + TString OperatorId; + TOperatorType OperatorType; + // Operator Output + i64 Rows = 0; + i64 Bytes = 0; + // Operator specific stats +}; + +class TDqTaskCountersProvider : public NYql::NUdf::ICountersProvider { + +public: + NYql::NUdf::TCounter GetCounter(const NUdf::TStringRef& module, const NUdf::TStringRef& name, bool deriv) override; + + NYql::NUdf::TScopedProbe GetScopedProbe(const NUdf::TStringRef& module, const NUdf::TStringRef& name) override; + + THashMap OperatorStat; +}; + +} // namespace NYql::NDq diff --git a/ydb/library/yql/dq/runtime/dq_tasks_runner.cpp b/ydb/library/yql/dq/runtime/dq_tasks_runner.cpp index 1c0d1c5938e..dfc062d9593 100644 --- a/ydb/library/yql/dq/runtime/dq_tasks_runner.cpp +++ b/ydb/library/yql/dq/runtime/dq_tasks_runner.cpp @@ -1,4 +1,5 @@ #include "dq_tasks_runner.h" +#include "dq_tasks_counters.h" #include #include @@ -303,7 +304,7 @@ public: TComputationPatternOpts opts(alloc.Ref(), typeEnv, taskRunnerFactory, Context.FuncRegistry, NUdf::EValidateMode::None, validatePolicy, optLLVM, EGraphPerProcess::Multi, - AllocatedHolder->ProgramParsed.StatsRegistry.Get()); + AllocatedHolder->ProgramParsed.StatsRegistry.Get(), CollectFull() ? &CountersProvider : nullptr); if (!SecureParamsProvider) { SecureParamsProvider = MakeSimpleSecureParamsProvider(Settings.SecureParams); @@ -743,6 +744,11 @@ public: Stats->MkqlStats.emplace_back(TMkqlStat{key, value}); }); } + + Stats->OperatorStat.clear(); + for (auto& [_, opStat] : CountersProvider.OperatorStat) { + Stats->OperatorStat.push_back(opStat); + } } if (Y_LIKELY(CollectBasic())) { @@ -955,6 +961,8 @@ private: TDqTaskRunnerSettings Settings; TLogFunc LogFunc; std::unique_ptr SecureParamsProvider; + TDqTaskCountersProvider CountersProvider; + struct TInputTransformInfo { NUdf::TUnboxedValue TransformInput; IDqAsyncInputBuffer::TPtr TransformOutput; diff --git a/ydb/library/yql/dq/runtime/dq_tasks_runner.h b/ydb/library/yql/dq/runtime/dq_tasks_runner.h index a6dd76d218e..413083b5acd 100644 --- a/ydb/library/yql/dq/runtime/dq_tasks_runner.h +++ b/ydb/library/yql/dq/runtime/dq_tasks_runner.h @@ -1,5 +1,7 @@ #pragma once +#include "dq_tasks_counters.h" + #include #include #include @@ -66,6 +68,7 @@ struct TTaskRunnerStatsBase { THashMap> OutputChannels; // DstStageId => {ChannelId => Channel} TVector MkqlStats; + TVector OperatorStat; TTaskRunnerStatsBase() = default; TTaskRunnerStatsBase(TTaskRunnerStatsBase&&) = default; diff --git a/ydb/library/yql/dq/runtime/ya.make b/ydb/library/yql/dq/runtime/ya.make index 87dbf171b16..dd9f6fc16dd 100644 --- a/ydb/library/yql/dq/runtime/ya.make +++ b/ydb/library/yql/dq/runtime/ya.make @@ -14,6 +14,7 @@ PEERDIR( yql/essentials/parser/pg_wrapper/interface yql/essentials/providers/common/comp_nodes yql/essentials/providers/common/schema/mkql + yql/essentials/public/udf ydb/library/actors/util ) @@ -27,6 +28,7 @@ SRCS( dq_input_producer.cpp dq_output_channel.cpp dq_output_consumer.cpp + dq_tasks_counters.cpp dq_tasks_runner.cpp dq_transport.cpp ) diff --git a/ydb/library/yql/utils/plan/plan_utils.cpp b/ydb/library/yql/utils/plan/plan_utils.cpp index 15fa91510d6..95ad6f033b3 100644 --- a/ydb/library/yql/utils/plan/plan_utils.cpp +++ b/ydb/library/yql/utils/plan/plan_utils.cpp @@ -36,7 +36,17 @@ TString ToStr(const TCoPgConst& data) { TString ToStr(const TCoLambda& lambda) { - return PrettyExprStr(lambda.Body()); + if (lambda.Raw()->ChildrenSize() == 2) { + return PrettyExprStr(lambda.Body()); + } else { + TVector bodies; + for (size_t i = 1; i < lambda.Raw()->ChildrenSize(); i++) { + if (auto str = PrettyExprStr(TExprBase(lambda.Raw()->ChildPtr(i)))) { + bodies.push_back(std::move(str)); + } + } + return TStringBuilder() << "(" << JoinStrings(std::move(bodies), ",") << ")"; + } } TString ToStr(const TCoAsStruct& asStruct) { @@ -46,7 +56,8 @@ TString ToStr(const TCoAsStruct& asStruct) { auto value = PrettyExprStr(TExprBase(kv->Child(1))); if (!key.empty() && !value.empty()) { - args.push_back(TStringBuilder() << key << ": " << value); + if (key.StartsWith("_yql_agg_")) args.push_back(value); + else args.push_back(TStringBuilder() << key << ": " << value); } } @@ -64,6 +75,17 @@ TString ToStr(const TCoAsList& asList) { return TStringBuilder() << "[" << JoinStrings(std::move(args), ",") << "]"; } +TString ToStr(const TCoList& list) { + TVector args; + for (const auto& arg : list.Args()) { + if (auto str = PrettyExprStr(TExprBase(arg))) { + args.push_back(std::move(str)); + } + } + + return TStringBuilder() << "[" << JoinStrings(std::move(args), ",") << "]"; +} + TString ToStr(const TCoMember& member) { auto structName = PrettyExprStr(member.Struct()); auto memberName = PrettyExprStr(member.Name()); @@ -75,6 +97,10 @@ TString ToStr(const TCoMember& member) { return {}; } +TString ToStr(const TCoNth& nth) { + return TStringBuilder() << '#' << PrettyExprStr(nth.Index()); +} + TString ToStr(const TCoIfPresent& ifPresent) { /* expected IfPresent with 3 children: * 0-Optional, 1-PresentHandler, 2-MissingValue */ @@ -214,6 +240,8 @@ TString PrettyExprStr(const TExprBase& expr) { return ToStr(asStruct.Cast()); } else if (auto asList = expr.Maybe()) { return ToStr(asList.Cast()); + } else if (auto list = expr.Maybe()) { + return ToStr(list.Cast()); } else if (auto member = expr.Maybe()) { return ToStr(member.Cast()); } else if (auto ifPresent = expr.Maybe()) { @@ -223,8 +251,14 @@ TString PrettyExprStr(const TExprBase& expr) { } else if (expr.Maybe() || expr.Maybe() || expr.Maybe()) { return AggrOpToStr(expr); } else if (aggregations.contains(expr.Ref().Content())) { - return TStringBuilder() << aggregations.at(expr.Ref().Content()) << "(" - << PrettyExprStr(TExprBase(expr.Ref().Child(0))) << ',' << PrettyExprStr(TExprBase(expr.Ref().Child(1))) << ")"; + TVector children; + for (auto i = 0; i <= 1; i++) { + auto str = PrettyExprStr(TExprBase(expr.Ref().Child(i))); + if (str && !str.StartsWith("state._yql_agg_")) { + children.push_back(std::move(str)); + } + } + return TStringBuilder() << aggregations.at(expr.Ref().Content()) << "(" << JoinStrings(std::move(children), ",") << ")"; } else if (expr.Maybe() || expr.Maybe()) { return BinaryOpToStr(expr); } else if (expr.Maybe() || expr.Maybe() || expr.Maybe()) { @@ -234,8 +268,26 @@ TString PrettyExprStr(const TExprBase& expr) { } else if (expr.Maybe() || expr.Maybe() || expr.Maybe() || expr.Maybe() || expr.Maybe()) { return PrettyExprStr(TExprBase(expr.Ref().Child(0))); + } else if (auto nth = expr.Maybe()) { + // return ToStr(nth.Cast()); + return ""; + // } else if (auto arg = expr.Maybe()) { + // return ""; // not argument deduction yet, so just skip them + } else if (expr.Raw()->IsList()) { + TVector items; + for (const auto& item : expr.Raw()->ChildrenList()) { + if (auto str = PrettyExprStr(TExprBase(item))) { + if (!str.StartsWith("_yql_agg_")) { + items.push_back(std::move(str)); + } + } + } + + return TStringBuilder() << "[" << JoinStrings(std::move(items), ",") << "]"; } else { - return TString(expr.Ref().Content()); + auto raw = TString(expr.Ref().Content()); + // return raw.StartsWith("_yql_agg_") ? "" : raw; + return raw; } return {}; diff --git a/ydb/public/lib/ydb_cli/common/plan2svg.cpp b/ydb/public/lib/ydb_cli/common/plan2svg.cpp index ff6c91eab18..b02186489dd 100644 --- a/ydb/public/lib/ydb_cli/common/plan2svg.cpp +++ b/ydb/public/lib/ydb_cli/common/plan2svg.cpp @@ -736,6 +736,41 @@ void TPlan::LoadStage(std::shared_ptr stage, const NJson::TJsonValue& no } inputNode = stage->StatsNode->GetValueByPath("Input"); + + if (auto* operatorNode = stage->StatsNode->GetValueByPath("Operator")) { + TStringBuilder builder; + bool first = true; + for (const auto& subNode : operatorNode->GetArray()) { + TString id = "UNKNOWN_ID"; + if (auto* idNode = subNode.GetValueByPath("Id")) { + id = idNode->GetStringSafe(); + } + TString type = "UNKNOWN_TYPE"; + if (auto* typeNode = subNode.GetValueByPath("Type")) { + type = typeNode->GetStringSafe(); + } + if (first) { + first = false; + } else { + builder << "; "; + } + builder << type << ':' << id; + ui64 rows = 0; + ui64 bytes = 0; + if (auto* rowsSumNode = subNode.GetValueByPath("Rows.Sum")) { + rows = rowsSumNode->GetIntegerSafe(); + builder << ", Rows: \u2211" << FormatIntegerValue(rows); + } + if (auto* bytesSumNode = subNode.GetValueByPath("Bytes.Sum")) { + bytes = bytesSumNode->GetIntegerSafe(); + builder << ", Bytes: \u2211" << FormatBytes(bytes); + } + if (rows && bytes) { + builder << ", Width: " << FormatBytes(bytes / rows); + } + } + stage->OperatorInfo = builder; + } } if (auto* subNode = node.GetValueByPath("Plans")) { @@ -890,7 +925,7 @@ void TPlan::LoadSource(std::shared_ptr source, const NJson::TJsonValue& } builder << ")"; source->Info.push_back(builder); - + auto est = GetEstimation(subNode); if (est) { source->Info.push_back(est); @@ -1140,6 +1175,11 @@ void TPlan::PrintSvg(ui64 maxTime, ui32& offsetY, TStringBuilder& background, TS << "' width='" << INDENT_X << "' height='" << s->IndentY - y << "' stroke-width='0' fill='" << Config.Palette.StageMain << "'/>" << Endl; } + + if (s->OperatorInfo) { + background + << "" << s->OperatorInfo << "" << Endl; + } background << "" << ToString(s->PhysicalStageId) << "" << Endl; + if (s->OperatorInfo) { + background + << "" << Endl; + } { ui32 y0 = s->OffsetY + INTERNAL_TEXT_HEIGHT + (INTERNAL_HEIGHT - INTERNAL_TEXT_HEIGHT) / 2 + offsetY; @@ -1645,7 +1689,7 @@ TString TPlanVisualizer::PrintSvg() { for (auto& p : Plans) { offsetY += GAP_Y; canvas - << "" << p.NodeType << "" << Endl; @@ -1763,7 +1807,7 @@ TString TPlanVisualizer::PrintSvg() { auto timeLabel = Sprintf("%lu:%.2lu", t / 60, t % 60); for (auto& p : Plans) { svg - << "" << timeLabel << "" << Endl; } diff --git a/ydb/public/lib/ydb_cli/common/plan2svg.h b/ydb/public/lib/ydb_cli/common/plan2svg.h index 53e938937ad..275ff5020a7 100644 --- a/ydb/public/lib/ydb_cli/common/plan2svg.h +++ b/ydb/public/lib/ydb_cli/common/plan2svg.h @@ -140,6 +140,7 @@ public: ui32 PhysicalStageId = 0; ui32 Tasks = 0; const NJson::TJsonValue* StatsNode = nullptr; + TString OperatorInfo; }; struct TColorPalette { diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_explain.script-script_/explain.script.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_explain.script-script_/explain.script.plan index 67144fea89c..f58f4c4c1d8 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_explain.script-script_/explain.script.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_explain.script-script_/explain.script.plan @@ -56,7 +56,7 @@ "PlanNodeType": "ResultSet", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -64,16 +64,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -92,7 +102,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, @@ -175,7 +186,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -183,16 +194,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -211,7 +232,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], @@ -266,7 +288,7 @@ "PlanNodeType": "ResultSet", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -274,16 +296,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -302,7 +334,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, @@ -385,7 +418,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -393,16 +426,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -421,7 +464,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan index 15e1812ce79..e04d82c27ea 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_join_group_by_lookup.script-script_/join_group_by_lookup.script.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.a.Group,Arg.a.Count0,Arg.t.Value]" } ], "PlanNodeId": 8, @@ -75,7 +75,18 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Stage", + "Node Type": "Aggregate", + "Operators": [ + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" + } + ], "PlanNodeId": 4, "Plans": [ { @@ -90,14 +101,15 @@ "Node Type": "Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", + "Aggregation": "{SUM(1)}", "GroupBy": "item.Group", "Inputs": [ { "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan index cbf7c030740..3bdb7ff1b3c 100644 --- a/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan +++ b/ydb/tests/functional/canonical/canondata/test_sql.TestCanonicalFolder1.test_case_write_write_group_by.script-script_/write_write_group_by.script.plan @@ -150,7 +150,18 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Stage", + "Node Type": "Aggregate", + "Operators": [ + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" + } + ], "PlanNodeId": 4, "Plans": [ { @@ -165,14 +176,15 @@ "Node Type": "Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_0: MIN(item.Amount,state._yql_agg_0)}", + "Aggregation": "{MIN(item.Amount)}", "GroupBy": "item.Group", "Inputs": [ { "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-0 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-0 index 562f06f825a..0bb212d16f7 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-0 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-0 @@ -35,7 +35,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -43,16 +43,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-1 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-1 index 1500a361d17..62a0fe6408e 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-1 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-1 @@ -35,7 +35,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -43,16 +43,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-10 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-10 index 4c2f9424106..4da7415d38e 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-10 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-10 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 4 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 5, @@ -59,17 +68,27 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate", + "Node Type": "Aggregate-Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_0: Inc(state._yql_agg_0)}", + "Aggregation": "{Inc(state._yql_agg_0)}", "GroupBy": "item.MobilePhoneModel", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], + "Name": "Aggregate", + "Phase": "Intermediate" + }, + { "Inputs": [ { "ExternalPlanNodeId": 2 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -88,13 +107,14 @@ "Operators": [ { "Aggregation": "state", - "GroupBy": "", + "GroupBy": "[item.MobilePhoneModel,item.UserID]", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-11 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-11 index 458bb94b3fe..619cecb110d 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-11 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-11 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 4 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 5, @@ -60,17 +69,27 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate", + "Node Type": "Aggregate-Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_0: Inc(state._yql_agg_0)}", - "GroupBy": "", + "Aggregation": "{Inc(state._yql_agg_0)}", + "GroupBy": "[item.MobilePhone,item.MobilePhoneModel]", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], + "Name": "Aggregate", + "Phase": "Intermediate" + }, + { "Inputs": [ { "ExternalPlanNodeId": 2 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -90,13 +109,14 @@ "Operators": [ { "Aggregation": "state", - "GroupBy": "", + "GroupBy": "[item.MobilePhone,item.MobilePhoneModel,item.UserID]", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12 index 1beae1ad3d3..18c12bcc3b3 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-12 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-13 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-13 index 0dc2f569a0f..d8659c103f0 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-13 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-13 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 4 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 5, @@ -59,17 +68,27 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate", + "Node Type": "Aggregate-Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_0: Inc(state._yql_agg_0)}", + "Aggregation": "{Inc(state._yql_agg_0)}", "GroupBy": "item.SearchPhrase", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], + "Name": "Aggregate", + "Phase": "Intermediate" + }, + { "Inputs": [ { "ExternalPlanNodeId": 2 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -88,13 +107,14 @@ "Operators": [ { "Aggregation": "state", - "GroupBy": "", + "GroupBy": "[item.SearchPhrase,item.UserID]", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14 index d77d2f2820a..58ac5499d98 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-14 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15 index 1c919de1093..945e3060aba 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-15 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16 index 7536658c2a8..6600922267c 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-16 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17 index 689cec1c9f7..649558dcf25 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-17 @@ -35,16 +35,25 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Limit", + "Node Type": "Limit-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-18 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-18 index a10c67d40e7..f40823732ff 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-18 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-18 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -64,14 +73,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", - "GroupBy": "", + "Aggregation": "{SUM(1)}", + "GroupBy": "[item.SearchPhrase,item.UserID,item.m]", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-2 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-2 index 8e13231013c..49697535204 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-2 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-2 @@ -44,7 +44,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -52,16 +52,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-20 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-20 index 6cf40af1d4a..5b2c56bd86c 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-20 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-20 @@ -35,7 +35,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -43,16 +43,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21 index 7b6c9a9f0e6..edf15b4c49c 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-21 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-22 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-22 index f907b18c81a..140661c3198 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-22 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-22 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 7 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 8, @@ -294,17 +303,27 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate", + "Node Type": "Aggregate-Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_1: Inc(state._yql_agg_1)}", + "Aggregation": "{Inc(state._yql_agg_1)}", "GroupBy": "item.SearchPhrase", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], + "Name": "Aggregate", + "Phase": "Intermediate" + }, + { "Inputs": [ { "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-26 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-26 index d0b5bba656b..af7fd902250 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-26 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-26 @@ -45,7 +45,7 @@ ], "Limit": "10", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[$5.EventTime,$5.SearchPhrase]" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-27 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-27 index 2c43a874612..c06ce780055 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-27 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-27 @@ -35,7 +35,7 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort-Filter", + "Node Type": "TopSort-Filter-Aggregate", "Operators": [ { "Inputs": [ @@ -56,11 +56,20 @@ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 2 } ], "Name": "Filter", "Predicate": "item.Count0 > 100000" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -77,14 +86,15 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1)}", + "Aggregation": "{[SUM(Size),Inc()],SUM(1)}", "GroupBy": "item.CounterID", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-28 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-28 index 77f85d5263c..f4799078add 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-28 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-28 @@ -35,7 +35,7 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort-Filter", + "Node Type": "TopSort-Filter-Aggregate", "Operators": [ { "Inputs": [ @@ -59,11 +59,20 @@ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 2 } ], "Name": "Filter", "Predicate": "item.Count0 > 100000" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -80,14 +89,15 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: MIN(item.Referer,state._yql_agg_2)}", + "Aggregation": "{[SUM(Size),Inc()],SUM(1),MIN(item.Referer)}", "GroupBy": "item.key", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-29 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-29 index f435018ed9f..f3afc5cc40f 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-29 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-29 @@ -44,7 +44,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -52,16 +52,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -80,7 +90,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-3 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-3 index 66f05cc8f67..e667ce85d51 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-3 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-3 @@ -35,7 +35,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -43,16 +43,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30 index e4d1ad35254..5a6bdfad359 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-30 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31 index 1ee0b93bf7c..d8897c0c524 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-31 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32 index 096a3565da1..3fa73c82a7a 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-32 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33 index 44f5ac8e897..22f5d90fc5c 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-33 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34 index 217b0ae56ae..e17f1fd9c87 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-34 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-35 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-35 index 7a41c9967d8..865a2da2a58 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-35 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-35 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -65,14 +74,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", - "GroupBy": "", + "Aggregation": "{SUM(1)}", + "GroupBy": "[item.ClientIP,item.group0,item.group1,item.group2]", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36 index bb95203e92d..ba16186097a 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-36 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37 index f50acc67fd8..4204b5b21c9 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-37 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38 index f1d06ac272b..dd1287f4f42 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-38 @@ -64,17 +64,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "SUM(10,1000)", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-39 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-39 index d5a4f02a7a2..b6942fbf0ea 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-39 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-39 @@ -64,17 +64,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "SUM(10,1000)", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -95,14 +104,15 @@ "Node Type": "Aggregate-Filter-TableRangeScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", - "GroupBy": "", + "Aggregation": "{SUM(1)}", + "GroupBy": "[item.AdvEngineID,item.Dst,item.SearchEngineID,item.Src,item.TraficSourceID]", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-4 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-4 index 1d5c44b0108..5bd97d99cc8 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-4 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-4 @@ -35,7 +35,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -43,16 +43,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 4 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 5, @@ -63,15 +73,25 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate", + "Node Type": "Aggregate-Aggregate", "Operators": [ + { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], + "Name": "Aggregate", + "Phase": "Intermediate" + }, { "Inputs": [ { "ExternalPlanNodeId": 2 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -95,7 +115,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-40 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-40 index a4721c6b70e..9f9d12e28b8 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-40 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-40 @@ -64,17 +64,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "SUM(10,100)", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-41 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-41 index 6785ea43d71..424178c8e04 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-41 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-41 @@ -64,17 +64,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "SUM(10,10000)", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-42 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-42 index 56cd70cd3f4..7f0344dcc5e 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-42 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-42 @@ -64,17 +64,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "SUM(10,1000)", "Name": "TopSort", "TopSortBy": "argument.Minute" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -91,14 +100,15 @@ "Node Type": "Aggregate-Filter-TableRangeScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", + "Aggregation": "{SUM(1)}", "GroupBy": "item.Minute", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-5 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-5 index 850b7d557f7..bc68e601534 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-5 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-5 @@ -35,7 +35,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -43,16 +43,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 4 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 5, @@ -63,15 +73,25 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate", + "Node Type": "Aggregate-Aggregate", "Operators": [ + { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], + "Name": "Aggregate", + "Phase": "Intermediate" + }, { "Inputs": [ { "ExternalPlanNodeId": 2 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -95,7 +115,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-6 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-6 index f974ddaccfd..45f467dd7ea 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-6 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-6 @@ -44,7 +44,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -52,16 +52,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-7 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-7 index 9b0289fec30..9da63adb1e6 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-7 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-7 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-8 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-8 index 5cb57ff65da..af6d24e67de 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-8 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-8 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 4 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 5, @@ -59,17 +68,27 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate", + "Node Type": "Aggregate-Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_0: Inc(state._yql_agg_0)}", + "Aggregation": "{Inc(state._yql_agg_0)}", "GroupBy": "item.RegionID", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], + "Name": "Aggregate", + "Phase": "Intermediate" + }, + { "Inputs": [ { "ExternalPlanNodeId": 2 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -88,13 +107,14 @@ "Operators": [ { "Aggregation": "state", - "GroupBy": "", + "GroupBy": "[item.RegionID,item.UserID]", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-9 b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-9 index ac0683b0425..cda0a009b16 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-9 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_column_/queries-original-plan-column-9 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 7 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 8, @@ -141,17 +150,27 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate", + "Node Type": "Aggregate-Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_2: Inc(state._yql_agg_2)}", + "Aggregation": "{Inc(state._yql_agg_2)}", "GroupBy": "item.RegionID", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], + "Name": "Aggregate", + "Phase": "Intermediate" + }, + { "Inputs": [ { "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-0 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-0 index 03c8764c996..c2462b30949 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-0 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-0 @@ -35,7 +35,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -43,16 +43,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -71,7 +81,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-1 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-1 index e8294d3eda0..d05a1018f8d 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-1 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-1 @@ -35,7 +35,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -43,16 +43,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -67,7 +77,8 @@ "Operators": [ { "Inputs": [], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-10 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-10 index 59fd2550719..d5a6c4e483b 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-10 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-10 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 4 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 5, @@ -59,17 +68,27 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate", + "Node Type": "Aggregate-Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_0: COUNT(item.UserID,state._yql_agg_0)}", + "Aggregation": "{COUNT(item.UserID)}", "GroupBy": "item.MobilePhoneModel", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], + "Name": "Aggregate", + "Phase": "Intermediate" + }, + { "Inputs": [ { "ExternalPlanNodeId": 2 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -88,13 +107,14 @@ "Operators": [ { "Aggregation": "state", - "GroupBy": "", + "GroupBy": "[item.MobilePhoneModel,item.UserID]", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-11 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-11 index 93833591393..1d6c5698307 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-11 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-11 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 4 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 5, @@ -60,17 +69,27 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate", + "Node Type": "Aggregate-Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_0: COUNT(item.UserID,state._yql_agg_0)}", - "GroupBy": "", + "Aggregation": "{COUNT(item.UserID)}", + "GroupBy": "[item.MobilePhone,item.MobilePhoneModel]", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], + "Name": "Aggregate", + "Phase": "Intermediate" + }, + { "Inputs": [ { "ExternalPlanNodeId": 2 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -90,13 +109,14 @@ "Operators": [ { "Aggregation": "state", - "GroupBy": "", + "GroupBy": "[item.MobilePhone,item.MobilePhoneModel,item.UserID]", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-12 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-12 index 349c280d09b..d6aab99332b 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-12 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-12 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -62,14 +71,15 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", + "Aggregation": "{SUM(1)}", "GroupBy": "item.SearchPhrase", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-13 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-13 index 26dc6dca138..30c06f0254e 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-13 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-13 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 4 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 5, @@ -59,17 +68,27 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate", + "Node Type": "Aggregate-Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_0: COUNT(item.UserID,state._yql_agg_0)}", + "Aggregation": "{COUNT(item.UserID)}", "GroupBy": "item.SearchPhrase", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], + "Name": "Aggregate", + "Phase": "Intermediate" + }, + { "Inputs": [ { "ExternalPlanNodeId": 2 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -88,13 +107,14 @@ "Operators": [ { "Aggregation": "state", - "GroupBy": "", + "GroupBy": "[item.SearchPhrase,item.UserID]", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-14 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-14 index dbd414b8578..c2cc629a427 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-14 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-14 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -63,14 +72,15 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", - "GroupBy": "", + "Aggregation": "{SUM(1)}", + "GroupBy": "[item.SearchEngineID,item.SearchPhrase]", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-15 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-15 index 9d21f06cb09..f0158cea6f7 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-15 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-15 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -62,14 +71,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", + "Aggregation": "{SUM(1)}", "GroupBy": "item.UserID", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-16 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-16 index 5cfcf0142e4..7388250fd87 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-16 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-16 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -63,14 +72,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", - "GroupBy": "", + "Aggregation": "{SUM(1)}", + "GroupBy": "[item.SearchPhrase,item.UserID]", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-17 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-17 index 92fb20813c7..0bda789e294 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-17 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-17 @@ -35,16 +35,25 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Limit", + "Node Type": "Limit-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -62,14 +71,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", - "GroupBy": "", + "Aggregation": "{SUM(1)}", + "GroupBy": "[item.SearchPhrase,item.UserID]", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-18 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-18 index bf9356f97d3..fb427bb1b24 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-18 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-18 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -64,14 +73,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", - "GroupBy": "", + "Aggregation": "{SUM(1)}", + "GroupBy": "[item.SearchPhrase,item.UserID,item.m]", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-2 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-2 index 0b4132dbe00..5b8accc80f2 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-2 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-2 @@ -44,7 +44,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -52,16 +52,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -80,7 +90,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-20 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-20 index 26cdf9465c7..6aded1c2418 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-20 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-20 @@ -35,7 +35,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -43,16 +43,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -67,7 +77,8 @@ "Operators": [ { "Inputs": [], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-21 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-21 index c00b66d8b03..da008dd23e0 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-21 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-21 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -62,14 +71,15 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1),_yql_agg_1: MIN(item.URL,state._yql_agg_1)}", + "Aggregation": "{SUM(1),MIN(item.URL)}", "GroupBy": "item.SearchPhrase", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-22 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-22 index d77fc99b693..5657342da76 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-22 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-22 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 7 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 8, @@ -127,17 +136,27 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate", + "Node Type": "Aggregate-Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_1: COUNT(item.UserID,state._yql_agg_1)}", + "Aggregation": "{COUNT(item.UserID)}", "GroupBy": "item.SearchPhrase", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], + "Name": "Aggregate", + "Phase": "Intermediate" + }, + { "Inputs": [ { "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-26 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-26 index babb59d9798..5cec9fc4f72 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-26 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-26 @@ -45,7 +45,7 @@ ], "Limit": "10", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[$5.EventTime,$5.SearchPhrase]" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-27 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-27 index e4d18974ac8..6f536381634 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-27 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-27 @@ -35,7 +35,7 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort-Filter", + "Node Type": "TopSort-Filter-Aggregate", "Operators": [ { "Inputs": [ @@ -56,11 +56,20 @@ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 2 } ], "Name": "Filter", "Predicate": "item.Count0 > 100000" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -77,14 +86,15 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1)}", + "Aggregation": "{[SUM(Size),Inc()],SUM(1)}", "GroupBy": "item.CounterID", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-28 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-28 index d3e984643c6..0cdd3f1c9d7 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-28 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-28 @@ -35,7 +35,7 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort-Filter", + "Node Type": "TopSort-Filter-Aggregate", "Operators": [ { "Inputs": [ @@ -59,11 +59,20 @@ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 2 } ], "Name": "Filter", "Predicate": "item.Count0 > 100000" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -80,7 +89,7 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: MIN(item.Referer,state._yql_agg_2)}", + "Aggregation": "{[SUM(Size),Inc()],SUM(1),MIN(item.Referer)}", "GroupBy": "item.key", "Inputs": [ { @@ -90,7 +99,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-29 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-29 index 0c64f087d11..f58a1a630aa 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-29 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-29 @@ -44,7 +44,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -52,16 +52,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -80,7 +90,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-3 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-3 index 5a38182fb1e..9e148fb2b24 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-3 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-3 @@ -35,7 +35,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -43,16 +43,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -71,7 +81,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-30 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-30 index b85912feafa..24c808b3392 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-30 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-30 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -63,8 +72,8 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: SUM(item.IsRefresh,state._yql_agg_2)}", - "GroupBy": "", + "Aggregation": "{[SUM(item.ResolutionWidth),Inc()],SUM(1),SUM(item.IsRefresh)}", + "GroupBy": "[item.ClientIP,item.SearchEngineID]", "Inputs": [ { "InternalOperatorId": 1 @@ -79,7 +88,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-31 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-31 index 028bfaf68a5..c24d9bccb86 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-31 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-31 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -63,8 +72,8 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: SUM(item.IsRefresh,state._yql_agg_2)}", - "GroupBy": "", + "Aggregation": "{[SUM(item.ResolutionWidth),Inc()],SUM(1),SUM(item.IsRefresh)}", + "GroupBy": "[item.ClientIP,item.WatchID]", "Inputs": [ { "InternalOperatorId": 1 @@ -79,7 +88,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-32 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-32 index b167e08a191..ea9c2c32eff 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-32 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-32 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -63,14 +72,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_1: SUM(state._yql_agg_1,1),_yql_agg_2: SUM(item.IsRefresh,state._yql_agg_2)}", - "GroupBy": "", + "Aggregation": "{[SUM(item.ResolutionWidth),Inc()],SUM(1),SUM(item.IsRefresh)}", + "GroupBy": "[item.ClientIP,item.WatchID]", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-33 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-33 index 1f188ff8584..41818500098 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-33 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-33 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -62,14 +71,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", + "Aggregation": "{SUM(1)}", "GroupBy": "item.URL", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-34 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-34 index 52d5f5732b5..8a2fcf876bd 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-34 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-34 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -63,14 +72,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", - "GroupBy": "", + "Aggregation": "{SUM(1)}", + "GroupBy": "[item.URL,item.UserID]", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-35 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-35 index e2d4f06b69b..08b1213bc92 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-35 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-35 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -65,14 +74,15 @@ "Node Type": "Aggregate-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", - "GroupBy": "", + "Aggregation": "{SUM(1)}", + "GroupBy": "[item.ClientIP,item.group0,item.group1,item.group2]", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-36 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-36 index f2137c5317c..48401a73c61 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-36 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-36 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -62,14 +71,15 @@ "Node Type": "Aggregate-Filter-TableRangeScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", + "Aggregation": "{SUM(1)}", "GroupBy": "item.URL", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-37 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-37 index c7147142f9f..b130bf751f4 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-37 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-37 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -62,14 +71,15 @@ "Node Type": "Aggregate-Filter-TableRangeScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", + "Aggregation": "{SUM(1)}", "GroupBy": "item.Title", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-38 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-38 index 61c09cbf115..2290132b789 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-38 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-38 @@ -64,17 +64,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "SUM(10,1000)", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -91,14 +100,15 @@ "Node Type": "Aggregate-Filter-TableRangeScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", + "Aggregation": "{SUM(1)}", "GroupBy": "item.URL", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-39 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-39 index 026794552fe..66de9f8e939 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-39 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-39 @@ -64,17 +64,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "SUM(10,1000)", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -95,8 +104,8 @@ "Node Type": "Aggregate-Filter-TableRangeScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", - "GroupBy": "", + "Aggregation": "{SUM(1)}", + "GroupBy": "[item.AdvEngineID,item.Dst,item.SearchEngineID,item.Src,item.TraficSourceID]", "Inputs": [ { "InternalOperatorId": 1 @@ -120,7 +129,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-4 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-4 index 622953f3123..bc41b559f82 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-4 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-4 @@ -35,7 +35,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -43,16 +43,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 4 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 5, @@ -63,15 +73,25 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate", + "Node Type": "Aggregate-Aggregate", "Operators": [ + { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], + "Name": "Aggregate", + "Phase": "Intermediate" + }, { "Inputs": [ { "ExternalPlanNodeId": 2 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -95,7 +115,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-40 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-40 index d1be8cef861..eef5f31fb1c 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-40 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-40 @@ -64,17 +64,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "SUM(10,100)", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -92,8 +101,8 @@ "Node Type": "Aggregate-Filter-TableRangeScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", - "GroupBy": "", + "Aggregation": "{SUM(1)}", + "GroupBy": "[item.EventDate,item.URLHash]", "Inputs": [ { "InternalOperatorId": 1 @@ -102,7 +111,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-41 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-41 index c9704a8bd82..4bb3336b9f2 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-41 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-41 @@ -64,17 +64,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "SUM(10,10000)", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -92,8 +101,8 @@ "Node Type": "Aggregate-Filter-TableRangeScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", - "GroupBy": "", + "Aggregation": "{SUM(1)}", + "GroupBy": "[item.WindowClientHeight,item.WindowClientWidth]", "Inputs": [ { "InternalOperatorId": 1 @@ -102,7 +111,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-42 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-42 index 8e9fda0c114..ffb4dbf5606 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-42 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-42 @@ -64,17 +64,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "SUM(10,1000)", "Name": "TopSort", "TopSortBy": "argument.Minute" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -91,14 +100,15 @@ "Node Type": "Aggregate-Filter-TableRangeScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", + "Aggregation": "{SUM(1)}", "GroupBy": "item.Minute", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-5 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-5 index 87b9d56fb80..4cea77cbbdb 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-5 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-5 @@ -35,7 +35,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -43,16 +43,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 4 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 5, @@ -63,15 +73,25 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate", + "Node Type": "Aggregate-Aggregate", "Operators": [ + { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], + "Name": "Aggregate", + "Phase": "Intermediate" + }, { "Inputs": [ { "ExternalPlanNodeId": 2 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -95,7 +115,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-6 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-6 index 68056218923..08cce67b7c9 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-6 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-6 @@ -44,7 +44,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -52,16 +52,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -80,7 +90,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-7 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-7 index 13c490210a8..8ed04c815aa 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-7 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-7 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 2 + "InternalOperatorId": 1 } ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 2 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -62,14 +71,15 @@ "Node Type": "Aggregate-Filter-TableFullScan", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(state._yql_agg_0,1)}", + "Aggregation": "{SUM(1)}", "GroupBy": "item.AdvEngineID", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-8 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-8 index bb3463a08bf..5da0cac66ee 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-8 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-8 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 4 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 4 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 5, @@ -59,17 +68,27 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate", + "Node Type": "Aggregate-Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_0: COUNT(item.UserID,state._yql_agg_0)}", + "Aggregation": "{COUNT(item.UserID)}", "GroupBy": "item.RegionID", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], + "Name": "Aggregate", + "Phase": "Intermediate" + }, + { "Inputs": [ { "ExternalPlanNodeId": 2 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 3, @@ -88,13 +107,14 @@ "Operators": [ { "Aggregation": "state", - "GroupBy": "", + "GroupBy": "[item.RegionID,item.UserID]", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [], diff --git a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-9 b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-9 index 5990205706d..5dd92613d56 100644 --- a/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-9 +++ b/ydb/tests/functional/clickbench/canondata/test.test_plans_row_/queries-original-plan-row-9 @@ -35,17 +35,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 7 + "InternalOperatorId": 1 } ], "Limit": "10", "Name": "TopSort", "TopSortBy": "argument.Count0" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 8, @@ -118,17 +127,27 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate", + "Node Type": "Aggregate-Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_2: COUNT(item.UserID,state._yql_agg_2)}", + "Aggregation": "{COUNT(item.UserID)}", "GroupBy": "item.RegionID", + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], + "Name": "Aggregate", + "Phase": "Intermediate" + }, + { "Inputs": [ { "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_2.plan index 84fd8187957..eac05adfe31 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_2.plan @@ -29,17 +29,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 7 + "InternalOperatorId": 1 } ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.t1.q2" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 8, @@ -56,14 +65,15 @@ "Node Type": "Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_0: COUNT(item.t1.q1,state._yql_agg_0)}", + "Aggregation": "{COUNT(item.t1.q1)}", "GroupBy": "item.t1.q2", "Inputs": [ { "ExternalPlanNodeId": 5 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 6, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_3.plan index 0705de10314..b6df1baaa66 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_3.plan @@ -29,17 +29,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 7 + "InternalOperatorId": 1 } ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.t1.q2" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 7 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 8, @@ -56,14 +65,15 @@ "Node Type": "Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_0: COUNT(item.t2.q1,state._yql_agg_0)}", + "Aggregation": "{COUNT(item.t2.q1)}", "GroupBy": "item.t1.q2", "Inputs": [ { "ExternalPlanNodeId": 5 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 6, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_4.plan index 248e892aebd..77416903817 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_4.plan @@ -29,17 +29,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 12 + "InternalOperatorId": 1 } ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.t1.q2" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 12 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 13, @@ -56,14 +65,15 @@ "Node Type": "Aggregate-LeftJoin (MapJoin)-Filter", "Operators": [ { - "Aggregation": "{_yql_agg_0: COUNT(item.t2.q1,state._yql_agg_0)}", + "Aggregation": "{COUNT(item.t2.q1)}", "GroupBy": "item.t1.q2", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Condition": "t1.q2 = t2.q1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_5.plan index 47bcfcdf6b0..171d2ead2d7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join-group-by-with-null.test_/query_5.plan @@ -29,17 +29,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 10 + "InternalOperatorId": 1 } ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "argument.t1.q2" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 10 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 11, @@ -56,14 +65,15 @@ "Node Type": "Aggregate-LeftJoin (MapJoin)-Filter", "Operators": [ { - "Aggregation": "{_yql_agg_0: COUNT(item.t2.q1,state._yql_agg_0)}", + "Aggregation": "{COUNT(item.t2.q1)}", "GroupBy": "item.t1.q2", "Inputs": [ { "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Condition": "t1.q2 = t2.q1", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_1.plan index 6a60be6db41..df909ed908a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_1.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.i1.q1,Arg.i1.q2]" }, { "Condition": "i1.q2 = i2_1.q2", @@ -112,7 +112,7 @@ "Operators": [ { "Inputs": [], - "Iterator": "[]", + "Iterator": "[[{q1: 123},{x: 123}]]", "Name": "Iterator" } ], diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_16.plan index 7fa9561ff82..a0cc6ce716e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_16.plan @@ -9,7 +9,7 @@ "PlanNodeType": "ResultSet", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -17,16 +17,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 12 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 12 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 13, @@ -41,7 +51,8 @@ "Operators": [ { "Inputs": [], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_2.plan index 700048ce0fc..bc07c151569 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_2.plan @@ -158,7 +158,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -166,16 +166,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -194,7 +204,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_3.plan index ce56245ae4f..10c4a0652f3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_3.plan @@ -9,7 +9,7 @@ "PlanNodeType": "ResultSet", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -17,16 +17,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 10 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 10 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 11, @@ -45,7 +55,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Condition": "a.hundred = b.thousand", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_7.plan index 868fddfe9ff..d4daac977c6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_7.plan @@ -9,7 +9,7 @@ "PlanNodeType": "ResultSet", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -17,16 +17,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 17 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 17 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 18, @@ -45,7 +55,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Condition": "t1.hundred,t1.ten = t2.hundred,t3.ten", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_8.plan index 9336bd7089a..c7d99b06856 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join0.test_/query_8.plan @@ -9,7 +9,7 @@ "PlanNodeType": "ResultSet", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -17,16 +17,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 17 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 17 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 18, @@ -45,7 +55,8 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Condition": "t1.hundred,t1.ten = qr.hundred,qr._equijoin_column_0", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_1.plan index 146c8a41b13..111740cfbd2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_1.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.t1.i,Arg.t2.k]" } ], "PlanNodeId": 6, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_10.plan index 20f4bac2707..81a92f108f5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_10.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.J2_TBL.i,Arg.J1_TBL.j,Arg.J1_TBL.t,Arg.J2_TBL.k]" }, { "Condition": "J1_TBL.i = J2_TBL.i", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_11.plan index eb4c1fcc458..1e6613c601e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_11.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.J1_TBL.i,Arg.J2_TBL.k,Arg.J1_TBL.t]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_12.plan index dc35bbdfab6..a19cae16416 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_12.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.J1_TBL.i,Arg.J2_TBL.k,Arg.J1_TBL.t,Arg.J1_TBL.j]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_2.plan index 5e89745a282..e612d5c30d6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_2.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.J1_TBL.i,Arg.J1_TBL.j,Arg.J1_TBL.t,Arg.J2_TBL.k]" } ], "PlanNodeId": 6, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_3.plan index 5e89745a282..e612d5c30d6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_3.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.J1_TBL.i,Arg.J1_TBL.j,Arg.J1_TBL.t,Arg.J2_TBL.k]" } ], "PlanNodeId": 6, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_4.plan index 3817be51b39..4a7a36dffff 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_4.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.t1.j,Arg.t1.i]" }, { "Condition": "t1.j = t2.k", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_5.plan index 5e89745a282..e612d5c30d6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_5.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.J1_TBL.i,Arg.J1_TBL.j,Arg.J1_TBL.t,Arg.J2_TBL.k]" } ], "PlanNodeId": 6, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_7.plan index 0b7684f3285..855a8664de1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_7.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.J1_TBL.i,Arg.J1_TBL.j,Arg.J2_TBL.k,Arg.J1_TBL.t]" } ], "PlanNodeId": 6, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_8.plan index 0b7684f3285..855a8664de1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_8.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.J1_TBL.i,Arg.J1_TBL.j,Arg.J2_TBL.k,Arg.J1_TBL.t]" } ], "PlanNodeId": 6, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_9.plan index 20f4bac2707..81a92f108f5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join1.test_/query_9.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.J2_TBL.i,Arg.J1_TBL.j,Arg.J1_TBL.t,Arg.J2_TBL.k]" }, { "Condition": "J1_TBL.i = J2_TBL.i", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_7.plan index 92841f40aee..520baa3253c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_7.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.x.x1,Arg.x.x2,Arg.y.y1,Arg.y.y2]" } ], "PlanNodeId": 6, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_8.plan index faddfd87c87..79c37b26aae 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join2.test_/query_8.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.x1,row.x2,row.y1,row.y2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_1.plan index eb0ef9b3397..802945dcbd8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_1.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.q2,row.q1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_8.plan index 6d62a9963b4..417834c78b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join3.test_/query_8.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.ss1.x,Arg.ss2.q1,Arg.ss2.q2,Arg.ss2.y]" }, { "Condition": "ss1.x = ss2._equijoin_column_0", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_13.plan index 1f5aa482672..ab1b0676753 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_13.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.qrt1.a,Arg.qrt2.b]" } ], "PlanNodeId": 6, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_4.plan index 3697a32407b..6ff63ff6cf4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_4.plan @@ -121,7 +121,18 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Stage", + "Node Type": "Aggregate", + "Operators": [ + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" + } + ], "PlanNodeId": 4, "Plans": [ { @@ -136,14 +147,15 @@ "Node Type": "Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_0: Inc(state._yql_agg_0)}", + "Aggregation": "{Inc(state._yql_agg_0)}", "GroupBy": "item.a", "Inputs": [ { "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_8.plan index 691cf373d99..5cfcea020ba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_8.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.tt1.tt1_id,Arg.tt1.joincol,Arg.tt2.tt2_id]" }, { "Condition": "tt1.joincol = tt2.joincol", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_9.plan index 8f2a0536dc0..a01da4ecfc6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-jointest_join4.test_/query_9.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.tt1.tt1_id,Arg.tt1.joincol,Arg.tt2.tt2_id]" }, { "Condition": "tt2.joincol = tt1.joincol", diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_14.plan index caa215bfa91..8d586971c7f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_14.plan @@ -58,7 +58,7 @@ } ], "Name": "Sort", - "SortBy": "" + "SortBy": "[row.column0,row.column1]" }, { "Inputs": [ @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "Top", - "TopBy": "" + "TopBy": "[row.column0,row.column1]" } ], "PlanNodeId": 4, @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "Top", - "TopBy": "" + "TopBy": "[row.column0,row.column1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_4.plan index c04747e6d7f..0ab3414f3f9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_4.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.string4,row.unique1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_5.plan index bf2edcb41bd..3ad1a0a9d21 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_5.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.string4,row.unique1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_6.plan index 595a2d98e70..d10bac3a141 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_6.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.unique1,row.string4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_7.plan index 700a1e379a1..068fb6d128a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select.test_/query_7.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.unique1,row.string4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_1.plan index aea13bf0f6a..c86aa67fd59 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_1.plan @@ -29,17 +29,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 1 } ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.two" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -63,7 +72,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_2.plan index 11c36fa0b44..d8536f94aa2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_2.plan @@ -29,17 +29,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 1 } ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.ten" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -63,7 +72,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_3.plan index 10d8c2a89e8..03f5c6979de 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_3.plan @@ -29,17 +29,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 1 } ], "Limit": "1001", "Name": "TopSort", "TopSortBy": "row.string4" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -63,7 +72,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_4.plan index f2cef73f803..b2e262184cf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_4.plan @@ -29,17 +29,26 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "TopSort", + "Node Type": "TopSort-Aggregate", "Operators": [ { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 1 } ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.two,row.string4,row.ten]" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -59,13 +68,14 @@ "Operators": [ { "Aggregation": "state", - "GroupBy": "", + "GroupBy": "[item.string4,item.ten,item.two]", "Inputs": [ { "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_5.plan index c76bbe7e3bb..ae09b28accb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-select_distinct.test_/query_5.plan @@ -9,7 +9,7 @@ "PlanNodeType": "ResultSet", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -17,16 +17,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 5 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 5 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 6, @@ -37,15 +47,25 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Aggregate", + "Node Type": "Aggregate-Aggregate", "Operators": [ + { + "Inputs": [ + { + "InternalOperatorId": 1 + } + ], + "Name": "Aggregate", + "Phase": "Intermediate" + }, { "Inputs": [ { "ExternalPlanNodeId": 3 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -64,13 +84,14 @@ "Operators": [ { "Aggregation": "state", - "GroupBy": "", + "GroupBy": "[item.four,item.two]", "Inputs": [ { "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_1.plan index 3af8506b0e4..fcb45c6cd0d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_1.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.depname,Arg.salary,Arg.empno]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_2.plan index 8b890cd7559..329069cce20 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_2.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.depname,row.rank,row.empno]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_3.plan index 8b890cd7559..329069cce20 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_3.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.depname,row.rank,row.empno]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_4.plan index 044f6da2585..943eeaa4040 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_4.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.rank,row.empno]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_5.plan index ecb8db78fd0..ceff56d09df 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_5.plan @@ -47,7 +47,8 @@ "InternalOperatorId": 2 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ @@ -87,7 +88,18 @@ "PlanNodeType": "Connection", "Plans": [ { - "Node Type": "Stage", + "Node Type": "Aggregate", + "Operators": [ + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" + } + ], "PlanNodeId": 4, "Plans": [ { @@ -102,14 +114,15 @@ "Node Type": "Aggregate", "Operators": [ { - "Aggregation": "{_yql_agg_0: SUM(item.salary,state._yql_agg_0)}", + "Aggregation": "{SUM(item.salary)}", "GroupBy": "item.depname", "Inputs": [ { "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_6.plan index 57b9f143210..4d40ccd8533 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_postgres.TestPGSQL.test_sql_suite_plan-window.test_/query_6.plan @@ -46,7 +46,8 @@ "InternalOperatorId": 2 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_1.plan index b187fa5bf90..158c77d8fba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_1.plan @@ -9,7 +9,7 @@ "PlanNodeType": "ResultSet", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -17,16 +17,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -45,7 +55,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_2.plan index b187fa5bf90..158c77d8fba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-insert.test_/query_2.plan @@ -9,7 +9,7 @@ "PlanNodeType": "ResultSet", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -17,16 +17,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -45,7 +55,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_100.plan index 88b19aac859..9744edb5e78 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_100.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3,row.col5,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_101.plan index b99f86d8938..cb26e5e2b2d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_101.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col3,row.col2,row.col4]" }, { "Inputs": [ @@ -203,7 +203,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -211,16 +211,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -239,7 +249,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_102.plan index bf42d36175a..f742e040634 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_102.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_103.plan index 830a52b6967..2b88e27bb3c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_103.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ @@ -172,7 +172,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -180,16 +180,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -208,7 +218,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_104.plan index 224f09d4ac4..242ba44f6ed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_104.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_105.plan index 9b3c44c4cfb..3f546eb5af0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_105.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_106.plan index 38229e61df0..ad39ec1d574 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_106.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_107.plan index 9c92c24bc24..4e2eef09fb0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_107.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col6,row.col2,row.col5,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_108.plan index aab6286a9f1..5b8409eb10a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_108.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col6,row.col7,row.col4,row.col1,row.col5,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_109.plan index 15fd0547d5d..655b1672bf6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_109.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_11.plan index 07e3f9bafda..249e2be9e61 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_11.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col6,row.col4,row.col3,row.col5]" }, { "Inputs": [ @@ -241,7 +241,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -249,16 +249,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -277,7 +287,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_110.plan index 126ec0cac0b..6e8c47a7a6e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_110.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_111.plan index a025a8da15d..6a8904a2623 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_111.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1,row.col4,row.col7,row.col5,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_112.plan index 3d232d65f6f..74e9f720933 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_112.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1,row.col4,row.col5,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_114.plan index f6c5c781714..f91668685d6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_114.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2,row.col4]" }, { "Inputs": [ @@ -169,7 +169,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -177,16 +177,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -205,7 +215,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_115.plan index abf2d00ef94..077bcb2f745 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_115.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col2,row.col3,row.col5]" }, { "Inputs": [ @@ -229,7 +229,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -237,16 +237,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -265,7 +275,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_117.plan index 9541543864a..b8bc13a1679 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_117.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col1,row.col4,row.col6,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_119.plan index 0e34fe6d182..e59b24781e1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_119.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col2,row.col1,row.col3,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_12.plan index 1af2e2a2e6f..2e4fc4f3327 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_12.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col4,row.col2,row.col6,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_120.plan index 6457cef90ec..f339f9d397a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_120.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col1,row.col4,row.col7,row.col6,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_121.plan index 3a1a07ae4ce..bb6d7bdff88 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_121.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ @@ -153,7 +153,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -161,16 +161,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -189,7 +199,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_122.plan index e887f508367..c4ece1c1207 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_122.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col5,row.col6,row.col3,row.col7,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_123.plan index 658922adfe7..bfb8b951ecc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_123.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col5,row.col4,row.col3,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_125.plan index 1bb2cf38a8a..12413ec33ec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_125.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_127.plan index fb54e3c53da..3519097e395 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_127.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col6,row.col3,row.col5,row.col7,row.col4,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_13.plan index 9408c2079ca..1e834b097a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_13.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col2,row.col4,row.col5,row.col3,row.col1]" }, { "Inputs": [ @@ -185,7 +185,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -193,16 +193,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -221,7 +231,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_14.plan index fbf472c4822..bce82afa67e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_14.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col7,row.col5,row.col2,row.col6,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_15.plan index 953c007c43a..af28147718b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_15.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col1,row.col7,row.col3,row.col6,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_16.plan index 110d857fbc8..22ca61af4a7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_16.plan @@ -155,7 +155,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -163,16 +163,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -191,7 +201,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_17.plan index bc8a4735ee0..3639ea04dc4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_17.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1,row.col5,row.col4]" }, { "Inputs": [ @@ -207,7 +207,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -215,16 +215,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -243,7 +253,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_18.plan index 04755f06501..2b7a841c0c4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_18.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col3,row.col7,row.col1,row.col6,row.col2]" }, { "Inputs": [ @@ -224,7 +224,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -232,16 +232,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -260,7 +270,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_19.plan index 4384fb6f368..16e65dd63b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_19.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col2,row.col6,row.col5,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_2.plan index f7539a258e1..65b0a38d943 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_2.plan @@ -142,7 +142,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -150,16 +150,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -178,7 +188,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_20.plan index 98c7f90e4c2..b42459fa626 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_20.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col3,row.col5]" }, { "Inputs": [ @@ -171,7 +171,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -179,16 +179,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -207,7 +217,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_21.plan index 57b0959f619..7c6d0ff6414 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_21.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col6,row.col4,row.col1,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_22.plan index 2d96a5af5a8..ccd46af3a0a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_22.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col3,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_23.plan index 6bc6c23225a..05b1778ea5f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_23.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_24.plan index b45cd696012..decf531e0b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_24.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_25.plan index a0fa0d57781..8b967df03e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_25.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1]" }, { "Inputs": [ @@ -158,7 +158,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -166,16 +166,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -194,7 +204,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_27.plan index 68fd1d0952b..d401495c7eb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_27.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_28.plan index a794e535329..593046997fc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_28.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_29.plan index 8c8f2926fce..2d5ca6fe3fc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_29.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col3,row.col1,row.col2,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_3.plan index 7cc697e25d0..1b427cf6157 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_3.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_30.plan index 8c8f2926fce..2d5ca6fe3fc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_30.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col3,row.col1,row.col2,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_31.plan index c0199c316cd..e124326d83c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_31.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col1]" }, { "Inputs": [ @@ -224,7 +224,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -232,16 +232,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -260,7 +270,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_33.plan index 1c416e9e958..0a67dd02403 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_33.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col5,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_34.plan index f1616d9146b..fc7f15a7706 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_34.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col7,row.col1,row.col4,row.col6,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_36.plan index cf3c65ed96c..b6602d28518 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_36.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_37.plan index 50101491c17..287ed52e4b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_37.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_38.plan index 3611ad9924f..cea7de9e1d9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_38.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_39.plan index 6637322f67b..6e7463a2814 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_39.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_4.plan index a1cdbc67cea..4fe4a563f15 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_4.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col1,row.col3,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_40.plan index 65c5bd5ed9f..b84f527eb90 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_40.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col1,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_42.plan index 0e1aa09ad9a..2cfd48f4463 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_42.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_44.plan index 262d571631e..db962c3e22e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_44.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2,row.col5,row.col4,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_45.plan index a0f1529fed8..a7415620b30 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_45.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_46.plan index 36b8d6da2f6..1fe2ab91c5e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_46.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col4,row.col3,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_47.plan index 670454f06bb..a24086f99f3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_47.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_48.plan index 3c3e2630b32..f38457affdd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_48.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_49.plan index 13641d66c46..1c7647f734f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_49.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col6,row.col2,row.col3,row.col5,row.col4]" }, { "Inputs": [ @@ -209,7 +209,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -217,16 +217,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -245,7 +255,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_5.plan index 761501e0e53..acb196bc064 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_5.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col3,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_50.plan index 03671bb88ef..f5c4a7c98b1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_50.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_51.plan index 14603db983c..5ac4f9aa698 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_51.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col3,row.col6,row.col2,row.col1,row.col7]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_52.plan index c03c06cc5e0..68a0b55ce2c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_52.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_53.plan index a3962321142..3c2693675e2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_53.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col5,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_54.plan index c9936957ed8..27d2916b469 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_54.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col2,row.col6,row.col1,row.col3,row.col4,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_55.plan index 56e0df59d48..a3c84df3482 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_55.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col3,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_56.plan index a3f21174bb1..eec40d40506 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_56.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_57.plan index ff25cf4c822..f6c6921e4a1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_57.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_6.plan index 57baf7feb09..2f1ddb9ac3f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_6.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col5,row.col1,row.col2,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_60.plan index 013011430ce..0afc060c726 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_60.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_61.plan index 151d87f286e..39246d6f834 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_61.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col7,row.col6,row.col4,row.col1,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_62.plan index fc2e806256e..a7564a57a7b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_62.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1,row.col5,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_63.plan index fc3ce21511f..2258dc782f4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_63.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col1,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_65.plan index 8e1459f4934..f48314c5504 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_65.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_67.plan index e5d92d8c9e4..45e43bebb1f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_67.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_68.plan index 6ed3bf89e38..00a9b96c9ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_68.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_69.plan index 602b191fb33..96898cf875f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_69.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_70.plan index 14300c5bae7..41340178fe6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_70.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_71.plan index 76e5676ea29..6a0233ddd82 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_71.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_73.plan index 034e8ca8b39..fd1f2ca99d0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_73.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_74.plan index f7539a258e1..65b0a38d943 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_74.plan @@ -142,7 +142,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -150,16 +150,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -178,7 +188,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_75.plan index ec87f7dd407..9bce1e0c754 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_75.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_76.plan index 857b3657adb..5bd75080767 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_76.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ @@ -178,7 +178,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -186,16 +186,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -214,7 +224,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_77.plan index ba2de2da375..f58573c127d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_77.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col5,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_78.plan index ffa25078028..9d50cd79743 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_78.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_79.plan index bba9129eee5..65d450d4e6b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_79.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_8.plan index d70023d4158..a3205e5b072 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_8.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col6,row.col2,row.col5,row.col1]" }, { "Inputs": [ @@ -205,7 +205,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -213,16 +213,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -241,7 +251,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_80.plan index 7f442f52ab7..76ee8a9f9ce 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_80.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col6,row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_82.plan index c17550ac54a..c77f8e32115 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_82.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col3,row.col2]" }, { "Inputs": [ @@ -170,7 +170,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -178,16 +178,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -206,7 +216,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_83.plan index 0f9f7539be2..e9d2602da0e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_83.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col4,row.col6,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_84.plan index b90b573ce50..9a6ed2c73e6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_84.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_85.plan index 610d56daa9f..560d869f891 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_85.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col5,row.col2]" }, { "Inputs": [ @@ -169,7 +169,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -177,16 +177,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -205,7 +215,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_86.plan index 6ed5b668157..3a8b6e557db 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_86.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_87.plan index 80e84aa5119..3f28cd78c5a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_87.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_88.plan index b0d4604dafc..7757ad8c248 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_88.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_89.plan index 824ae22b044..ff6179a5d97 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_89.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_9.plan index ca044ecc823..5ee36e7b1f6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_9.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col6,row.col2,row.col1,row.col7,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_90.plan index 994cf03989b..65ab4dc42ab 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_90.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_91.plan index 9f66c9498aa..da2028ec646 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_91.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_94.plan index ea783b975cb..15a4241d1c8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_94.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_95.plan index 137e46124ab..b3d976d85e5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_95.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col3,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_97.plan index a308637e7ba..27d54a9a22d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_97.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_98.plan index 33114a05afe..87bc208741d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_98.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_99.plan index 656dde23d71..1535204fbe4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-1.test_/query_99.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_1.plan index 69342c1f087..11acd2ae82e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_1.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_10.plan index 77121776b80..3431b529d30 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_10.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col2,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_101.plan index 0caa0ad196a..0a639ff23e8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_101.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_102.plan index 1bdaabb0a3d..3e4159b8478 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_102.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -186,7 +186,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -194,16 +194,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -222,7 +232,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_103.plan index b3e310e5206..015c06ace7d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_103.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_104.plan index c46c337d7d0..56567dabfe7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_104.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_106.plan index 3592aad52f7..b7bbe84faed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_106.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col1,row.col2,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_107.plan index b18b4c0096c..59ffcc2f04d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_107.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_108.plan index 71dffd70b5a..69572d3ef10 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_108.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_11.plan index 1e0a1723763..c4f29b65da4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_11.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col6,row.col3,row.col5,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_110.plan index 69314ff84b6..09a9b9b450a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_110.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col3,row.col6,row.col5,row.col2,row.col1,row.col4]" }, { "Inputs": [ @@ -224,7 +224,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -232,16 +232,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -260,7 +270,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_111.plan index b1ffd5145be..4c821055f63 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_111.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_112.plan index 3a5e8e060d5..ce3aad5ece5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_112.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col6,row.col5,row.col3,row.col4,row.col2]" }, { "Inputs": [ @@ -206,7 +206,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -214,16 +214,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -242,7 +252,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_113.plan index 664733eddcb..27923b81f7e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_113.plan @@ -155,7 +155,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -163,16 +163,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -191,7 +201,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_114.plan index 53b99f26775..3c50842112e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_114.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_115.plan index ae2490dedf4..b560c6ae0f6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_115.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_116.plan index a509bf9fba3..bd35403adb5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_116.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_118.plan index 633a753ae04..4be390a777a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_118.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_121.plan index 64c5e2e0a2d..71f48d83f5d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_121.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_122.plan index d11485a2a1f..d26ec133def 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_122.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col5,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_123.plan index 2ab55947e43..0b05f160fc0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_123.plan @@ -123,7 +123,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col6,row.col5,row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_125.plan index 52b6bb8abfa..afa941c3d85 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_125.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_126.plan index 21d88235c39..ab74c195dec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_126.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col6,row.col5,row.col3,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_128.plan index 7344206803b..0dd7c85b0f7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_128.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col5,row.col3,row.col6,row.col4,row.col7]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_129.plan index 47831c5cbac..f8a4912b4a8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_129.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_130.plan index 2804d854939..4fdd03b65b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_130.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col2,row.col3]" }, { "Inputs": [ @@ -206,7 +206,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -214,16 +214,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -242,7 +252,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_131.plan index 786a31ebc3c..d978f62ccf9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_131.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col1,row.col5,row.col6,row.col2,row.col7]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_133.plan index e15bc3c32c0..561ac7c3fe1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_133.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_134.plan index d0f54c80d3a..58308685c0e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_134.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_135.plan index 7b53f6a0a9e..3e81e8ead60 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_135.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_136.plan index 8817739b29d..ff8839754fe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_136.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_136.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col3,row.col1,row.col2,row.col7]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_138.plan index 61cea144d91..969c99f6dff 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_138.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_138.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col3,row.col2,row.col1,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_14.plan index afcdf3ac21e..afdc0ef9aaa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_14.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_141.plan index e95babc3796..351bddbe7d1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_141.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_141.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_142.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_142.plan index 5e4aca83c49..cf4930635c7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_142.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_142.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_143.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_143.plan index 5ae61dbea47..1c4af750088 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_143.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_143.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_15.plan index 58c3d290178..88bcbc7e54f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_15.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -187,7 +187,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -195,16 +195,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -223,7 +233,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_17.plan index 97ad85d246b..f7d0061184a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_17.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_19.plan index 7b01df8d7c7..bad9c366451 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_19.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_2.plan index 036c0fe190c..a7eb496f24a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_2.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col6,row.col1,row.col5]" }, { "Inputs": [ @@ -190,7 +190,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -198,16 +198,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -226,7 +236,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_20.plan index e5bcd0d4ce1..eb4a2ed865f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_20.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col5,row.col6,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_21.plan index a1925b50b57..b4bc9c62cb3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_21.plan @@ -147,7 +147,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col2,row.col1,row.col6,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_22.plan index 2165e5eae0b..f1ace804874 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_22.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_23.plan index 887f1fd2095..0ec18b411b9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_23.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_24.plan index a6914023413..49485d2cc6e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_24.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col5,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_26.plan index e92e9ebadef..86dab4a20cd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_26.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_27.plan index f44323f0f56..d9cdb758c90 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_27.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_28.plan index 7ee84cb1f2d..90457d1c1a1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_28.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_29.plan index 6df1857fa86..b0baed1ef78 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_29.plan @@ -141,7 +141,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col2,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_31.plan index 9d3b3a3b2aa..b534d9f3027 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_31.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_32.plan index cf12a3363d8..354d7635c18 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_32.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_33.plan index c2066efeeea..b77c0764934 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_33.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_34.plan index f25f0c2f7bb..7ccff8037c7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_34.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_35.plan index a2edbf04c56..0351ed9b4a5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_35.plan @@ -141,7 +141,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col5,row.col7,row.col4,row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_36.plan index b48c0843370..5fc5dd8a7d8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_36.plan @@ -141,7 +141,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col5,row.col6,row.col3,row.col7,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_39.plan index 07df5e0abb4..3bcbb3a538d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_39.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_4.plan index 4b0d47a0451..7163ab79dea 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_4.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_40.plan index c92fd1a7f77..5a6fa0905aa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_40.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_41.plan index 93315240414..0813ec26908 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_41.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col7,row.col5,row.col2,row.col1,row.col6,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_42.plan index 3137228e3c3..3d566c36625 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_42.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col4,row.col3,row.col2,row.col6,row.col7]" }, { "Inputs": [ @@ -179,7 +179,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -187,16 +187,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -215,7 +225,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_43.plan index e75deb36e6d..f3d8fbe7b33 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_43.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_44.plan index 4f6e366ad6d..9494d952933 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_44.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col2,row.col1,row.col5]" }, { "Inputs": [ @@ -174,7 +174,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -182,16 +182,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -210,7 +220,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_45.plan index ddd1b4575f6..66a211db6e6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_45.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_46.plan index 9516c3592d5..fc5f9d72e76 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_46.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_47.plan index ae89638618a..9e8282a2fe0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_47.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_48.plan index 9743bfe6e1b..1d6874765b1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_48.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_49.plan index 53b99f26775..3c50842112e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_49.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_50.plan index c282969374f..27d6605353e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_50.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col4,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_51.plan index 162f9c4639f..cadfacc1390 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_51.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_52.plan index e0fd1e3ee0b..386e9553033 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_52.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_54.plan index 2bcb6ee5cf9..15cd49d60a4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_54.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col2,row.col5,row.col1,row.col6]" }, { "Inputs": [ @@ -190,7 +190,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -198,16 +198,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -226,7 +236,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_55.plan index f357dccb680..6b716aae9f3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_55.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col5,row.col3,row.col6,row.col2]" }, { "Inputs": [ @@ -179,7 +179,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -187,16 +187,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -215,7 +225,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_59.plan index 38d3db0f74d..ea5f485d349 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_59.plan @@ -150,7 +150,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col5,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_60.plan index 16ec7a4ad0d..497f2372548 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_60.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col5,row.col7,row.col1,row.col6]" }, { "Inputs": [ @@ -219,7 +219,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -227,16 +227,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -255,7 +265,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_61.plan index 8c1aaca6958..7b8c425390b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_61.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col3,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_62.plan index fd432947a91..470eb78e61b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_62.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col1,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_63.plan index 24fe034deab..80275fbe989 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_63.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_64.plan index 79eb89596bf..844a3450ccc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_64.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col5,row.col6,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_65.plan index 76d04c26009..5dc294c3412 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_65.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_66.plan index f96049d8582..33d558b0e82 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_66.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_67.plan index 4c749d9f21c..32dbc75d074 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_67.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_68.plan index 1e857b8c36d..9dbbdc096aa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_68.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col1,row.col6,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_69.plan index 91ee322b67b..db4c97d5cec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_69.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col5,row.col1,row.col3]" }, { "Inputs": [ @@ -195,7 +195,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -203,16 +203,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -231,7 +241,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_7.plan index 68017662a30..cc26721581c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_7.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ @@ -168,7 +168,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -176,16 +176,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -204,7 +214,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_71.plan index 29fd3a70e01..4609886c6a8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_71.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_72.plan index 63265789578..7d7a5709ea7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_72.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col5,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_73.plan index b5e6597091f..3d7752547a5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_73.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_74.plan index 0914061a34b..23f22c6a72b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_74.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_75.plan index deff0aad236..8fb4354567c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_75.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col1,row.col7,row.col3,row.col4,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_76.plan index e0ed13b4c39..f3a539a9fb4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_76.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_77.plan index 894b45a6516..a1b753eb1ce 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_77.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col4]" }, { "Inputs": [ @@ -169,7 +169,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -177,16 +177,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -205,7 +215,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_78.plan index 317abed3f31..6186b7f8a51 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_78.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col6,row.col1,row.col4,row.col3,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_79.plan index 1ddf54e3951..032cc11d07f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_79.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_8.plan index ca12d3af6d6..d69c4d882ff 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_8.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ @@ -168,7 +168,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -176,16 +176,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -204,7 +214,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_82.plan index 2d6eb39fde0..c8d2d49e901 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_82.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_83.plan index 829493b2d83..1873965c331 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_83.plan @@ -153,7 +153,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -161,16 +161,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -189,7 +199,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_84.plan index 405a3f65dc7..17be4f50e1a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_84.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.c,Arg.d]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_85.plan index 34b02b15a5b..8eaa8ef234e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_85.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col3,row.col4,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_86.plan index 769eb84d2c4..fb49e6795d0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_86.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_87.plan index b63ca762be8..4bc5f5603b9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_87.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col6,row.col1,row.col3,row.col7,row.col2,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_89.plan index 371c9a81c3c..5fb1c8ec43f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_89.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col1,row.col2,row.col6,row.col4]" }, { "Inputs": [ @@ -198,7 +198,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -206,16 +206,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -234,7 +244,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_9.plan index 5c1c621db5a..f5373f58f2c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_9.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_90.plan index 6747eafd417..74361022a96 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_90.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -171,7 +171,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -179,16 +179,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -207,7 +217,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_91.plan index 81a32012523..22e4829aea6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_91.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ @@ -159,7 +159,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -167,16 +167,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -195,7 +205,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_92.plan index 18ee2bcc521..a338a673c05 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_92.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col1]" }, { "Inputs": [ @@ -166,7 +166,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -174,16 +174,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -202,7 +212,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_93.plan index 0a3405fb6df..916d37d7287 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_93.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col5,row.col6,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_95.plan index 5196ea65ac8..384602881ab 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_95.plan @@ -123,7 +123,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col2,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_96.plan index b18b4c0096c..59ffcc2f04d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_96.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_97.plan index 82dde3d9afd..3e1cc11052e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_97.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ @@ -147,7 +147,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -155,16 +155,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -183,7 +193,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_98.plan index 25d964b45c5..b232c909132 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_98.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_99.plan index 475dddf717a..e31d5ed2d32 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-2.test_/query_99.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col7,row.col1,row.col4,row.col6,row.col2,row.col5]" }, { "Inputs": [ @@ -234,7 +234,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -242,16 +242,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -270,7 +280,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_1.plan index d282a4e801d..6688e4ce4b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_1.plan @@ -156,7 +156,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col5,row.col3,row.col4,row.col7,row.col6]" }, { "Inputs": [ @@ -269,7 +269,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -277,16 +277,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -305,7 +315,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_10.plan index 8974b934f56..9f8ad4b60a5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_10.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col1,row.col5,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_100.plan index 31b020f6843..15a7ee9a4a6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_100.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_101.plan index 0da035572e6..8bddfa6dff0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_101.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col3,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_102.plan index 57c5fe0fea7..41a82e9bae3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_102.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_103.plan index ac56b40063c..273d57705a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_103.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_104.plan index aec43c0b853..3660646f417 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_104.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_105.plan index b784c350eff..4aafc7ab90d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_105.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_106.plan index 08639f708c7..6dbe436e5f9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_106.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_107.plan index 52217dc01ce..c3449b9ba6c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_107.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1,row.col4,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_108.plan index 2cb5cb49354..28642af8e91 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_108.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2,row.col4,row.col5]" }, { "Inputs": [ @@ -192,7 +192,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -200,16 +200,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -228,7 +238,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_109.plan index a978915357c..e269d390b6e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_109.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col2,row.col7,row.col5,row.col3,row.col6]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_11.plan index 9338da12162..32e0a1f46f8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_11.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_110.plan index 9afa2fd598b..c73ce675f06 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_110.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -147,7 +147,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -155,16 +155,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -183,7 +193,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_111.plan index 7ed122ef025..32e0082215c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_111.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col5,row.col2,row.col3]" }, { "Inputs": [ @@ -207,7 +207,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -215,16 +215,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -243,7 +253,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_112.plan index 6718a04f8bc..3078d0e0b6f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_112.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1]" }, { "Inputs": [ @@ -184,7 +184,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -192,16 +192,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -220,7 +230,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_113.plan index bb9ee01a4e3..960acf775e4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_113.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ @@ -192,7 +192,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -200,16 +200,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -228,7 +238,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_114.plan index 8c031144241..4c3553e97f9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_114.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col4]" }, { "Inputs": [ @@ -179,7 +179,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -187,16 +187,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -215,7 +225,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_116.plan index 3db460e230d..837b39cef86 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_116.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col5,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_117.plan index 18096c98059..f1c85d58608 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_117.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_119.plan index 5d961dfb6bf..4d84e3b718e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_119.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ @@ -178,7 +178,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -186,16 +186,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -214,7 +224,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_120.plan index 80957f12ab7..dd865d01b4f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_120.plan @@ -138,7 +138,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col1,row.col5,row.col7,row.col6,row.col2]" }, { "Inputs": [ @@ -251,7 +251,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -259,16 +259,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -287,7 +297,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_122.plan index ef52da41866..cbb9462374c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_122.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_125.plan index 2d1372bd3b9..8ba05887105 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_125.plan @@ -153,7 +153,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col3,row.col1,row.col7,row.col6,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_126.plan index 4c306c776cd..359c63d08d5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_126.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_127.plan index cef83b7645a..39e9e46fce7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_127.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col4,row.col3,row.col1]" }, { "Inputs": [ @@ -193,7 +193,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -201,16 +201,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -229,7 +239,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_128.plan index 222d2698bbf..971105f335b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_128.plan @@ -153,7 +153,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -161,16 +161,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -189,7 +199,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_129.plan index e7f50bb4433..e1456adc5f2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_129.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_13.plan index a4cf15d1b9b..8d656125a6c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_13.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col5,row.col3,row.col2]" }, { "Inputs": [ @@ -171,7 +171,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -179,16 +179,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -207,7 +217,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_131.plan index b22707b3a71..ba611dd7e0c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_131.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_132.plan index 0df99725907..0efce678ec0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_132.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col5,row.col4,row.col6]" }, { "Inputs": [ @@ -215,7 +215,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -223,16 +223,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -251,7 +261,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_133.plan index 8b9f2a0889a..cda3937d872 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_133.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col5,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_134.plan index aa49ad6e8b4..838b43c3715 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_134.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col5,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_136.plan index d7a8bf3f8ca..4c0fd1e1991 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_136.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_136.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_137.plan index c4e64be593f..36770c22534 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_137.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_137.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col4,row.col3]" }, { "Inputs": [ @@ -221,7 +221,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -229,16 +229,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -257,7 +267,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_139.plan index f3ce9511763..0fe91f6e3ed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_139.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_139.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_14.plan index dd45f389f4d..b0b7b4eba81 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_14.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col3,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_140.plan index 80e53e34141..c77f588c6ce 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_140.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_140.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_141.plan index 0612b86f698..26ffc7e4c1e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_141.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_141.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ @@ -169,7 +169,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -177,16 +177,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -205,7 +215,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_16.plan index aabed98dd56..af4b8074a9d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_16.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_17.plan index 689e94893e3..8deeb1fbad0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_17.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col6,row.col1,row.col2,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_18.plan index eb38d97a226..c28e305cc48 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_18.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_19.plan index d5fde2226c1..dfc70e4e32a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_19.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col2,row.col1]" }, { "Inputs": [ @@ -197,7 +197,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -205,16 +205,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -233,7 +243,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_2.plan index db3887cfae2..a6d38edbe8d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_2.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_20.plan index a5d8a4e9b97..0e10a4afabf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_20.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_21.plan index f32e1561b30..0cc90febd17 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_21.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_22.plan index f2d36f090e0..478a7222b84 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_22.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_23.plan index a515583b0b2..2a1388dd1d3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_23.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_25.plan index d4ab498fc30..1cac222c066 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_25.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col5,row.col6,row.col1,row.col3]" }, { "Inputs": [ @@ -193,7 +193,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -201,16 +201,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -229,7 +239,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_27.plan index 2888b927da5..815d9be6921 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_27.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_29.plan index c3bca383be2..e91d5050504 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_29.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_3.plan index 48e7b6c34d4..d6a33856da7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_3.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col1]" }, { "Inputs": [ @@ -215,7 +215,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -223,16 +223,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -251,7 +261,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_31.plan index cd1fbcf796a..7dff501458e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_31.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_33.plan index 3f000790d87..4b01ec7b0a5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_33.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -161,7 +161,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -169,16 +169,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -197,7 +207,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_34.plan index 5fffc1de528..94f6ddf644c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_34.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_35.plan index 463261f527e..fc37010d624 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_35.plan @@ -141,7 +141,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col2,row.col6,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_36.plan index 8cf034c7a81..0d3445b91a5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_36.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_38.plan index ebffa79436c..7e408f0697e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_38.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col1,row.col2,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_39.plan index fc98dd15dbb..2528cf8edd6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_39.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_4.plan index 8985dbf745e..9f341de6129 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_4.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_40.plan index 858a6c3a501..74920cb4a9e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_40.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col6,row.col2,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_41.plan index b93053ff9ca..c96a750f91f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_41.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col2,row.col5,row.col1]" }, { "Inputs": [ @@ -189,7 +189,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -197,16 +197,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -225,7 +235,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_42.plan index 33bb9c5048c..69c57a75ad2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_42.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col1,row.col4,row.col6,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_43.plan index 1596fcdd87f..d73925f26b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_43.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col5,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_44.plan index 80a1a9be685..baeb2babca4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_44.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_45.plan index 0ab1f2e973f..9d2e02aa015 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_45.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_46.plan index f2450a84e6e..a0c59465fb6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_46.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col5,row.col3,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_47.plan index 96d4529a08c..e4e76148e51 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_47.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col3,row.col1,row.col4,row.col5,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_49.plan index 724a5a124a5..014688f8028 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_49.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col3,row.col2,row.col4]" }, { "Inputs": [ @@ -180,7 +180,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -188,16 +188,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -216,7 +226,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_5.plan index 6e7df9f00c9..22297e41d2a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_5.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_50.plan index a51c9d7f77b..b1349cb4fa3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_50.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col6,row.col1,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_52.plan index b414cfbf86c..3bde938371c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_52.plan @@ -135,7 +135,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col5,row.col7,row.col1,row.col6,row.col4]" }, { "Inputs": [ @@ -237,7 +237,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -245,16 +245,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -273,7 +283,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_53.plan index b687d75d36b..ac2be27c417 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_53.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2,row.col6,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_54.plan index d6ea6fee6c0..8ec1c4c2895 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_54.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_55.plan index 22007e9cfb6..1bb589510ba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_55.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_56.plan index dc240ba6183..8d6176ee8d6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_56.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col2,row.col1,row.col4,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_57.plan index 1136e076b02..9cfed7343a3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_57.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_58.plan index e3240a8a522..18d8e15d8f6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_58.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_59.plan index 87022724c05..1e275416695 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_59.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col1,row.col2]" }, { "Inputs": [ @@ -179,7 +179,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -187,16 +187,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -215,7 +225,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_6.plan index e39d8a469a1..c56d210ac6d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_6.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col4,row.col2]" }, { "Inputs": [ @@ -176,7 +176,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -184,16 +184,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -212,7 +222,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_60.plan index da0265b9ef9..03b7553fc53 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_60.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col5,row.col6,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_61.plan index 215755a09c2..248f456a98f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_61.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_62.plan index ab5822ac777..e8721f61311 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_62.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col5,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_63.plan index 36999186a2f..6b5507e60a9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_63.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col5,row.col4]" }, { "Inputs": [ @@ -178,7 +178,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -186,16 +186,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -214,7 +224,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_64.plan index 5e73e8dd12d..9342107398e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_64.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col4,row.col1,row.col3,row.col6]" }, { "Inputs": [ @@ -181,7 +181,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -189,16 +189,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -217,7 +227,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_65.plan index 4a804538b67..448dc5271bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_65.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_67.plan index 4acb263951e..d31674fdd3c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_67.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_68.plan index ac3c8ed8aaf..b84ad24b1c7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_68.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_7.plan index 0f14895471f..481ef19e306 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_7.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col2,row.col1]" }, { "Inputs": [ @@ -185,7 +185,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -193,16 +193,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -221,7 +231,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_71.plan index ff43ac81807..978bbe58fb9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_71.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_72.plan index 2fd02ee3a80..4a03d934b0b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_72.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -158,7 +158,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -166,16 +166,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -194,7 +204,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_73.plan index 12bc9c3c8ba..a5f5e6867e2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_73.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col6,row.col1,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_76.plan index 6451a93f5ea..8307d5361d4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_76.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col6,row.col2,row.col1,row.col5,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_78.plan index c49bea95acf..93146852ef9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_78.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_79.plan index 7552fcbd993..cff82d3511f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_79.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_8.plan index bce9c24a9a0..ef03dcbf8ba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_8.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col5,row.col3,row.col4]" }, { "Inputs": [ @@ -216,7 +216,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -224,16 +224,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -252,7 +262,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_80.plan index 511c8b4bd0d..3a8c3d5845d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_80.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_82.plan index 6bc8938cbac..0ab4218bf5d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_82.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col4,row.col2,row.col6,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_83.plan index 86ea9b05e5a..6993e3e5083 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_83.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_84.plan index 257a270fb7b..258c2759212 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_84.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_85.plan index 53797b91d7c..b47ad3bff91 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_85.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col2,row.col5,row.col4,row.col1,row.col3,row.col6]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_86.plan index be83f94af01..b316a3f7f87 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_86.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_87.plan index 55e998f9716..88d576efbb6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_87.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col3,row.col6,row.col4,row.col2]" }, { "Inputs": [ @@ -196,7 +196,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -204,16 +204,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -232,7 +242,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_88.plan index 218484c72b8..371fd26a3ce 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_88.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_9.plan index 39c29d6ac49..f4c444487ea 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_9.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col1,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_91.plan index b6fa69578c0..04c288bd850 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_91.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_92.plan index 012cf8b4377..fcfaaf7674e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_92.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ @@ -181,7 +181,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -189,16 +189,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -217,7 +227,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_93.plan index 1a88d453cea..65047bde0fb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_93.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col6,row.col2,row.col4,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_94.plan index f704d0e9319..dcb73f9811f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_94.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_96.plan index 762546ef6d5..46dc4837f18 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_96.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col5,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_97.plan index 105889ff532..481bf745da9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_97.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_99.plan index e3ac162520c..2a7142c2298 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-3.test_/query_99.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1,row.col5,row.col6]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_1.plan index c2714a4e86d..3b1e9a0902f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_1.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_10.plan index b15037d306c..ec13bf99b55 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_10.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_100.plan index ed3104f18ec..1d3fc63566c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_100.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_101.plan index 1651295d814..4dd375f41e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_101.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col1,row.col7,row.col2,row.col5,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_102.plan index 3f4b3361ac1..ca3d1e4af59 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_102.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_103.plan index 9b4dc604023..a7eb656653b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_103.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col6,row.col7,row.col2,row.col5,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_104.plan index 4ceea5d846e..9b3ea8f7770 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_104.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col3,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_106.plan index 6c487547c57..c3d51030e1b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_106.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_107.plan index 630f617a4e0..22682c557d5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_107.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3,row.col4]" }, { "Inputs": [ @@ -197,7 +197,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -205,16 +205,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -233,7 +243,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_108.plan index e119264400d..8b465849104 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_108.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_109.plan index 8076544ce4b..f79d3d039bb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_109.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_11.plan index 564b5426776..e153c01bff5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_11.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_110.plan index 2a32a7ad134..64f6215daaa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_110.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -166,7 +166,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -174,16 +174,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -202,7 +212,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_111.plan index abea60c52d2..e7b2a88d50e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_111.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col3,row.col6,row.col4,row.col2]" }, { "Inputs": [ @@ -227,7 +227,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -235,16 +235,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -263,7 +273,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_112.plan index e405a0edab8..987f518b6db 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_112.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_113.plan index f042476f5d3..9ed755a2fd2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_113.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_114.plan index edee43889b0..9150bbd9e43 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_114.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ @@ -166,7 +166,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -174,16 +174,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -202,7 +212,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_115.plan index 9bab13ea056..da7f2bd390c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_115.plan @@ -135,7 +135,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col2,row.col5,row.col1]" }, { "Inputs": [ @@ -246,7 +246,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -254,16 +254,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -282,7 +292,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_116.plan index 36f62b99dd3..94adfd4e966 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_116.plan @@ -155,7 +155,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -163,16 +163,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -191,7 +201,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_117.plan index c8dfab76a31..d436c49391c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_117.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_118.plan index 728ef24f86e..eb4dfc1562a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_118.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col5,row.col4,row.col6,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_119.plan index 6ed3ad61e8f..a58ea49328a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_119.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col4,row.col2,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_12.plan index 80910eacdbe..29ab7f0af5b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_12.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3,row.col4]" }, { "Inputs": [ @@ -161,7 +161,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -169,16 +169,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -197,7 +207,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_120.plan index ccd3fcdd68b..5fcef325aee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_120.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col7,row.col6,row.col2,row.col3,row.col4,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_121.plan index 6cc45b1b613..bf59c68ae4b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_121.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_123.plan index 12206a3823b..0e7fc4f5844 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_123.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col3,row.col5,row.col2]" }, { "Inputs": [ @@ -180,7 +180,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -188,16 +188,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -216,7 +226,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_124.plan index 7fb2a09d74b..9225121440c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_124.plan @@ -150,7 +150,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col3,row.col1,row.col2,row.col6]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_125.plan index 0f816b00926..872ecc5d4bb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_125.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.c,Arg.b]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_126.plan index 1459a1ee909..d954fc60bda 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_126.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col5,row.col6,row.col1,row.col3]" }, { "Inputs": [ @@ -184,7 +184,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -192,16 +192,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -220,7 +230,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_127.plan index 52c812f295c..d9cb103b3e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_127.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_128.plan index 709b0dfea91..a0e3a091cd9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_128.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col5,row.col1,row.col7,row.col2,row.col6]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_129.plan index 5d14be72da5..7d79d705e1f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_129.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col1,row.col2,row.col4,row.col6,row.col5,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_130.plan index 2eea3472f59..dee749da09e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_130.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_131.plan index d8d6831c018..d680edc5242 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_131.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col2,row.col4,row.col6,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_133.plan index a9a534a60c1..c3f5ee958b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_133.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col3,row.col2,row.col4]" }, { "Inputs": [ @@ -201,7 +201,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -209,16 +209,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -237,7 +247,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_134.plan index dcff1bec45f..5e8db837d0a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_134.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col4,row.col2]" }, { "Inputs": [ @@ -224,7 +224,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -232,16 +232,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -260,7 +270,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_135.plan index 636bd94f822..575e2a10eb6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_135.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col2,row.col3,row.col1,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_14.plan index 1af1fb8fa17..578a19ddad2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_14.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_15.plan index 2e6576ae48d..f034c46060e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_15.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_16.plan index ebec0e17f9a..ee27fc3ea7e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_16.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3,row.col5,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_17.plan index 988a7e8456c..98bddca4c70 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_17.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col7,row.col6,row.col4,row.col2,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_18.plan index 0e1bbce58b8..f1b8cf85ef4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_18.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_19.plan index f4cff77999c..6e5ddfd0853 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_19.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_2.plan index 413bb7f6186..3c3274d52ab 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_2.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -193,7 +193,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -201,16 +201,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -229,7 +239,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_20.plan index 6a39edaf7fe..9819d203097 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_20.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_21.plan index 71f9acc499d..40529db0d6d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_21.plan @@ -138,7 +138,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col6,row.col5,row.col4,row.col1]" }, { "Inputs": [ @@ -250,7 +250,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -258,16 +258,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -286,7 +296,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_23.plan index 59a8f2b8c01..22f79fa3381 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_23.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_24.plan index f44238ca546..10edcb658b3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_24.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col3,row.col2]" }, { "Inputs": [ @@ -184,7 +184,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -192,16 +192,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -220,7 +230,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_25.plan index e5d1abc0e8a..013d89671f5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_25.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_26.plan index 75a389e8d80..90885a6a021 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_26.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_27.plan index 07a4ec3c3e2..7b275582de5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_27.plan @@ -135,7 +135,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col1,row.col3,row.col5,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_28.plan index 411f46028a9..764ecc9c039 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_28.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_3.plan index 65377da44f8..0786331be0f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_3.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col1,row.col5,row.col3,row.col2]" }, { "Inputs": [ @@ -228,7 +228,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -236,16 +236,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -264,7 +274,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_30.plan index 519d43181d4..88db6993ec4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_30.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_31.plan index f9da2ad5075..594fd61e475 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_31.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col1]" }, { "Inputs": [ @@ -167,7 +167,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -175,16 +175,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -203,7 +213,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_32.plan index ebde61e04f5..18297e51f56 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_32.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col7,row.col1,row.col6,row.col5,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_33.plan index cc300f73036..ec9e128f456 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_33.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_34.plan index b24d54b53d9..3f38e5fe358 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_34.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_35.plan index a1d3ff3fc86..099697a9d86 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_35.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_36.plan index b416eb3fc36..d8b8645052e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_36.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_37.plan index 96fcc7a3a29..afd8703419f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_37.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col1,row.col5,row.col6,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_38.plan index caf7982a7d7..867c4a4d63b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_38.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_39.plan index e011766879e..e842f8bffda 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_39.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_4.plan index 9d9f9ff0d17..0adf11ad23b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_4.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_40.plan index 6bfe511ebfa..8eb9949f0bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_40.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col5,row.col6,row.col2,row.col1,row.col7]" }, { "Inputs": [ @@ -179,7 +179,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -187,16 +187,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -215,7 +225,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_41.plan index 05f5b69045a..8a2ec8a5f15 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_41.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col5,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_42.plan index 911d1ef3c3d..857f6bdcf87 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_42.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col4,row.col6,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_43.plan index ea12b6a14af..f5e711d6187 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_43.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col1,row.col4,row.col3,row.col6]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_44.plan index 86d2853271b..017b5d32700 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_44.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col1,row.col4,row.col3]" }, { "Inputs": [ @@ -186,7 +186,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -194,16 +194,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -222,7 +232,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_46.plan index 30245fbbc89..f1ba405c9db 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_46.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_47.plan index 5c57e016aee..090ce677175 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_47.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_49.plan index 71bdf2647eb..bd821110e51 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_49.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_5.plan index 7ac98ae2253..6f5380646e2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_5.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col2,row.col1,row.col5]" }, { "Inputs": [ @@ -170,7 +170,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -178,16 +178,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -206,7 +216,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_50.plan index 939fab9df3b..6360f73726e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_50.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_52.plan index 01b342f762e..70efc4b3cef 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_52.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col4,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_53.plan index dd4b000f05a..a4b083a1745 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_53.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_55.plan index d4cde88998e..6991458c933 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_55.plan @@ -144,7 +144,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col1,row.col6,row.col5,row.col3]" }, { "Inputs": [ @@ -256,7 +256,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -264,16 +264,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -292,7 +302,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_56.plan index 70652cf4eb8..ccfe97178ed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_56.plan @@ -201,7 +201,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col4,row.col3,row.col5,row.col6,row.col7]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_59.plan index d2e74598a1b..abdad076245 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_59.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_6.plan index d4fa72daa41..de40592597e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_6.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_60.plan index f3770809ec4..ff5b90bc601 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_60.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col4,row.col2,row.col6,row.col5,row.col3,row.col1]" }, { "Inputs": [ @@ -209,7 +209,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -217,16 +217,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -245,7 +255,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_61.plan index b9a02f96dcc..245acc1d597 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_61.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col3,row.col1,row.col5,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_63.plan index 429b6cf210a..ba6b5961a6f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_63.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_64.plan index dc4722af214..b4ec9bab5fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_64.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_65.plan index 9007d65d8b0..ae692357394 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_65.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ @@ -184,7 +184,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -192,16 +192,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -220,7 +230,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_66.plan index 87ea8ff6a56..f22b60ad84c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_66.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_67.plan index 89528ae9f40..d11230370aa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_67.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_69.plan index 3540667929a..ce158de8e64 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_69.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_7.plan index 0258a1a3f6e..c04b2f5404c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_7.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col6,row.col1,row.col2,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_70.plan index 0d51aa8cc97..551026d1195 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_70.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col3,row.col1,row.col2,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_71.plan index 5ab677fd6a3..2744b4695b5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_71.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col1,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_72.plan index 7e8764e738d..d0afb11ea9f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_72.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_73.plan index fccf5df2447..5457af49e1f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_73.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col7,row.col2,row.col6,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_74.plan index ccacf0a078b..66afa2b012a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_74.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_77.plan index 4655611dd9e..dceec2188a7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_77.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1,row.col6,row.col4,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_78.plan index 535c25439d0..835f1235062 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_78.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col1,row.col2,row.col4,row.col6,row.col7]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_79.plan index bbf73c21d6c..31b54f5b37a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_79.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col6,row.col3,row.col5,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_8.plan index 82671b3ebd4..1fcfc1d6218 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_8.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_80.plan index b02ec58f516..5cd6fffdc37 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_80.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col5,row.col2,row.col6,row.col7,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_81.plan index 1e97fb3eb18..567d394aa9a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_81.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ @@ -162,7 +162,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -170,16 +170,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -198,7 +208,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_82.plan index 85b2916a11c..9379a0c81fc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_82.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_83.plan index 9c3cbea1c11..a3b94ceb957 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_83.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_84.plan index 40cff04a047..ee0efc01455 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_84.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col2,row.col5,row.col1]" }, { "Inputs": [ @@ -195,7 +195,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -203,16 +203,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -231,7 +241,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_85.plan index 3e664541c05..177c1c519cc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_85.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_86.plan index 4e7b600b5c2..5c657bf52e8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_86.plan @@ -144,7 +144,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col5,row.col4,row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_88.plan index 741b08d2e98..eb11c4c0a35 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_88.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_89.plan index ce6d7622f0f..1e65db19f94 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_89.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col4,row.col6,row.col3,row.col2,row.col7]" }, { "Inputs": [ @@ -224,7 +224,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -232,16 +232,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -260,7 +270,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_9.plan index bda044d2892..00ffb44c95f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_9.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_90.plan index 0ef72d051fb..48327e7ca1f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_90.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col1,row.col4,row.col3,row.col5,row.col2]" }, { "Inputs": [ @@ -185,7 +185,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -193,16 +193,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -221,7 +231,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_91.plan index 8c8822b674e..1035d461423 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_91.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col3,row.col2,row.col5,row.col1]" }, { "Inputs": [ @@ -169,7 +169,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -177,16 +177,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -205,7 +215,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_92.plan index 9d7a6ade191..211a6ca6bec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_92.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_93.plan index d386a34509e..a1a6d913a34 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_93.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_94.plan index d18868571fd..7c67445a1aa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_94.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_95.plan index 768e19a1a52..311d9c64968 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_95.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ @@ -178,7 +178,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -186,16 +186,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -214,7 +224,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_96.plan index e3911d1f033..398258ff674 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_96.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_97.plan index f72fbdc87b3..512fddbaaa4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_97.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col1,row.col4,row.col6,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_98.plan index e98f65624fd..89499721955 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-4.test_/query_98.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -169,7 +169,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -177,16 +177,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -205,7 +215,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_10.plan index 4803395e43b..942b246beb8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_10.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_11.plan index e6671d1ef8e..25dbb74e867 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_11.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col1,row.col7,row.col2,row.col3,row.col6,row.col4]" }, { "Inputs": [ @@ -191,7 +191,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -199,16 +199,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -227,7 +237,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_12.plan index b9c02b777d7..641c02b84e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_12.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_14.plan index 31e99368c65..fcfd8c79d8f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_14.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_15.plan index 7be62b7125e..11fd6bf1d83 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_15.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col1,row.col7,row.col5,row.col6,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_17.plan index 2a7c6345f72..5a6159a729d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_17.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_19.plan index aff8a8db00f..b9ea6e32c67 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_19.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col4,row.col2,row.col6,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_2.plan index 287afc7cd77..16a6d2a1a48 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_2.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col6,row.col1,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_21.plan index 84b231acf31..4f21e3a522c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_21.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_23.plan index a003372bb0a..222c0521331 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_23.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col5,row.col4,row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_24.plan index d16538ff8bd..c7111005faa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_24.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col4,row.col5,row.col2]" }, { "Inputs": [ @@ -176,7 +176,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -184,16 +184,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -212,7 +222,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_26.plan index d122e0e33e5..f0a64073c2d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_26.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3,row.col4,row.col5]" }, { "Inputs": [ @@ -177,7 +177,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -185,16 +185,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -213,7 +223,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_27.plan index 5735ec2830b..6bc08379f03 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_27.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_28.plan index db2e46f2722..ca03f17bce0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_28.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_29.plan index ef34c917306..795e0531d07 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_29.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ @@ -162,7 +162,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -170,16 +170,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -198,7 +208,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_30.plan index a6dccc26a40..1ad48c31468 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_30.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col5,row.col2,row.col6,row.col4]" }, { "Inputs": [ @@ -220,7 +220,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -228,16 +228,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -256,7 +266,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_32.plan index 0654356f5da..7935db026e8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_32.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col4,row.col2,row.col1,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_33.plan index 0cf594385f8..9b3f44f873d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_33.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_34.plan index dc7ed411ebd..6d4367da486 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_34.plan @@ -123,7 +123,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2,row.col5,row.col4,row.col7,row.col6]" }, { "Inputs": [ @@ -236,7 +236,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -244,16 +244,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -272,7 +282,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_35.plan index db89dacf810..4820edde613 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_35.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_36.plan index 5231ba86620..fa178910c48 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_36.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_37.plan index a4677106f99..c7bcbf8324e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_37.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_38.plan index ea3a5d624e2..40b6c7d5591 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_38.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col6,row.col5,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_39.plan index c2abceddc3f..54216a19090 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_39.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_4.plan index fa0effb0cfd..54243595365 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_4.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col1,row.col6,row.col7,row.col2,row.col3,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_5.plan index d5d1c087aa5..9dbf3f795dd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_5.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_6.plan index b4771bf7a18..01d0c5893af 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_6.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col6,row.col1,row.col2,row.col3,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_7.plan index 54cd29de947..9b145ef42b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_7.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col1,row.col5,row.col3,row.col2,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_8.plan index b0e8f1d6ef9..5d651e59cc4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_8.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col5,row.col1]" }, { "Inputs": [ @@ -177,7 +177,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -185,16 +185,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -213,7 +223,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_9.plan index bf3a834b227..cab4bbfdcc8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select1-5.test_/query_9.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_1.plan index f92c8812d6a..ec498ef5bfe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_1.plan @@ -142,7 +142,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -150,16 +150,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -178,7 +188,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_10.plan index 94f1a5cfc6c..2c179ff07b5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_10.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1,row.col4,row.col5]" }, { "Inputs": [ @@ -192,7 +192,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -200,16 +200,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -228,7 +238,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_100.plan index f28e63accc0..5b4eeeae949 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_100.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col1,row.col2,row.col4,row.col5,row.col7,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_101.plan index 4ef1d2dca91..35e2d3ed760 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_101.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_102.plan index c8444f5d087..e34ede37718 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_102.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_104.plan index 5cd7e9b704f..5bc3df630b4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_104.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_106.plan index 759a6abfade..84c74a8e4b6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_106.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_107.plan index f92c8812d6a..ec498ef5bfe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_107.plan @@ -142,7 +142,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -150,16 +150,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -178,7 +188,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_109.plan index 2d80be793df..d731c5c089f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_109.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col5,row.col1,row.col6,row.col3]" }, { "Inputs": [ @@ -208,7 +208,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -216,16 +216,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -244,7 +254,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_11.plan index dbd5626affd..b9fb0d240fd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_11.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col3,row.col1,row.col2]" }, { "Inputs": [ @@ -172,7 +172,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -180,16 +180,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -208,7 +218,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_111.plan index 7862863c53f..19b5de7752c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_111.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col1,row.col5,row.col3,row.col6]" }, { "Inputs": [ @@ -217,7 +217,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -225,16 +225,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -253,7 +263,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_112.plan index a8ef53953b4..f7ebe2605c5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_112.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_113.plan index 869ded0ffca..36d4c669def 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_113.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col5,row.col2,row.col3,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_116.plan index b0e5420c95a..dd82856fc5e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_116.plan @@ -123,7 +123,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col2,row.col3,row.col6,row.col5]" }, { "Inputs": [ @@ -235,7 +235,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -243,16 +243,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -271,7 +281,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_117.plan index 4381f4da41d..88c9b6a28e9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_117.plan @@ -123,7 +123,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_119.plan index 4b592fad211..13a278a8f4c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_119.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col4,row.col5,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_12.plan index 5e5d758b8c0..1d881182010 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_12.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col4,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_121.plan index 602d52ca1a7..8ce8fdf9ccf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_121.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1,row.col4,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_122.plan index cce15a1a336..48de64b90a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_122.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ @@ -158,7 +158,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -166,16 +166,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -194,7 +204,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_123.plan index d32660a731a..dbd9d344707 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_123.plan @@ -138,7 +138,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col6,row.col1,row.col4,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_124.plan index a1b2b338c4a..aedcbce59b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_124.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_125.plan index 6f9d5f55c6f..3e9cf718900 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_125.plan @@ -103,7 +103,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col5,row.col2,row.col3]" }, { "Inputs": [ @@ -184,7 +184,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -192,16 +192,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -220,7 +230,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_126.plan index 5d80b954d4d..dd35cc96f6a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_126.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col5,row.col1,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_128.plan index 9292323a0f2..b664ba755ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_128.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_129.plan index f13d1eeba5c..d1c3d7d6410 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_129.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_13.plan index 847c6a68391..1ed7bcf8862 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_13.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col4,row.col3,row.col1,row.col2,row.col5,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_130.plan index c8762fe4a13..2dbb64aed33 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_130.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col7,row.col6,row.col3,row.col5,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_131.plan index 7261934ea32..f58e128194a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_131.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_132.plan index 293a4221e34..67008f55a62 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_132.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_134.plan index cbd1ade0cdf..10b9e638d04 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_134.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col2,row.col5,row.col1,row.col4,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_135.plan index c74cf8cd483..9c6b6136a8a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_135.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_137.plan index 38e60ac9ef3..de59d9c921b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_137.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_137.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ @@ -165,7 +165,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -173,16 +173,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -201,7 +211,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_14.plan index f33b2de3697..9a93e3a1141 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_14.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_15.plan index a8f844dd187..03c22516064 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_15.plan @@ -118,7 +118,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col4,row.col7,row.col3,row.col5,row.col6]" }, { "Inputs": [ @@ -201,7 +201,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -209,16 +209,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -237,7 +247,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_16.plan index 882a9456b2a..be3a1e05d41 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_16.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_17.plan index 22f4c626f2b..5699a3fd7be 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_17.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_18.plan index ca3699a7828..f8ca14d1656 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_18.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_19.plan index 51e1295fdda..3576191fe0a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_19.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_2.plan index b95e6f2f1a6..d05be9ba738 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_2.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col3,row.col4,row.col7,row.col6,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_20.plan index 8630d7f1c6b..037b50f9875 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_20.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col3,row.col6,row.col4,row.col2]" }, { "Inputs": [ @@ -182,7 +182,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -190,16 +190,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -218,7 +228,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_21.plan index cd5af968a2e..ab1a8c45784 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_21.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col1,row.col4,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_25.plan index 12a55d89472..2a348deb544 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_25.plan @@ -118,7 +118,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col5,row.col2,row.col4]" }, { "Inputs": [ @@ -190,7 +190,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -198,16 +198,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -226,7 +236,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_26.plan index f3f961f1ae6..a5b7feba3b5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_26.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_27.plan index 00763430920..483c803de04 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_27.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_29.plan index 0a3d6faf977..26af6c6bc76 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_29.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ @@ -162,7 +162,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -170,16 +170,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -198,7 +208,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_3.plan index 313645e5ca4..8152f33b9a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_3.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_31.plan index 7808e250021..90da17beffd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_31.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col6,row.col1,row.col3,row.col4,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_33.plan index 6fbd0d523da..7b69df1d2fe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_33.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_34.plan index d462d555c2d..09bd5282a72 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_34.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col5,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_37.plan index 3c3d03fa0fc..f8aa01b8605 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_37.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_38.plan index 933ccbdc66b..ab543b03211 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_38.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_39.plan index 8380545f1e1..d838d9754b8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_39.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_40.plan index 9c48615fc28..570a74a12d5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_40.plan @@ -155,7 +155,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -163,16 +163,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -191,7 +201,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_41.plan index e918ce61440..812d6ceb1bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_41.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_42.plan index e427f8ccc41..757de4976c4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_42.plan @@ -135,7 +135,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1,row.col4,row.col6,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_43.plan index 5979858d5a1..931035665cd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_43.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_44.plan index 915c54de904..1568a7a66d4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_44.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_45.plan index 8c45f4579ff..28867fc3481 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_45.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2,row.col4,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_46.plan index aa568496938..fb7c5c77c8b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_46.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_47.plan index 18e6ca2423b..6eda4c49f4f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_47.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_48.plan index 6c59460bfbc..9cbca1248e2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_48.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ @@ -208,7 +208,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -216,16 +216,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -244,7 +254,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_49.plan index dfc5a585823..55b3a0ceef8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_49.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col7,row.col4,row.col1,row.col3,row.col6]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_51.plan index fc840b3cf50..2fb1cdd0135 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_51.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ @@ -178,7 +178,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -186,16 +186,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -214,7 +224,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_52.plan index 796d0ad1d8a..a9a2d2e9844 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_52.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -159,7 +159,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -167,16 +167,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -195,7 +205,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_53.plan index 97df8e2bffc..61c7d1e7c6a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_53.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_54.plan index d2e6698b660..03275fd6943 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_54.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col5,row.col4,row.col7,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_55.plan index fed5e1d5462..636f6f027cd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_55.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_56.plan index 89711240bc6..56dec3382bf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_56.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_59.plan index d3c32851bd2..e73dfaff131 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_59.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_6.plan index ef33006f0a0..98b8558d57e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_6.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_60.plan index d955841e2cd..8d676206b06 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_60.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col5,row.col3,row.col1]" }, { "Inputs": [ @@ -179,7 +179,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -187,16 +187,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -215,7 +225,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_61.plan index eccf7bffefa..f444d4c9eb9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_61.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col7,row.col6,row.col4,row.col2,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_62.plan index c3904a61244..410615d02fb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_62.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_63.plan index 5d23fb19a74..1482ae9257d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_63.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_65.plan index 4272c59b324..e9ae8ef378a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_65.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col3,row.col2,row.col1]" }, { "Inputs": [ @@ -225,7 +225,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -233,16 +233,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -261,7 +271,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_66.plan index b1e81b624c9..bb72bdea33b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_66.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_68.plan index 6f86489dc62..a8ca5c40864 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_68.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col7,row.col2,row.col5,row.col6,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_7.plan index 4207c54d0ce..15da236204a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_7.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_70.plan index 2432bda88ef..d859ebbb864 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_70.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col3,row.col6,row.col7,row.col5,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_71.plan index 29d250e2506..46aaccec859 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_71.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_72.plan index 6835383a09a..43547c7ddac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_72.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_73.plan index c96431b653c..f86dfed4498 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_73.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_74.plan index f148c045d50..f74b570f50a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_74.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col2,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_75.plan index 32307b6e70c..99f48ccb0eb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_75.plan @@ -82,7 +82,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3,row.col5,row.col4]" }, { "Inputs": [ @@ -163,7 +163,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -171,16 +171,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -199,7 +209,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_76.plan index 30b50847a0a..a659e3394f7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_76.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_77.plan index 8658b8767a2..4783478a959 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_77.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_78.plan index fa6348080ef..756fc39cb28 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_78.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_8.plan index 50e6bc4830c..beb76d36613 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_8.plan @@ -153,7 +153,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col6,row.col3,row.col1,row.col4,row.col2,row.col7]" }, { "Inputs": [ @@ -255,7 +255,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -263,16 +263,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -291,7 +301,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_80.plan index 46976d8eb77..ed377b8fe72 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_80.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col6,row.col2,row.col1,row.col5,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_81.plan index a43f3c2fe18..5f39fb22eeb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_81.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_82.plan index c29cf5aca9d..c7566374e4a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_82.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_84.plan index af467235e0c..838795bee98 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_84.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_85.plan index 501ac03da44..2146c8db006 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_85.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_86.plan index 0e36d835b24..6b75f100f9a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_86.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_87.plan index f4af0621b37..41dfe021539 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_87.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col3,row.col1,row.col4,row.col7,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_88.plan index 615db730d4a..f1708bc6567 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_88.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_89.plan index cee35a69fb5..285c6b8f6fc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_89.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2]" }, { "Inputs": [ @@ -168,7 +168,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -176,16 +176,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -204,7 +214,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_9.plan index e9cec5afe1d..22ed0e01ed0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_9.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_90.plan index 50414b5aa5a..f7e92b12579 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_90.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_91.plan index d3481de4f47..e26b8013ae2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_91.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -158,7 +158,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -166,16 +166,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -194,7 +204,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_92.plan index 1d5c33a8fc2..7b140344be2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_92.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_94.plan index bb951de76b4..16d195d96cf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_94.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col6,row.col5,row.col1,row.col4,row.col3]" }, { "Inputs": [ @@ -217,7 +217,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -225,16 +225,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -253,7 +263,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_96.plan index 2ddf3e7ad5b..4a6b1c49eb1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_96.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_98.plan index 7ab1b9707e2..1f2ce549f2c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_98.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col2,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_99.plan index bd21630978a..6ce9c2717ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-1.test_/query_99.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_1.plan index 36be2349e92..d456337fb01 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_1.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col5,row.col1,row.col3]" }, { "Inputs": [ @@ -222,7 +222,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -230,16 +230,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -258,7 +268,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_10.plan index f41b843a3a9..d5e6e9d044d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_10.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col4,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_102.plan index af13669e39e..980ef5da947 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_102.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col4,row.col3,row.col1,row.col6]" }, { "Inputs": [ @@ -208,7 +208,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -216,16 +216,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -244,7 +254,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_103.plan index 4eeef65cff3..250b4ff0867 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_103.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col3,row.col1,row.col6,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_104.plan index 49a66900b85..4befbe730ec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_104.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_105.plan index 33c58012741..2b1ba1b95d2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_105.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col6,row.col3,row.col5,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_106.plan index 8e557917a12..54d3a9b9691 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_106.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_107.plan index c3c6576e3cb..7991b6b8c07 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_107.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col5,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_108.plan index 140e0355444..567c4b14a55 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_108.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_109.plan index 0a0172b232b..0ccff891188 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_109.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col5,row.col2,row.col6,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_11.plan index f23059bd7de..55953e9b0b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_11.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_110.plan index 2d8f6699bf0..89a2f827fec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_110.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col1,row.col5,row.col3,row.col6,row.col7]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_111.plan index 58eccdf8347..d12a21f37aa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_111.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col2,row.col3,row.col6,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_112.plan index 9c63754b399..73780ace4ec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_112.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_113.plan index 7eea5993895..7fdd1a1ab71 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_113.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_114.plan index d06e994b637..d483aaabc7d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_114.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_115.plan index be74bf216ba..6994b55d2f3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_115.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_116.plan index de000fab3e9..5579e48d30e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_116.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_117.plan index 96a7aa0b539..754727b71e1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_117.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_118.plan index bc0917a9b3c..e88df586eb3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_118.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_119.plan index 187d44f7214..ef598b2c630 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_119.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col6,row.col7,row.col2,row.col4,row.col5]" }, { "Inputs": [ @@ -234,7 +234,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -242,16 +242,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -270,7 +280,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_12.plan index 5edf23b10ce..d23231d1fe0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_12.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_121.plan index 8e4b42e8930..1d837d190b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_121.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col2,row.col3]" }, { "Inputs": [ @@ -204,7 +204,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -212,16 +212,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -240,7 +250,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_123.plan index 6213fa8dffa..462def55cb4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_123.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_124.plan index 5e556916148..fd00d94e4a6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_124.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_125.plan index 4c8931612fe..7eba05429bd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_125.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_126.plan index bf6e8149e5c..1f7e9633d20 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_126.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_127.plan index edf80b53ffa..237091cbeee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_127.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ @@ -202,7 +202,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -210,16 +210,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -238,7 +248,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_128.plan index baba18a0e28..9c2764c2f5c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_128.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_129.plan index 7ceb9f23490..79b18a5f07e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_129.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col3,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_13.plan index af976c00ef5..845035779ba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_13.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col6,row.col3,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_130.plan index 016843f546b..395bdcb9f64 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_130.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_132.plan index ea25778b79f..b062477438c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_132.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_133.plan index 55bb94a84a2..dcfb4d720bb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_133.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col1,row.col2]" }, { "Inputs": [ @@ -196,7 +196,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -204,16 +204,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -232,7 +242,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_135.plan index ea9380a2320..85398b18969 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_135.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_136.plan index 821822503da..8e50b69da27 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_136.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_136.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_137.plan index 752ac53795b..aa703eb29bf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_137.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_137.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ @@ -160,7 +160,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -168,16 +168,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -196,7 +206,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_138.plan index bd110593862..65a4f5990bd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_138.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_138.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_139.plan index 8711a866395..ddd92bffb1d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_139.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_139.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1,row.col4]" }, { "Inputs": [ @@ -182,7 +182,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -190,16 +190,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -218,7 +228,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_143.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_143.plan index 884cab82308..d3c61be49e1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_143.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_143.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col4,row.col3,row.col1]" }, { "Inputs": [ @@ -177,7 +177,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -185,16 +185,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -213,7 +223,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_144.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_144.plan index f44e1a3b5d9..8508409e047 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_144.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_144.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_145.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_145.plan index d54a22a7c9d..9c84729d5cd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_145.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_145.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col3,row.col1,row.col6,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_146.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_146.plan index a9fd0f74d3b..65d5511dcef 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_146.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_146.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_147.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_147.plan index 0d9d0f4b83c..f7050a4da1b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_147.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_147.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_148.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_148.plan index 1a488f809bf..1be88f7c642 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_148.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_148.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_149.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_149.plan index 7a28b36de54..736a2e341da 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_149.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_149.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_15.plan index 9f1b21f692e..8aaff1be37f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_15.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_150.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_150.plan index a67a3384b93..61675fe624f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_150.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_150.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col7,row.col6,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_152.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_152.plan index f1b7bd4f46e..963ba7de249 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_152.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_152.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col6,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_153.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_153.plan index b1eec9c1719..0caa361639e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_153.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_153.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_154.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_154.plan index ea4eabd599c..24581960d01 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_154.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_154.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_155.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_155.plan index c0928da39f3..1d9b34cbf2b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_155.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_155.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col4]" }, { "Inputs": [ @@ -176,7 +176,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -184,16 +184,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -212,7 +222,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_157.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_157.plan index 9f53da0c545..5ab200ef3f4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_157.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_157.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -158,7 +158,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -166,16 +166,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -194,7 +204,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_158.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_158.plan index cab10485f95..8e5616c4df5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_158.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_158.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_16.plan index 59f1733dc3a..6a095d05d93 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_16.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_17.plan index a277b551f1d..133b5ef3b6e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_17.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_18.plan index 36681b3bb7a..f727316f6ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_18.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_19.plan index b44ac34f0bf..ce78b08512b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_19.plan @@ -147,7 +147,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col3,row.col6,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_2.plan index 95e45dcaec0..a7788ed5288 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_2.plan @@ -123,7 +123,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col3,row.col2,row.col5]" }, { "Inputs": [ @@ -234,7 +234,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -242,16 +242,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -270,7 +280,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_21.plan index 4fba381942a..5f324c8de0d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_21.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_22.plan index 48074e62111..65ea3e5eaed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_22.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col3,row.col2,row.col7,row.col4,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_23.plan index a7469368618..1735896bb18 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_23.plan @@ -147,7 +147,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col1,row.col2,row.col6,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_24.plan index dac7a5e9e57..ed8dc9ad1c5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_24.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_25.plan index 10f279a7ffb..70627137abd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_25.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col3,row.col2,row.col1,row.col7,row.col6]" }, { "Inputs": [ @@ -195,7 +195,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -203,16 +203,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -231,7 +241,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_26.plan index 835d67c5b14..7df3549108c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_26.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col5,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_27.plan index b107e578d0f..87e4df7b19c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_27.plan @@ -138,7 +138,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col3,row.col7,row.col1,row.col2,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_28.plan index 82ece0fc4a0..616625a4381 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_28.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col5,row.col2,row.col1,row.col3,row.col7,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_3.plan index 5bdb13237c7..75056754cc8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_3.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col1,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_31.plan index 6fb77075661..0c5685b9f1e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_31.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_32.plan index b00a1e73d4a..4ad885e69bb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_32.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col2,row.col1,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_34.plan index 2ae999ec3c1..2803d8f4c53 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_34.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_35.plan index 8e6b89b3e84..d82f0544062 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_35.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_36.plan index 05118dbdd64..0b14485dac7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_36.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col6,row.col3,row.col2,row.col5,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_38.plan index ebc7edd0d4c..0f50ed767fe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_38.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col1,row.col3]" }, { "Inputs": [ @@ -172,7 +172,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -180,16 +180,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -208,7 +218,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_39.plan index bb3bc4e2a25..e4fa1d43f8d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_39.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_4.plan index 9d85e82f452..9d6b178016d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_4.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -173,7 +173,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -181,16 +181,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -209,7 +219,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_40.plan index 087d96054c4..27d0227803f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_40.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col4,row.col3,row.col1]" }, { "Inputs": [ @@ -231,7 +231,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -239,16 +239,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -267,7 +277,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_42.plan index 2048c51019b..874295f0745 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_42.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_43.plan index 92864184c9b..bec53e90a32 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_43.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_44.plan index 1390ca368ec..7bea8e82de6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_44.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_45.plan index b86ee5be271..5baa07d8ccc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_45.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col1,row.col3,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_46.plan index eab50f1df28..95809f6926e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_46.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_47.plan index 8ccbb73785d..7b2ca138f0e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_47.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_49.plan index 31d2c7dfd7c..e7f9b38c54b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_49.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_5.plan index 33540943dc4..2547c95fa08 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_5.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_50.plan index 3f3c9b84bc5..36e8e3d60dc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_50.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_51.plan index d544208d3c2..e3dbb8777fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_51.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3,row.col4,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_52.plan index 2467695d8ef..d53374f44f9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_52.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_53.plan index f0cb78c7efb..4947461364d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_53.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col1,row.col5,row.col6,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_54.plan index 606ae32d0f1..be72b921d63 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_54.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col4,row.col1,row.col6,row.col7,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_55.plan index 24794a03940..a67d48128bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_55.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col6,row.col3,row.col2,row.col1,row.col5]" }, { "Inputs": [ @@ -196,7 +196,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -204,16 +204,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -232,7 +242,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_56.plan index 4596818c88b..8c4b6916a0d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_56.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_57.plan index bd8061830ae..8bd375a9d89 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_57.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col6,row.col4,row.col1,row.col5,row.col2]" }, { "Inputs": [ @@ -179,7 +179,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -187,16 +187,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -215,7 +225,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_58.plan index 3f3b4ecd591..1504057d62d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_58.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_59.plan index 477c37a2341..280afda5d8b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_59.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_6.plan index 618d6f34963..cc70769d0fd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_6.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col2,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_60.plan index 9d4cd557e19..bcd5257627a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_60.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2,row.col5,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_61.plan index 68c0f245484..abdf0113d5b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_61.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col5,row.col3,row.col2]" }, { "Inputs": [ @@ -206,7 +206,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -214,16 +214,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -242,7 +252,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_63.plan index e83eee92818..34936dbd818 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_63.plan @@ -138,7 +138,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col5,row.col4,row.col2,row.col7,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_64.plan index b49fe68a062..c15af5ceb36 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_64.plan @@ -123,7 +123,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col5,row.col2,row.col6,row.col7,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_65.plan index 75a67c964ed..91c2f5e256d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_65.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col5,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_66.plan index 351e466da1e..dca1e44b27b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_66.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_67.plan index e8daa5442e4..f7ae212506c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_67.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col2,row.col5,row.col1,row.col3,row.col4]" }, { "Inputs": [ @@ -211,7 +211,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -219,16 +219,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -247,7 +257,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_68.plan index fc1ba9186b0..e03faa461f7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_68.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_7.plan index 7971fe2739a..b379b997a09 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_7.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_70.plan index 80da43485ad..1ea544cc797 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_70.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_71.plan index f0161399a69..9b990910ced 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_71.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col4,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_72.plan index 0d1e213d9b6..c8cff1416e7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_72.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col4,row.col6,row.col5,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_73.plan index d69fc19b3a2..e0d7e5726b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_73.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_74.plan index 16d332795f1..52d6440a9ad 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_74.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_75.plan index 338ad39a193..7e8b6272ba5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_75.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col5,row.col1,row.col2]" }, { "Inputs": [ @@ -195,7 +195,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -203,16 +203,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -231,7 +241,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_76.plan index 71290c42a01..4cf2f99cced 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_76.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_77.plan index 28bf1dfe60d..31491b98b12 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_77.plan @@ -154,7 +154,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -162,16 +162,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -190,7 +200,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_78.plan index a077ce1c1b6..7709024dd43 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_78.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_80.plan index 5cbb3f09e39..ba3f28ef46d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_80.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_81.plan index d10097e500e..daec41aac9f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_81.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col5,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_84.plan index 2137ffee59a..df84f384c52 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_84.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col6,row.col1,row.col5,row.col7,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_85.plan index 04d4206cfb5..91ae7f215d7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_85.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col6,row.col2,row.col5,row.col4]" }, { "Inputs": [ @@ -220,7 +220,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -228,16 +228,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -256,7 +266,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_86.plan index a9cc47dcf2a..30333893df7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_86.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col3,row.col1,row.col6,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_87.plan index 25d2c6e9173..45ac0c3ff37 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_87.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_88.plan index 7c57ca385d9..7b0dd9d8da1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_88.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col1,row.col5,row.col3,row.col6]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_89.plan index bfe05cd8555..e2f5fd99336 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_89.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col1,row.col3,row.col2]" }, { "Inputs": [ @@ -192,7 +192,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -200,16 +200,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -228,7 +238,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_9.plan index 0bbdfa80d51..0edb857495d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_9.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col1,row.col6,row.col3,row.col7,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_90.plan index e7de07b7db2..0070a0ca684 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_90.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col5,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_91.plan index 834dac987e3..3eca0eb5495 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_91.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col6,row.col7,row.col1,row.col2,row.col5]" }, { "Inputs": [ @@ -231,7 +231,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -239,16 +239,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -267,7 +277,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_93.plan index 3d5d8f1d4ff..c2af65ee1d7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_93.plan @@ -147,7 +147,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1,row.col7,row.col5,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_94.plan index 9726c18e8db..0e8be7c0faa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_94.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_95.plan index db5da124afe..172ea6884e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_95.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_96.plan index 4690806b502..b6dd068f77b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_96.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_97.plan index 1058bd52911..9ab852a815c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_97.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col1,row.col5,row.col3]" }, { "Inputs": [ @@ -186,7 +186,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -194,16 +194,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -222,7 +232,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_98.plan index 53b241719ad..c8839dd3577 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_98.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ @@ -156,7 +156,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -164,16 +164,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -192,7 +202,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_99.plan index cfec3a2b35d..1337be98a69 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-2.test_/query_99.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_1.plan index 09779fef5ca..8c94ec0a584 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_1.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_10.plan index 8356f74e314..5349601477c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_10.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ @@ -200,7 +200,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -208,16 +208,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -236,7 +246,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_100.plan index 394c1c086bb..e5aad056472 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_100.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_101.plan index dd17a192377..9bcba2b4186 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_101.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_102.plan index 398032d107f..ad35b20a659 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_102.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_103.plan index 6d52bee2258..2ff7f0c8259 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_103.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1,row.col4,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_105.plan index f4f5a5a4806..ef2d31df9cc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_105.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_107.plan index c07556c1f14..f265ada5d97 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_107.plan @@ -155,7 +155,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -163,16 +163,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -191,7 +201,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_108.plan index ab528c8bdf2..e6103a27811 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_108.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_11.plan index 27747f8a6a8..60e249b5acb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_11.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_110.plan index b1113353ef2..91f651b4f5d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_110.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_111.plan index 9985237c7fc..61041a09621 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_111.plan @@ -154,7 +154,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -162,16 +162,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -190,7 +200,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_112.plan index 8d4f2e3093d..66c015bffa7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_112.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ @@ -211,7 +211,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -219,16 +219,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -247,7 +257,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_113.plan index 881b9239af8..20067998c13 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_113.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_114.plan index d0adb5ea1ab..ac51c236272 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_114.plan @@ -123,7 +123,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col6,row.col3,row.col5,row.col1,row.col2]" }, { "Inputs": [ @@ -235,7 +235,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -243,16 +243,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -271,7 +281,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_116.plan index 779f85b98f3..55d3c5c4a2d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_116.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_117.plan index 9bf92d399d4..8c73d17b01c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_117.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -162,7 +162,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -170,16 +170,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -198,7 +208,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_118.plan index cb0d0926cf7..2fcd117954b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_118.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_119.plan index 6aff55b326f..cc3db391e38 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_119.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_12.plan index 0cb4fc10568..371e7e1d7c9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_12.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_121.plan index e0f8ea00f24..1d56eb3e93f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_121.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_123.plan index f1c0e5e3af5..ae640545db5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_123.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_124.plan index 98c957fa052..021053f8f8c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_124.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_125.plan index 3276b948395..d7381c872a9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_125.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col5,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_126.plan index c737ee7b52c..a0d3611fb50 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_126.plan @@ -153,7 +153,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col1,row.col6,row.col7,row.col3,row.col4,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_127.plan index 49b74bd5e2c..48eb6daf0cb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_127.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_128.plan index 2206e83532a..054529da9ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_128.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_129.plan index cd290e866b1..c95ebae6e31 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_129.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_13.plan index 2f350819372..46713d1f667 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_13.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col4,row.col6,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -234,7 +234,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -242,16 +242,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -270,7 +280,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_130.plan index a7b901f6e8b..f44d960ebe2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_130.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_131.plan index 162506df3f5..96ec392146c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_131.plan @@ -144,7 +144,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2,row.col7,row.col5,row.col6,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_132.plan index 4f426e2338c..1aa48234151 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_132.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_135.plan index d3b61c059bf..e47c14692df 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_135.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col2,row.col1,row.col5]" }, { "Inputs": [ @@ -186,7 +186,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -194,16 +194,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -222,7 +232,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_137.plan index e9ec7640212..e6da853bf5f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_137.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_137.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_138.plan index 2a5003954db..43dc9647c14 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_138.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_138.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col5,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_139.plan index 7c7f5df06d3..c90363a5753 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_139.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_139.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col1,row.col4,row.col5,row.col7,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_14.plan index 0cad7247404..e89e7c788f9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_14.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_140.plan index 81673334497..100481bef99 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_140.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_140.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col4,row.col6,row.col3,row.col2]" }, { "Inputs": [ @@ -190,7 +190,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -198,16 +198,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -226,7 +236,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_142.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_142.plan index 3c30eaf5c3a..e8434ba7252 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_142.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_142.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_144.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_144.plan index 317750b12ec..dd6a3617d50 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_144.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_144.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -165,7 +165,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -173,16 +173,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -201,7 +211,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_145.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_145.plan index 28311e0aa99..b0915471c12 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_145.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_145.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ @@ -165,7 +165,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -173,16 +173,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -201,7 +211,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_146.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_146.plan index 613906e59d3..04d4da113a6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_146.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_146.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_147.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_147.plan index ae0d4f2de9a..844a7eaca68 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_147.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_147.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col1,row.col5]" }, { "Inputs": [ @@ -189,7 +189,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -197,16 +197,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -225,7 +235,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_15.plan index da4730b9637..e7a546f31e1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_15.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_16.plan index 098addd428a..8d674a40a05 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_16.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col1,row.col2,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_17.plan index 196883dbe29..8ec8b448516 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_17.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1,row.col5]" }, { "Inputs": [ @@ -177,7 +177,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -185,16 +185,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -213,7 +223,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_18.plan index c425e48f0d3..d5af9af3f75 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_18.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col5,row.col6,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_19.plan index 71db77f2808..e4820dee0e4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_19.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_2.plan index f9e39e7a6a4..80d89eacf50 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_2.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col6,row.col3,row.col2,row.col4,row.col7]" }, { "Inputs": [ @@ -233,7 +233,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -241,16 +241,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -269,7 +279,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_21.plan index e43e4fc7ffb..a3baea71b0c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_21.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_22.plan index 38f41f2e00f..baec4ae1789 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_22.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_24.plan index d65f4ee8399..837a482b6ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_24.plan @@ -136,7 +136,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col1,row.col2,row.col5]" }, { "Inputs": [ @@ -208,7 +208,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -216,16 +216,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -244,7 +254,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_25.plan index 0bdf43dcd91..0b996e60e23 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_25.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_26.plan index 88908962bfa..2eb94341383 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_26.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1,row.col5,row.col4,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_27.plan index 6b74f62444b..4cb94777402 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_27.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ @@ -165,7 +165,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -173,16 +173,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -201,7 +211,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_29.plan index b80c3f347dd..617edf55e47 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_29.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_3.plan index c89748cddb4..963d2a20958 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_3.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_30.plan index 00ee6b85349..d98928a36c5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_30.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_31.plan index 02337e808d2..327c0add90f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_31.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col4,row.col5,row.col3]" }, { "Inputs": [ @@ -167,7 +167,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -175,16 +175,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -203,7 +213,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_32.plan index cb304d862eb..32819b7ef46 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_32.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col4,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_33.plan index 77eced081ae..56b8b0836a1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_33.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_34.plan index 1496a969ab7..93c42975cb6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_34.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_35.plan index 150339e512f..b767a2bcc74 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_35.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_36.plan index b3a9b2a3369..9b47f64124b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_36.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col4,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_37.plan index 22a2c7c3b2b..395efb40860 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_37.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col4,row.col6,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_39.plan index b8dbdbd6274..ca6c1544c58 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_39.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_40.plan index f48ac1523c7..3d0ee3fd157 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_40.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_41.plan index c2575280606..1cc02784c9b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_41.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col5,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_43.plan index 4ee3d63b8a9..7ea86735feb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_43.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col1,row.col6,row.col7,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_44.plan index fda361b394f..a33ef3faf59 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_44.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col5,row.col2,row.col1,row.col3,row.col4,row.col7]" }, { "Inputs": [ @@ -191,7 +191,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -199,16 +199,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -227,7 +237,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_47.plan index eff7b81efed..563a4d2dfe7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_47.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_48.plan index efabc5f402e..311f5ec04c0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_48.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col3,row.col5,row.col2,row.col4,row.col7,row.col1]" }, { "Inputs": [ @@ -212,7 +212,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -220,16 +220,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -248,7 +258,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_49.plan index a0cb0fe2bdd..8b9cf0c3ba7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_49.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_5.plan index 99b7150baec..ba57741dba2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_5.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col1]" }, { "Inputs": [ @@ -188,7 +188,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -196,16 +196,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -224,7 +234,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_50.plan index f82f7f1a0fb..83c470cede6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_50.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col3,row.col2,row.col7,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_51.plan index 6aa7ecd8d88..ee19a6f4629 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_51.plan @@ -52,7 +52,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -119,7 +119,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -127,16 +127,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -155,7 +165,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_52.plan index e57bbc5da9d..3b71e2f7e91 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_52.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_53.plan index f0c9b987054..893f4620b96 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_53.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_54.plan index 25a98437693..6d996c97fdd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_54.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ @@ -162,7 +162,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -170,16 +170,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -198,7 +208,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_56.plan index d5b68e13f60..7f58ea5cd2a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_56.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_57.plan index 422c3968186..190e9310b5d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_57.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col5,row.col6,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_58.plan index 0c59a9a0146..e91f1196e5b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_58.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col5,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_59.plan index e3f37ba5c89..0d53fe558ba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_59.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col5,row.col7,row.col1,row.col6]" }, { "Inputs": [ @@ -197,7 +197,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -205,16 +205,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -233,7 +243,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_6.plan index e680a62aaa5..b974ab87413 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_6.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col7,row.col1,row.col6,row.col3]" }, { "Inputs": [ @@ -190,7 +190,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -198,16 +198,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -226,7 +236,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_60.plan index b538a114cdf..d869414d9b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_60.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_61.plan index 7e0f44a9117..3f8230c87e7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_61.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col4,row.col6,row.col5,row.col7,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_62.plan index acdf9e0a6f9..5adc765674e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_62.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col6,row.col3,row.col4,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_64.plan index 94d14529c55..23545d74f82 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_64.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_67.plan index d89511c2b11..fe4e98ec7f9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_67.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_69.plan index 8a5b0c13f41..61371b71f1f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_69.plan @@ -154,7 +154,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -162,16 +162,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -190,7 +200,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_70.plan index bfa782d644a..30e7c227df0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_70.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col5,row.col3,row.col6,row.col4]" }, { "Inputs": [ @@ -189,7 +189,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -197,16 +197,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -225,7 +235,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_71.plan index 5031012b6bd..3c29bfe392d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_71.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col2,row.col6,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_72.plan index c71ea923dc4..5bcf43b4614 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_72.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col5,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_73.plan index 9145774b8ec..3e86e392bd9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_73.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_74.plan index dcc7d1f2889..e1f84037a8c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_74.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col2,row.col3]" }, { "Inputs": [ @@ -194,7 +194,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -202,16 +202,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -230,7 +240,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_75.plan index 0e72d6d8917..63ff31297d9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_75.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_76.plan index 56cb4d2bf7f..d87c9377b12 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_76.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_77.plan index 3c30eaf5c3a..e8434ba7252 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_77.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_78.plan index 737735b2492..23d5bebf725 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_78.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -166,7 +166,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -174,16 +174,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -202,7 +212,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_79.plan index 23783aaabaa..88978b3a4f6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_79.plan @@ -138,7 +138,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col1,row.col4,row.col3,row.col2]" }, { "Inputs": [ @@ -238,7 +238,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -246,16 +246,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -274,7 +284,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_8.plan index 6d3792d1d2c..52d3b16ee72 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_8.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col6,row.col3,row.col2,row.col1]" }, { "Inputs": [ @@ -193,7 +193,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -201,16 +201,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -229,7 +239,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_80.plan index d45af9c273f..46c640b820d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_80.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_82.plan index e4d62da4e1d..1a686c0aa40 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_82.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1,row.col4]" }, { "Inputs": [ @@ -176,7 +176,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -184,16 +184,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -212,7 +222,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_83.plan index ce8837b109c..41ad111e167 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_83.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_85.plan index 9a3af242fab..e8cb5ef3ae5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_85.plan @@ -85,7 +85,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col2,row.col3,row.col4]" }, { "Inputs": [ @@ -166,7 +166,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -174,16 +174,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -202,7 +212,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_87.plan index 327db8dde58..3a8dc5ac334 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_87.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_88.plan index 73dd0793936..fb382689828 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_88.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col3,row.col1,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_89.plan index 5da200a273d..78faa10c649 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_89.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_9.plan index 78156659c3a..2daf0e9851c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_9.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -194,7 +194,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -202,16 +202,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -230,7 +240,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_90.plan index 213b78fea23..bc52bacd591 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_90.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_91.plan index 9177d8911e0..7381253b01d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_91.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_92.plan index 04eb05260d7..c11d69a790a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_92.plan @@ -156,7 +156,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col7,row.col5,row.col2,row.col6,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_93.plan index 8b858b1309c..a1d1fc49c19 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_93.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_94.plan index c89748cddb4..963d2a20958 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_94.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_95.plan index a59bf11d2bc..aa861ae7bb7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_95.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_97.plan index d7ba27119ab..91612e56872 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-3.test_/query_97.plan @@ -138,7 +138,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col4,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_1.plan index 10e69a8289b..52e875be5da 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_1.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_10.plan index 79f98c3cafc..9f96f8cec69 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_10.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1,row.col4]" }, { "Inputs": [ @@ -161,7 +161,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -169,16 +169,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -197,7 +207,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_100.plan index c92db3e8a5e..16bf07dc201 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_100.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_101.plan index a459e151925..5927486dc60 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_101.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_102.plan index f4e867fd330..b3a73e69301 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_102.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col3,row.col5,row.col4,row.col7,row.col1,row.col2]" }, { "Inputs": [ @@ -233,7 +233,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -241,16 +241,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -269,7 +279,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_105.plan index d0166d3faa3..a4310bc5ed0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_105.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_106.plan index 7843897d9cf..39d960c2c2e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_106.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2,row.col5,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_107.plan index c177eb8d76d..7dc703c63c1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_107.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col4,row.col2,row.col1]" }, { "Inputs": [ @@ -195,7 +195,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -203,16 +203,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -231,7 +241,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_108.plan index 155682293c9..9240d8fc3ff 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_108.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col5,row.col1,row.col4,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_109.plan index 1b8d7e8ee64..140eec24641 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_109.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_11.plan index 12bbe08fa89..369902b4a49 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_11.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_111.plan index e7c833a77ea..942602ae8c4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_111.plan @@ -153,7 +153,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col3,row.col4,row.col5,row.col1,row.col2]" }, { "Inputs": [ @@ -265,7 +265,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -273,16 +273,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -301,7 +311,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_112.plan index b43eb7d6e0a..43f8c221f7c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_112.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_114.plan index 857a1be5948..bcdceef1544 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_114.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col6,row.col3,row.col2,row.col1,row.col4,row.col5]" }, { "Inputs": [ @@ -230,7 +230,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -238,16 +238,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -266,7 +276,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_115.plan index 3fd0bafe1e5..68808312ef2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_115.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_116.plan index 9eb9063437b..4d9a60f898e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_116.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col5,row.col2,row.col6,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_117.plan index 735bc030abd..8da7620367b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_117.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_118.plan index bce1bf69322..cd7851cb817 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_118.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.d,Arg.b,Arg.a]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_119.plan index 601b69dcbcf..5ce5d090f2d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_119.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_12.plan index 29906caba54..02d6793604a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_12.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_120.plan index ae20f085e71..42feba50c4f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_120.plan @@ -115,7 +115,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col1,row.col6,row.col2,row.col7,row.col3]" }, { "Inputs": [ @@ -198,7 +198,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -206,16 +206,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -234,7 +244,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_121.plan index 61557748201..f4456007079 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_121.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_123.plan index 585a1df7fc1..641e3d32f03 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_123.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col5,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_125.plan index 0cef626d86c..de95e54bd29 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_125.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_126.plan index 31a3675176f..d03abe9454f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_126.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_128.plan index b790d72d3cd..6d315d6eb4b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_128.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col4,row.col5,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_129.plan index eb1fb8ed776..be334803032 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_129.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_13.plan index 6144d3414fd..5fa276caabd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_13.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col1,row.col5,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_130.plan index 05dd69de1e0..4047de32f36 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_130.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col2,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_131.plan index cb541f1e0c2..8ce632dfd01 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_131.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_132.plan index d3d6ada9e5e..5e132021bc6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_132.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col6,row.col1,row.col5,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_133.plan index 065d26d0a72..d31eb08f89b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_133.plan @@ -138,7 +138,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col6,row.col2,row.col7,row.col3,row.col1,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_134.plan index 8f235cf3386..212876c4468 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_134.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col7,row.col2,row.col1,row.col3,row.col4,row.col6]" }, { "Inputs": [ @@ -233,7 +233,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -241,16 +241,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -269,7 +279,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_135.plan index 054b1e2ed1c..97e9bcbd021 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_135.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col1,row.col3,row.col4,row.col7,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_14.plan index d711b568bdb..62290110953 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_14.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col4,row.col3,row.col2]" }, { "Inputs": [ @@ -171,7 +171,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -179,16 +179,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -207,7 +217,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_15.plan index 72428467e0d..65fa5101990 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_15.plan @@ -123,7 +123,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col6,row.col2,row.col7,row.col4,row.col5,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_16.plan index 2ff5408ebbd..50281943657 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_16.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_17.plan index 228643899e9..e961304d812 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_17.plan @@ -123,7 +123,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col2,row.col4,row.col3,row.col1,row.col5,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_18.plan index 2637f7cb888..5120afbe9d4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_18.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_19.plan index 838d2065032..e0eb4c54d1d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_19.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3,row.col4]" }, { "Inputs": [ @@ -182,7 +182,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -190,16 +190,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -218,7 +228,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_2.plan index 70c6c00cd2c..ca3fd0b33c3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_2.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col6,row.col4,row.col1,row.col5]" }, { "Inputs": [ @@ -205,7 +205,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -213,16 +213,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -241,7 +251,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_20.plan index e501fa2eefd..575b95b3553 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_20.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -166,7 +166,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -174,16 +174,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -202,7 +212,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_22.plan index 6e4535b6475..9d00f8ce2e4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_22.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_23.plan index bb912070e16..481ecfde266 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_23.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col7,row.col5,row.col3,row.col6,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_24.plan index dde0c7714b5..77b914bc6bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_24.plan @@ -123,7 +123,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_25.plan index 0138bcbbe4b..ec48b4c4b68 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_25.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_27.plan index 50cd934f8f2..29ccc45911b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_27.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col6,row.col4,row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_28.plan index c8c4b277cb3..9920c6ecb73 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_28.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -174,7 +174,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -182,16 +182,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -210,7 +220,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_29.plan index 6327a225b61..6df33c7ce25 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_29.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col5,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_3.plan index 25201a95eb8..132aba33421 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_3.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_32.plan index 14ff9f31cd1..1733feeca55 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_32.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col1,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_33.plan index a137057a59e..fbed40cd4a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_33.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ @@ -192,7 +192,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -200,16 +200,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -228,7 +238,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_35.plan index 9be9d37de1a..ba42e62ea09 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_35.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col4,row.col3,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_36.plan index 6fdd8d4ff37..3cec6510da1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_36.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col4,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_37.plan index d962c7adee6..19ffb88b2d8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_37.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col1,row.col2,row.col4]" }, { "Inputs": [ @@ -179,7 +179,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -187,16 +187,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -215,7 +225,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_39.plan index 013cd014451..aee797469d9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_39.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3,row.col4]" }, { "Inputs": [ @@ -173,7 +173,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -181,16 +181,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -209,7 +219,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_40.plan index 61a0a4f8f19..1ecc584cd7f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_40.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1,row.col4,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_41.plan index 6a1fb26cd69..8795d7764ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_41.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_42.plan index 6226eb68ef8..0ebbb2cd9bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_42.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col4,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_43.plan index e90fd27b775..35867fb378d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_43.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col6,row.col3,row.col4,row.col1,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_44.plan index e96e53e0577..ec4157a4695 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_44.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_45.plan index 4505094855f..053ce34ffaa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_45.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col1,row.col4,row.col2]" }, { "Inputs": [ @@ -195,7 +195,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -203,16 +203,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -231,7 +241,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_48.plan index f161e750865..04a131fd2e8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_48.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_49.plan index eefef1c3254..0f32d75c89b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_49.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col6,row.col3,row.col1,row.col5,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_5.plan index 51a93843691..4f26f95454c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_5.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col5,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_50.plan index 46566bb2585..7a19f5564da 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_50.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col4,row.col1,row.col5,row.col6,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_51.plan index 44979964b21..ec1c04bf51f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_51.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_52.plan index c01cc5d1d85..eb0715a8d52 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_52.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ @@ -176,7 +176,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -184,16 +184,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -212,7 +222,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_55.plan index 31811007e0d..ecd63eeafdb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_55.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_57.plan index 6cd022e1674..c3f869408b1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_57.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_6.plan index 90e9457dcdf..2d76b4468aa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_6.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_60.plan index 8646bd9bed8..36f2ab8f386 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_60.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_61.plan index 430a7510575..aa17027c8b9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_61.plan @@ -155,7 +155,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -163,16 +163,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -191,7 +201,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_63.plan index cbb359cf7e7..355c1251f3f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_63.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col7,row.col6,row.col4,row.col2,row.col3,row.col5]" }, { "Inputs": [ @@ -201,7 +201,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -209,16 +209,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -237,7 +247,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_65.plan index 34c0f75cc13..7624222eea4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_65.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_66.plan index d856d9e8b5d..bea21794d7d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_66.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col5,row.col3,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_67.plan index 9492a648f84..b49819c1b74 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_67.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ @@ -159,7 +159,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -167,16 +167,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -195,7 +205,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_68.plan index b0a95a2db90..df8edc03da9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_68.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col3,row.col1,row.col6,row.col2]" }, { "Inputs": [ @@ -181,7 +181,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -189,16 +189,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -217,7 +227,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_69.plan index 40de15a40f0..40babf707a3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_69.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col5,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_70.plan index 4d25122c27b..48913ac8f26 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_70.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col1,row.col2,row.col4,row.col6]" }, { "Inputs": [ @@ -187,7 +187,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -195,16 +195,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -223,7 +233,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_71.plan index 0a55b5cfa41..ff62f219df0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_71.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col6,row.col4,row.col5,row.col2]" }, { "Inputs": [ @@ -197,7 +197,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -205,16 +205,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -233,7 +243,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_72.plan index cae90aa0964..3497fd43f89 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_72.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_73.plan index 8c765c3477d..1103dc4f61b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_73.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_74.plan index 9cdc623c127..cf882a304a1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_74.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col5,row.col1,row.col7,row.col4,row.col6]" }, { "Inputs": [ @@ -212,7 +212,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -220,16 +220,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -248,7 +258,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_75.plan index 59d65894dec..f587018b638 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_75.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col5,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_76.plan index 63068991a91..8566b2ec2d9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_76.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col4,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_77.plan index 0a74303c60a..f305b36d264 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_77.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_78.plan index 19981c2e1e7..f885874c07b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_78.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_79.plan index c0e32172400..2e13b244da5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_79.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_8.plan index 5cabf7ea8e6..91cbe2a34dd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_8.plan @@ -135,7 +135,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col1,row.col2,row.col5,row.col4,row.col3,row.col7]" }, { "Inputs": [ @@ -248,7 +248,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -256,16 +256,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -284,7 +294,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_80.plan index 53289b812e6..285f90fcafd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_80.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_81.plan index c4a4c7ee9ec..54fed049acb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_81.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col5,row.col6,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_82.plan index 4a2f4c0c9bf..a2d896d71b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_82.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ @@ -173,7 +173,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -181,16 +181,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -209,7 +219,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_83.plan index 0ba69d9cbc9..b9faf07451d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_83.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_84.plan index 31b0c64864e..319f3fc6d55 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_84.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col2,row.col3]" }, { "Inputs": [ @@ -224,7 +224,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -232,16 +232,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -260,7 +270,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_85.plan index c20b7c01a24..d9e5f0ab0ef 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_85.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_86.plan index 9e57c77fe35..3473615d0cf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_86.plan @@ -155,7 +155,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -163,16 +163,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -191,7 +201,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_87.plan index 0a5beb87137..d6aa09de26a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_87.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_88.plan index f40b9aea624..9492a92cbf6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_88.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_89.plan index c381526c447..ef4e6c802c3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_89.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ @@ -162,7 +162,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -170,16 +170,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -198,7 +208,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_9.plan index 0e3aea08e24..e0fb71e1d1c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_9.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col1,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_90.plan index 761b0f4fce1..ed17a1f417b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_90.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col1,row.col4,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_91.plan index 7a11c77b6c2..ca58358a814 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_91.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1,row.col5]" }, { "Inputs": [ @@ -209,7 +209,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -217,16 +217,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -245,7 +255,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_92.plan index 4c0f8dd5a26..372c4034618 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_92.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col1,row.col5,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_93.plan index 47f96f3d1a3..c96ca5ca988 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_93.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_94.plan index f698792bcc8..f613beb9cef 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_94.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col5,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_95.plan index 8d0b68a6b25..49d3f157aba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_95.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col6,row.col4,row.col5,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_96.plan index 13694f91895..d77a79ead64 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_96.plan @@ -115,7 +115,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col1,row.col2]" }, { "Inputs": [ @@ -195,7 +195,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -203,16 +203,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -231,7 +241,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_97.plan index 64596010609..0610362b9a2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_97.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col5,row.col6,row.col1,row.col2,row.col7]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_98.plan index b7c2eed093a..1dbc53b405e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_98.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col4,row.col2,row.col5]" }, { "Inputs": [ @@ -186,7 +186,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -194,16 +194,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -222,7 +232,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_99.plan index c9b5acc3d6b..c38d1cd854a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-4.test_/query_99.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_1.plan index 0926fddbb8d..5a476d6bbf5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_1.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col2,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_2.plan index 4e5e8942867..e93c7787409 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_2.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_3.plan index cf46a35439e..db46c04ceb7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_3.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_5.plan index 9c19272aed2..f168da67bdf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_5.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_6.plan index b5be246dd91..47bd384f8bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_6.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col6,row.col5,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_7.plan index 1118e6ba067..4a98e84f140 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_7.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_8.plan index 4ca4b1ecdc3..6ef6c2ac90b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select2-5.test_/query_8.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col6,row.col1,row.col2,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_1.plan index 4de8aca277d..0a87e35136d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_1.plan @@ -142,7 +142,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -150,16 +150,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -178,7 +188,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_10.plan index 434f4e101de..05d7685d29b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_10.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_100.plan index e08b089ec20..77c8b0be1db 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_100.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_101.plan index 5388500768c..028690f2e39 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_101.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_102.plan index 5b7fd65d627..606269979bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_102.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_103.plan index 52f4506c45d..203d453a73a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_103.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_104.plan index 52f4506c45d..203d453a73a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_104.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_105.plan index c065984b160..713518c5d28 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_105.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_106.plan index 447734e4e2b..efad83496b8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_106.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_107.plan index 7bc455ebee7..ec507d3dacc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_107.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_108.plan index 40bda6dfd7d..aa6996ceb54 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_108.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col1,row.col7,row.col2,row.col6,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_11.plan index 9da02bd5f56..2c910d0802d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_11.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_119.plan index 56c98d6ad83..4f58dfae344 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_119.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_12.plan index d5a4f5243fd..99c1ecbed74 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_12.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_120.plan index ad643c65b04..a530cd573b3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_120.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_121.plan index 61d2e63df57..6cebf44e61c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_121.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_122.plan index bd434de9708..4097ec029a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_122.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_123.plan index 0aec2c86f26..6e54e620a38 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_123.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_124.plan index 38ea2abf9c3..c5ef9723df3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_124.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_125.plan index 5538fc4544c..b766c721cec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_125.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_126.plan index 98a47288136..ace701cff40 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_126.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col3,row.col6,row.col2,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_127.plan index b1369cb0ad5..5e22a0c6ea8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_127.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_128.plan index ee0721408b3..d53f47df0cd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_128.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3,row.col6,row.col4,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_129.plan index bd1de31216e..060e0805d60 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_129.plan @@ -174,7 +174,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_13.plan index f6f59b35a3b..5f662e522d7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_13.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_130.plan index e607baa6320..d619770e6fb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_130.plan @@ -174,7 +174,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col3,row.col6,row.col4,row.col5,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_131.plan index 0745e498348..7271fc9d6e9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_131.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -160,7 +160,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -168,16 +168,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -196,7 +206,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_132.plan index 0745e498348..7271fc9d6e9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_132.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -160,7 +160,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -168,16 +168,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -196,7 +206,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_133.plan index 83bfbef56f0..023cce09b54 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_133.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_134.plan index 01647eceb95..bd1407220ea 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_134.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col2,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_135.plan index 5f381c68fc4..19681962379 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_135.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_136.plan index 28e9f493e37..06a5683a8d3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_136.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_136.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_137.plan index 0b6bf466280..d1629991dcf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_137.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_137.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_138.plan index 2ac7a09b2da..ac1856aba3a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_138.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_138.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_139.plan index 51d1a725ac9..453ea4fdc46 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_139.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_139.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_14.plan index 3ef59560f65..8ced3c4c016 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_14.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_140.plan index 4eee566f0f6..6282a124425 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_140.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_140.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_141.plan index d7d92290f1f..29b952190a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_141.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_141.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_142.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_142.plan index e9207affe1f..9327a68b230 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_142.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_142.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_143.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_143.plan index ef3564a0d27..e6e880a7b65 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_143.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_143.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_144.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_144.plan index 9bf3b9b0ada..f932d48f37b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_144.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_144.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_147.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_147.plan index 2c36aaf8b2c..fad2661854d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_147.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_147.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_15.plan index 89e4452f488..e16fe7707bb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_15.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_16.plan index 89e4452f488..e16fe7707bb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_16.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_17.plan index 7e13010ea21..39c4b399e4c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_17.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -186,7 +186,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -194,16 +194,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -222,7 +232,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_18.plan index f7f4a6e2894..fad2af2000b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_18.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col5,row.col2,row.col4]" }, { "Inputs": [ @@ -186,7 +186,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -194,16 +194,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -222,7 +232,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_19.plan index 455b0ffc251..3d4aece1650 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_19.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -186,7 +186,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -194,16 +194,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -222,7 +232,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_2.plan index 4de8aca277d..0a87e35136d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_2.plan @@ -142,7 +142,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -150,16 +150,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -178,7 +188,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_20.plan index 5ebb603dadb..73d0addd08a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_20.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col5,row.col3,row.col2]" }, { "Inputs": [ @@ -186,7 +186,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -194,16 +194,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -222,7 +232,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_29.plan index cd9a6bb53a7..6d2f1f09711 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_29.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_3.plan index b64abea88ed..52908f8aeaf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_3.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_30.plan index cd9a6bb53a7..6d2f1f09711 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_30.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_31.plan index dfc7dd8eef6..2d915ccd30c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_31.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_32.plan index 276a10a1c18..33c4f92545f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_32.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_33.plan index dfc7dd8eef6..2d915ccd30c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_33.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_34.plan index 276a10a1c18..33c4f92545f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_34.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_35.plan index dfc7dd8eef6..2d915ccd30c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_35.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_36.plan index dfc7dd8eef6..2d915ccd30c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_36.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_37.plan index dfc7dd8eef6..2d915ccd30c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_37.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_38.plan index 03b2f91572c..1961a5d3eb9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_38.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_39.plan index a0f837a7f5a..9360a5f978d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_39.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -197,7 +197,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -205,16 +205,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -233,7 +243,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_4.plan index cdf78bf803e..4494f273689 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_4.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_40.plan index ccd98a308e1..1a1c9ecd698 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_40.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col6,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -197,7 +197,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -205,16 +205,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -233,7 +243,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_41.plan index ca4a3764d4b..52dac3dc039 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_41.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_42.plan index ca4a3764d4b..52dac3dc039 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_42.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_43.plan index 242da208f06..3c7090ab569 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_43.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_44.plan index 242da208f06..3c7090ab569 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_44.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_45.plan index d57e87e418c..e0f9f0068c6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_45.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_46.plan index cd067baf5be..da49a742675 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_46.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_47.plan index 05641c893dc..5d08688956f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_47.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_48.plan index 231969ab62b..cf8cd0ae911 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_48.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col1,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_49.plan index 11e10bf49e5..3f82d2358e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_49.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_5.plan index 4f8f663c014..37542c3db6a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_5.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_50.plan index cc23268ce90..06fb1726ebb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_50.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col1,row.col3,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_51.plan index 159399841ff..e2698dcc580 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_51.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_52.plan index 4fb28565c1f..6faefa03957 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_52.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col5,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_53.plan index fa519db177d..8ff9b5a8209 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_53.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_54.plan index fa519db177d..8ff9b5a8209 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_54.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_55.plan index 54a7f6c3aca..d3427f827e5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_55.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_56.plan index ef72a24e200..342ad644fe1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_56.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_57.plan index bca87316ca4..0d63f62921e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_57.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_58.plan index bca87316ca4..0d63f62921e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_58.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_59.plan index ae27b908c35..642e86b81dd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_59.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_6.plan index 7b785cdbf66..a19faade0f4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_6.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col5,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_60.plan index 55544d71b01..994d7e87d87 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_60.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_61.plan index 1ec46866d9e..e678871a0a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_61.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_62.plan index 494e5e9e057..a96bdeda082 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_62.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_63.plan index 9b3453d4842..841938a4937 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_63.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_64.plan index f2e0903b4c5..caa0617c386 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_64.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_65.plan index c8b1b007f54..e7fea88ede8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_65.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_66.plan index 268ec49d9b2..7c0f22c604a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_66.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_67.plan index 4f3e2830ea0..d46b2484cb5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_67.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_68.plan index 49cc9e7808e..2d7be9f0f18 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_68.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_69.plan index 44d75802bea..5557531499a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_69.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_7.plan index 0461886deed..f6f56f35852 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_7.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_70.plan index 0a6a2a0b9d7..fc424483da8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_70.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_71.plan index 3a9b22496fe..787f1fad64b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_71.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_72.plan index cfd217cd12e..422604700ce 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_72.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_73.plan index ed90c9b16f8..5707ab0c1bb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_73.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_74.plan index 8e90c1cd1bc..3f673c3c87e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_74.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_75.plan index 802024e3da2..2756f8895c5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_75.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_76.plan index ac1bdb0d1ec..b297bdaaa27 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_76.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col5,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_79.plan index 7ca99e63837..29646ea508a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_79.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_8.plan index 1eae564a06d..216dc5d0919 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_8.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_80.plan index d3d86788456..d8ef91cec13 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_80.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_81.plan index 366477240c7..a4a49db0d45 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_81.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_82.plan index 366477240c7..a4a49db0d45 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_82.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_83.plan index 2906ad9bc27..85dc49b3ee7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_83.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -178,7 +178,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -186,16 +186,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -214,7 +224,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_84.plan index 4f0828d9317..bcec3b714fe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_84.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col1,row.col2,row.col3,row.col6]" }, { "Inputs": [ @@ -178,7 +178,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -186,16 +186,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -214,7 +224,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_85.plan index e0d69971114..51050aafeb1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_85.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_86.plan index 99a112617bf..f1282b1e87c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_86.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col4,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_9.plan index 8b9ed787874..b1550f76820 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_9.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_91.plan index 78e33f5a628..4bddfd49f65 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_91.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_92.plan index 5ee7a65dac0..8b2983d36f6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_92.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col2,row.col1,row.col4,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_93.plan index db24dc962d7..4b192cb4c2b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_93.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_94.plan index 08f968fab1f..af0cf1f8f46 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_94.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col5,row.col3,row.col6,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_95.plan index 1a7f2c9987c..613eb44e369 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_95.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_96.plan index 712ccf07f4a..6a8d726be5e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_96.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col6,row.col1,row.col5,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_97.plan index fee0334ce39..97be52f0719 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_97.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_98.plan index f96b0d11f54..5e80e53eafe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_98.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_99.plan index 04ea9ff085c..73c0ecb9818 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-1.test_/query_99.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_1.plan index 078b9863c37..f7bc0ed127d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_1.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_10.plan index 8fc79f8f124..8bb3595f20b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_10.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col1,row.col3,row.col2,row.col6,row.col5,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_100.plan index d648aa986b7..65126258b9f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_100.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_101.plan index 83af44286b6..171aa4a4e35 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_101.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_102.plan index 8272417a7ae..5ab2cfc7a11 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_102.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_103.plan index f8daa51da86..d6309d112d5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_103.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_104.plan index 9e3fe263526..bd20dc92eae 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_104.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col4,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_105.plan index cfe97dbdec3..de4d08ffe4b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_105.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_106.plan index dedcb2dd845..0c4e634f0c1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_106.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col5,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_107.plan index ed5d3101ce0..d9f10f14b2e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_107.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_108.plan index e2f71ae663b..59898d82e34 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_108.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col4,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_109.plan index b95eb453d66..65a4c79e727 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_109.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_11.plan index c97a2eb50a1..86a4829c076 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_11.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -209,7 +209,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -217,16 +217,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -245,7 +255,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_110.plan index 443ab67f635..af42ec566b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_110.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_115.plan index 24218f2b1d1..70fde9f5e8a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_115.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_116.plan index 1bc3caa19bb..da002d7dea7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_116.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_12.plan index fa6dac1d8b0..f53b689d8cb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_12.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col5,row.col4,row.col3,row.col6]" }, { "Inputs": [ @@ -209,7 +209,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -217,16 +217,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -245,7 +255,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_123.plan index a2f74926b92..817fd103c38 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_123.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_124.plan index 82ae2cce951..01e1c940dd0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_124.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_125.plan index 19d70ebe2f3..b348606cd4b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_125.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_126.plan index f014c8d594e..97d6b560b78 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_126.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col5,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_127.plan index e37eab1ece2..f4fc63da527 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_127.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_128.plan index e37eab1ece2..f4fc63da527 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_128.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_129.plan index 7d68d23f56a..821a17da1ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_129.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_13.plan index 34c96f571f6..484f23ec6da 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_13.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_130.plan index e9216053bfe..89e1a5d764e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_130.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_131.plan index dc7fe1f3ef0..1da8911a539 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_131.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_132.plan index e1e4ff2660c..276b49e7b08 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_132.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_14.plan index 3a01b41b907..d87d8a3dfc9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_14.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_2.plan index 24cf9155a93..d7420f4bb9d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_2.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_21.plan index 6855d6575f0..efa140a0e1d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_21.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_22.plan index 374387cd39c..d9abc6f01fc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_22.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col3,row.col6,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_23.plan index 826f548a418..a47a87433bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_23.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -213,7 +213,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -221,16 +221,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -249,7 +259,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_24.plan index d71095f76be..96835c8b7b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_24.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col6,row.col5,row.col4,row.col7,row.col2,row.col3]" }, { "Inputs": [ @@ -213,7 +213,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -221,16 +221,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -249,7 +259,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_25.plan index e2b9829d13d..1485304dacb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_25.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_26.plan index f287734d573..95fdd4962a1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_26.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col6,row.col5,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_27.plan index 0c2ee4fe0e0..ef0bb5ec569 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_27.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_28.plan index 0c2ee4fe0e0..ef0bb5ec569 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_28.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_29.plan index 0ba1aa5b762..1e3ca4918a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_29.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_3.plan index 782d7f15bab..50c03078c7c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_3.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_30.plan index 8289ff0f941..f2cda86f64f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_30.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_31.plan index dc2c19c619e..bc447abe9b6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_31.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_32.plan index 7eaea1d836d..d77c7dcbd6e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_32.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1,row.col4,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_37.plan index 5681efc4714..f645aab5eab 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_37.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_38.plan index 74c8cfdea31..70038fecf4b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_38.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_39.plan index dc17f494216..7bd0ec9d64a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_39.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_4.plan index 28ee25d9aad..f3440b7e398 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_4.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_40.plan index 9d7b751d06f..1051e158f0f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_40.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col5,row.col6,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_41.plan index 572ba270b1c..0bbd9f54cde 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_41.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_42.plan index ce27068d680..ab10fcf2adf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_42.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_43.plan index 714ecf0916d..2765c375a39 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_43.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_44.plan index 46604e088c2..69b9cccce15 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_44.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_47.plan index f784ddc84cd..b352bc6c533 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_47.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_48.plan index f784ddc84cd..b352bc6c533 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_48.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_5.plan index d8cb8a8d245..ff2e3af717c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_5.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_55.plan index bf2ef6e008c..27ad8471182 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_55.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_56.plan index a054d292044..b4e1f2d4423 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_56.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_57.plan index 611a8ca54b1..2869b5aedf8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_57.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_58.plan index dd7329a8094..05e02c4a3d1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_58.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_59.plan index cf13f1ce517..4bfa22a9e9b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_59.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_6.plan index 01a9c6f2c6c..e38b45912d4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_6.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col6,row.col2,row.col4,row.col5,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_60.plan index ce4381f090b..d8ef6390559 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_60.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_61.plan index 6e5caed4bd3..ac017efe2b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_61.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_62.plan index 71d6d96ec93..2e3566b9be9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_62.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_65.plan index 49257d67841..6b9cf0f7b3e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_65.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_66.plan index adeb9c3182c..bc98e797d9c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_66.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_67.plan index ba6c25dcf19..a446353fc93 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_67.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_68.plan index 7447480175f..8fb7104fa8d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_68.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_69.plan index f0350afc216..255383f6f18 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_69.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -209,7 +209,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -217,16 +217,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -245,7 +255,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_7.plan index 28afc46f96a..52d6dcca796 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_7.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_70.plan index 6aa9bccf002..bf30156a204 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_70.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col6,row.col2,row.col4,row.col7,row.col3,row.col1]" }, { "Inputs": [ @@ -209,7 +209,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -217,16 +217,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -245,7 +255,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_71.plan index 37ddc7b70de..40e69b993f9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_71.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_72.plan index 322f3b40633..0f884dd3221 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_72.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_73.plan index 3ce93deb826..16797edc3a1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_73.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_74.plan index 4d7e2043f12..1e2c0284ca6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_74.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col6,row.col3,row.col1,row.col5,row.col4,row.col7]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_75.plan index 3427262124a..b26c07f25d7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_75.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -192,7 +192,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -200,16 +200,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -228,7 +238,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_76.plan index cd02d7b43d4..45e005cc640 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_76.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col1,row.col3,row.col2]" }, { "Inputs": [ @@ -192,7 +192,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -200,16 +200,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -228,7 +238,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_77.plan index 8c1623a3a53..2296cb11bc9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_77.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_78.plan index 71072d47f6f..1eea6ff92ea 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_78.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col4,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_79.plan index 0d958109476..068c96cd7d9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_79.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_8.plan index ce481867db5..48041f32d5b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_8.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col5,row.col6,row.col7,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_80.plan index 0d958109476..068c96cd7d9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_80.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_81.plan index b44a9cc0272..953c0e8ef75 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_81.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_82.plan index 1b14953cb24..91633e7cad7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_82.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_83.plan index 4a3a92668bc..504bd8d43da 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_83.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_84.plan index ab846c1d6d3..101f0c57e88 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_84.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_9.plan index 97a072362c4..46825feca38 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_9.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_93.plan index df4da148766..423bfd07926 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_93.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -171,7 +171,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -179,16 +179,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -207,7 +217,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_94.plan index 7d916fc664b..849ababf38d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_94.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ @@ -171,7 +171,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -179,16 +179,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -207,7 +217,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_95.plan index 884b57dca34..8a8e5d64567 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_95.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_96.plan index 3893d71e2b2..92c6a34ae28 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_96.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col1,row.col3,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_97.plan index 72002596d73..4a8b080001a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_97.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -207,7 +207,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -215,16 +215,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -243,7 +253,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_98.plan index 18da0834a6b..ffab8aabb22 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_98.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col1]" }, { "Inputs": [ @@ -207,7 +207,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -215,16 +215,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -243,7 +253,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_99.plan index d487c5f1f3d..39480aa16d0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-10.test_/query_99.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_1.plan index 9c6f3c97cfd..cce94210a20 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_1.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_10.plan index 98d90119ee4..699cc3b55b6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_10.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_100.plan index a0c0aba6fca..6065ffd859c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_100.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_105.plan index 7eeaa156568..cd4e3f0ce61 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_105.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -192,7 +192,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -200,16 +200,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -228,7 +238,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_106.plan index 7eeaa156568..cd4e3f0ce61 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_106.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -192,7 +192,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -200,16 +200,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -228,7 +238,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_11.plan index fc4fee32337..ed1b88d5331 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_11.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_12.plan index 9c7bd4ca733..e9cc2a03b47 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_12.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_15.plan index 85ed7b0f363..6f9115ce546 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_15.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_16.plan index ad798c2d0a1..290b808553b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_16.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_17.plan index 6096d0637e2..26e2c2fe573 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_17.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_18.plan index 466b25276d8..fd71f9acf8f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_18.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col5,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_19.plan index 85461a500a2..3f6200f2a08 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_19.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -160,7 +160,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -168,16 +168,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -196,7 +206,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_2.plan index f0dea00b2ad..9cc088ab8a2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_2.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_20.plan index 85461a500a2..3f6200f2a08 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_20.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -160,7 +160,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -168,16 +168,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -196,7 +206,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_29.plan index 36ea6cc6cb8..1b7523feb42 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_29.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_3.plan index 967655af0d5..38ee3ce3ff3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_3.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_30.plan index 36ea6cc6cb8..1b7523feb42 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_30.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_31.plan index 6201bfb1f4d..e5f5d1cb848 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_31.plan @@ -154,7 +154,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -162,16 +162,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -190,7 +200,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_32.plan index 6201bfb1f4d..e5f5d1cb848 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_32.plan @@ -154,7 +154,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -162,16 +162,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -190,7 +200,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_33.plan index 6e82ac44a45..0e522dbfdce 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_33.plan @@ -183,7 +183,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_34.plan index 292bc53f992..0d7413bed31 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_34.plan @@ -183,7 +183,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col7,row.col3,row.col4,row.col6,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_35.plan index 6e82ac44a45..0e522dbfdce 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_35.plan @@ -183,7 +183,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_36.plan index ee9c4d0a317..1804ac195dd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_36.plan @@ -183,7 +183,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col6,row.col7,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_37.plan index 6e82ac44a45..0e522dbfdce 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_37.plan @@ -183,7 +183,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_38.plan index a43a28ac0a4..374cf8fd1df 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_38.plan @@ -183,7 +183,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col6,row.col3,row.col1,row.col7,row.col2,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_39.plan index 2ee4457f642..87c220f9cc6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_39.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_4.plan index 3d21f218b7e..ac074ad2825 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_4.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_40.plan index 2ee4457f642..87c220f9cc6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_40.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_43.plan index 5c3773830b8..d024763e1e3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_43.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -178,7 +178,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -186,16 +186,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -214,7 +224,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_44.plan index 85fee6cda54..611340fd385 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_44.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ @@ -178,7 +178,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -186,16 +186,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -214,7 +224,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_45.plan index d14d0cd012f..8aa3fa26307 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_45.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -178,7 +178,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -186,16 +186,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -214,7 +224,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_46.plan index d14d0cd012f..8aa3fa26307 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_46.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -178,7 +178,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -186,16 +186,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -214,7 +224,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_47.plan index 78b74ad7171..a41fcab78b4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_47.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -178,7 +178,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -186,16 +186,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -214,7 +224,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_48.plan index 3baea93d23b..15887e42c94 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_48.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ @@ -178,7 +178,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -186,16 +186,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -214,7 +224,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_49.plan index af99c9bc61f..cf7aa2354c4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_49.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_5.plan index afe307c58b8..4585e18bb24 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_5.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -202,7 +202,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -210,16 +210,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -238,7 +248,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_50.plan index 4ab5bf9d283..876158a69fe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_50.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col3,row.col5,row.col2,row.col4,row.col1,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_51.plan index 121c4f187a7..e15201f8c6a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_51.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_52.plan index 24b3415d34c..9ad2d5b15a2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_52.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col5,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_53.plan index 7fe9074272c..0e73dfbc399 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_53.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_54.plan index 43f2801266a..35fefa4ae69 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_54.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col5,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_55.plan index 5bfccbe6b28..034431574cb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_55.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_56.plan index 4a0e83fc370..ef5d3efe0b1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_56.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_57.plan index f9e6a2560cf..aed5e2923cf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_57.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_58.plan index 651d15af2dc..91bae3f0c62 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_58.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_6.plan index 9339a55a597..adc0523d08b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_6.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ @@ -202,7 +202,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -210,16 +210,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -238,7 +248,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_61.plan index f9b9ed0ab86..b8b19ac9532 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_61.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_62.plan index df1638328ea..8732f45eaaf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_62.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_63.plan index 9b263a4f891..9204f98cf1c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_63.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_64.plan index b674727c387..6bb943ba77f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_64.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_65.plan index 8a81657365e..ff7c06536b8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_65.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_66.plan index d4a22c642ae..7444017dac2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_66.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col6,row.col5,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_67.plan index b56db029385..5e2b2b01d6d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_67.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_68.plan index fa6e6cd4387..7ceb5d9541e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_68.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_69.plan index 3dc9e3a450e..4c69b7297b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_69.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_7.plan index 3c17deac7ed..20c83901522 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_7.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_70.plan index 37ce57897c5..98ad29e2589 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_70.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_73.plan index fcce0664aa1..45a7ced6b3a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_73.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_74.plan index 3710d699f0d..9b2a0748329 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_74.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_75.plan index fcce0664aa1..45a7ced6b3a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_75.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_76.plan index 3710d699f0d..9b2a0748329 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_76.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_77.plan index b7c41e0412c..3c602de25ec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_77.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_78.plan index 868e304eba9..f68bfe4bcd1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_78.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col6,row.col1,row.col5,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_79.plan index 78d4b7848fe..73ca3ab9b20 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_79.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_8.plan index 9ff5fbc5ffb..12b4fa06c40 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_8.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col6,row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_80.plan index 8f4d022e708..b21771a82ad 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_80.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_81.plan index a4a88dc86ea..207029b4285 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_81.plan @@ -141,7 +141,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_82.plan index 596408b86ac..00a6dbabd56 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_82.plan @@ -141,7 +141,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col6,row.col7,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_83.plan index 1fe3d743480..cb41583fefc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_83.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_84.plan index 0130af1c61f..ab33016a5a2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_84.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col2,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_85.plan index b058e7bdbfd..2d5ece4fb93 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_85.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_86.plan index f83beca5708..b225e99fb60 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_86.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col1,row.col2,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_87.plan index d49f613214d..8d593f47969 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_87.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_88.plan index f8c524ebec3..84ed9ed9895 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_88.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col5,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_89.plan index b6b67875d51..e13c6a04c83 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_89.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_9.plan index fc4fee32337..ed1b88d5331 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_9.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_90.plan index 04466f0e7ca..f35b0bad957 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_90.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_91.plan index 9aa314b6f7b..c8318f252c7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_91.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_92.plan index 2aef7339d0d..bacc77b625b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_92.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col6,row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_93.plan index e0c507ec607..f0e81d3cb49 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_93.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_94.plan index a0c0aba6fca..6065ffd859c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_94.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_95.plan index e0c507ec607..f0e81d3cb49 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_95.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_96.plan index 408ac883c47..4fb2ad74a74 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_96.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_97.plan index e0c507ec607..f0e81d3cb49 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_97.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_98.plan index 408ac883c47..4fb2ad74a74 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_98.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_99.plan index e0c507ec607..f0e81d3cb49 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-11.test_/query_99.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_10.plan index d76904725b9..920d92fde97 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_10.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_100.plan index b24cbae414d..2b3ad238a38 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_100.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_101.plan index d194b2befb3..7af949426c6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_101.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_102.plan index bc902338f5a..098bb0e3296 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_102.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_103.plan index a349b161398..f6b45d93e0f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_103.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_104.plan index ad3b3dff278..a9e5815e1b1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_104.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col5,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_105.plan index 0a5b26d166a..bbe2dd610b6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_105.plan @@ -138,7 +138,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -240,7 +240,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -248,16 +248,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -276,7 +286,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_106.plan index d933e0387d4..8f0f112d023 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_106.plan @@ -138,7 +138,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col6,row.col2,row.col1,row.col3,row.col4,row.col5]" }, { "Inputs": [ @@ -240,7 +240,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -248,16 +248,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -276,7 +286,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_107.plan index 688b93097d1..5b8530ea5c1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_107.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -175,7 +175,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -183,16 +183,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -211,7 +221,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_108.plan index 6aa75875b10..4e3aef3b67c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_108.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col5,row.col3]" }, { "Inputs": [ @@ -175,7 +175,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -183,16 +183,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -211,7 +221,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_109.plan index 9a23e61d20a..089ab58e335 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_109.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -170,7 +170,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -178,16 +178,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -206,7 +216,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_11.plan index 1936bb5012e..e40102cfc0a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_11.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_110.plan index 67ae6076f82..eb74e1330f5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_110.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col3]" }, { "Inputs": [ @@ -170,7 +170,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -178,16 +178,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -206,7 +216,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_111.plan index 385991811b7..a47e9bf0bd4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_111.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -170,7 +170,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -178,16 +178,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -206,7 +216,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_112.plan index f545afd400a..6fc966f1786 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_112.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1]" }, { "Inputs": [ @@ -170,7 +170,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -178,16 +178,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -206,7 +216,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_113.plan index f3c5e0044db..bce8e781195 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_113.plan @@ -135,7 +135,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_114.plan index ef5dbe73331..e1e8cd2628a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_114.plan @@ -135,7 +135,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col5,row.col6,row.col4,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_12.plan index 06422b114cc..fa52cc5d331 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_12.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_121.plan index 4a6a5536aed..2e638cc8a30 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_121.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_122.plan index ddd4b771b3f..ccf7538780b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_122.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_123.plan index 5590ba1d6ee..a58c1ab4df1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_123.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_124.plan index aa7663f1f63..7953ad1a094 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_124.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col7,row.col6,row.col4,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_125.plan index b134673cc85..ca9d802f01c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_125.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_126.plan index b5fffb629e0..452cb12e0dd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_126.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_13.plan index ed374bafdc9..02b001cfb84 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_13.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_131.plan index 4bb7ccab947..e81f2fa68dc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_131.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_132.plan index 8273824b6fc..a3d7d1468b4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_132.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col3,row.col1,row.col4,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_133.plan index 96afcd4afc3..a27550f722e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_133.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_134.plan index 7203cdb211b..89c2bb2d60c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_134.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col1,row.col6,row.col2,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_135.plan index 842251e1976..bd3af8a58b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_135.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_136.plan index 17a22404b0f..feafc378032 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_136.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_136.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col1,row.col5,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_137.plan index fb080e0253a..6cba840c7a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_137.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_137.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_138.plan index 4b18ed8da0f..c86d35dcfb8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_138.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_138.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col1,row.col5,row.col6,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_139.plan index d4dc9b43f21..064b0024e74 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_139.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_139.plan @@ -141,7 +141,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -254,7 +254,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -262,16 +262,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -290,7 +300,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_14.plan index ed374bafdc9..02b001cfb84 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_14.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_140.plan index 2df9a427364..f01a04794c7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_140.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_140.plan @@ -141,7 +141,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col6,row.col5,row.col3,row.col7,row.col2,row.col1]" }, { "Inputs": [ @@ -254,7 +254,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -262,16 +262,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -290,7 +300,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_141.plan index e69729cc846..c782295a5bf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_141.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_141.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_142.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_142.plan index 51efbc6ba26..40ab767405b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_142.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_142.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2,row.col6,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_143.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_143.plan index cac4567c9bc..cbabc8c4bf2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_143.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_143.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_144.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_144.plan index 23301245ea9..c8c91da35c2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_144.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_144.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_145.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_145.plan index f0980bcac99..a96be3cf1e6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_145.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_145.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_146.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_146.plan index d65e039c2da..e3a80eb448a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_146.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_146.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_147.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_147.plan index 499d78b4489..f77181d9e5a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_147.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_147.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_148.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_148.plan index 499d78b4489..f77181d9e5a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_148.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_148.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_149.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_149.plan index 6f7db02cde9..0907e8fbc34 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_149.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_149.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_15.plan index 2889cc1b9d5..17cf51870be 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_15.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_150.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_150.plan index 6f7db02cde9..0907e8fbc34 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_150.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_150.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_151.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_151.plan index 2b899810054..99ab46393e0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_151.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_151.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_152.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_152.plan index a1367f3d761..b9db70c01e0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_152.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_152.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col6,row.col1,row.col5,row.col7]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_153.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_153.plan index 8e6e9f8235d..2e39cf0b8dc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_153.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_153.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_16.plan index cb68460df38..abd299c2887 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_16.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col5,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_17.plan index ba018b624a8..a3c7a263246 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_17.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_18.plan index 756185da166..d5822bec23e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_18.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col5,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_19.plan index 8a0170b2674..3e56ab0e96a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_19.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_20.plan index 922f2a8c4b1..ea1d6be9614 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_20.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col5,row.col3,row.col6,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_21.plan index 8a0170b2674..3e56ab0e96a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_21.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_22.plan index dae16ca7b03..8d31acdbaac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_22.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col3,row.col5,row.col6,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_23.plan index 8a0170b2674..3e56ab0e96a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_23.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_24.plan index c43aad7f952..9ae0cbcf195 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_24.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col6,row.col5,row.col2,row.col4,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_25.plan index 8a0170b2674..3e56ab0e96a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_25.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_26.plan index 8a0170b2674..3e56ab0e96a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_26.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_27.plan index 3b7ff4124fe..9f16b3df27f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_27.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_28.plan index 3b7ff4124fe..9f16b3df27f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_28.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_29.plan index b47c4dbabef..d5e61809950 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_29.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_30.plan index 4c605c4aa1c..1dcba26fe16 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_30.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_31.plan index 931e0fbd32d..d44d9c14a29 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_31.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_32.plan index a4d330ecf94..b9841a6b0ca 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_32.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_33.plan index 52dfd043091..51209ae485c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_33.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_34.plan index 52dfd043091..51209ae485c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_34.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_35.plan index 9952cb0fc9f..014af2758cb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_35.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_36.plan index 607d9e78fd2..a4f3ad3d7c0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_36.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_37.plan index fdce9ab358b..a93a6e3fdff 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_37.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -182,7 +182,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -190,16 +190,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -218,7 +228,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_38.plan index 4341e8927e5..c1625e31cc6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_38.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col1]" }, { "Inputs": [ @@ -182,7 +182,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -190,16 +190,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -218,7 +228,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_45.plan index 13d0cccac04..80de64aecd9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_45.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -162,7 +162,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -170,16 +170,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -198,7 +208,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_46.plan index 13d0cccac04..80de64aecd9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_46.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -162,7 +162,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -170,16 +170,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -198,7 +208,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_47.plan index 62500861e80..5200a370b62 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_47.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -162,7 +162,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -170,16 +170,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -198,7 +208,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_48.plan index 18ae2058406..b9e396861cf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_48.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ @@ -162,7 +162,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -170,16 +170,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -198,7 +208,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_49.plan index 37d84e3c26a..265d92b085a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_49.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_50.plan index 37d84e3c26a..265d92b085a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_50.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_51.plan index b7dd833bf96..604e83ad5e9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_51.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_52.plan index 9ec014d33d8..1c40ccf3dd7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_52.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col5,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_53.plan index e222bd4b6a6..5a9f7e808cb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_53.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_54.plan index 99ebb477210..9739968c447 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_54.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col5,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_55.plan index 0edd808d5f3..9f3be99d5b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_55.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_56.plan index 56309f242d9..34f5ebb91b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_56.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col1,row.col4,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_57.plan index 29f2962dce0..c5f1a7d9108 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_57.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_58.plan index 17e6b461cd3..629f1afef58 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_58.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col3,row.col5,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_61.plan index 4f940e3df00..1b13021a7de 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_61.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_62.plan index 981735e9eba..840a5f2f6ef 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_62.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col1,row.col5,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_67.plan index ebc77cb6645..17b29a9ca82 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_67.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_68.plan index c8c75824ac2..aff1ad7f681 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_68.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col5,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_69.plan index 96fdb130970..3a0f96ae397 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_69.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_70.plan index f39800d8cc9..d276e16e0d3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_70.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_71.plan index c088432dd76..4885b4975c6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_71.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_72.plan index 064a1664484..bd7b50e7912 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_72.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col4,row.col5,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_73.plan index 5046c9ff7f4..59089ebe7ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_73.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -185,7 +185,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -193,16 +193,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -221,7 +231,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_74.plan index 8c6fd9736ab..d63de18fb46 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_74.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col6,row.col3,row.col1,row.col4]" }, { "Inputs": [ @@ -185,7 +185,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -193,16 +193,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -221,7 +231,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_75.plan index 2b899810054..99ab46393e0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_75.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_76.plan index afbda74b819..6a3ef6107d9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_76.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col5,row.col2,row.col6,row.col7,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_77.plan index 4242b0f5863..5ad5c5c78ab 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_77.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -177,7 +177,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -185,16 +185,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -213,7 +223,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_78.plan index 4242b0f5863..5ad5c5c78ab 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_78.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -177,7 +177,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -185,16 +185,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -213,7 +223,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_79.plan index 860b6e97387..2cf358b6d60 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_79.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -177,7 +177,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -185,16 +185,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -213,7 +223,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_80.plan index 3f11a644e84..5c87bdc1261 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_80.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col4,row.col3,row.col1]" }, { "Inputs": [ @@ -177,7 +177,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -185,16 +185,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -213,7 +223,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_81.plan index 1a9039bdd8a..aa46886981e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_81.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -177,7 +177,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -185,16 +185,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -213,7 +223,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_82.plan index 864ced15b8c..ba52979d835 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_82.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col5,row.col4,row.col2]" }, { "Inputs": [ @@ -177,7 +177,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -185,16 +185,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -213,7 +223,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_83.plan index 54a04f78226..e4d3ae31256 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_83.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_84.plan index b882ea6f979..462078a1fc7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_84.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col6,row.col1,row.col3,row.col7,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_85.plan index 4f0a24f8da0..e06753ae3f9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_85.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -182,7 +182,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -190,16 +190,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -218,7 +228,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_86.plan index d97a20b806a..854e892ad7d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_86.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1]" }, { "Inputs": [ @@ -182,7 +182,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -190,16 +190,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -218,7 +228,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_87.plan index f64cbdcb6f3..b9627bfd5a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_87.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_88.plan index 28a2c49ae32..e0bd4d698ea 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_88.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2,row.col6,row.col5,row.col7,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_9.plan index 82fe1fede7b..97951e56438 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_9.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_91.plan index 71095fb6948..b964923356e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_91.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_92.plan index 5d5c5c306b1..35a8f4d5b46 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_92.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_93.plan index 8509d2309a4..f4752673704 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_93.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_94.plan index 3fddf1105f8..0383e9a2ea7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_94.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_95.plan index a3d8d0b13c6..b61cc8a0427 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_95.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_96.plan index a3d8d0b13c6..b61cc8a0427 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_96.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_97.plan index 8093c4232ad..32cf4a72c39 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_97.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_98.plan index 8093c4232ad..32cf4a72c39 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_98.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_99.plan index b24cbae414d..2b3ad238a38 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-12.test_/query_99.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_1.plan index 6d4569a9b0a..7d4c02f93b9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_1.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_10.plan index b605a3310a3..7341afaa742 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_10.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -219,7 +219,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -227,16 +227,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -255,7 +265,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_100.plan index e039b51b60b..68eff7682bb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_100.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_101.plan index 62b7cbcd103..40e23230fa2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_101.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_102.plan index 55601886461..939d3b6b6fb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_102.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_103.plan index 55601886461..939d3b6b6fb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_103.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_104.plan index a5ae0b32539..462a3968b28 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_104.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_105.plan index 6f45edd4d7f..6f2c4760e23 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_105.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col4,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_106.plan index e21e0544f17..79904c14559 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_106.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_11.plan index d140dc1e1ce..d487524cceb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_11.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col3,row.col2,row.col5]" }, { "Inputs": [ @@ -219,7 +219,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -227,16 +227,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -255,7 +265,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_12.plan index 00651aeb41e..57c02fa49b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_12.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -219,7 +219,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -227,16 +227,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -255,7 +265,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_13.plan index 810cf480b1b..aa854067412 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_13.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col5,row.col2,row.col1]" }, { "Inputs": [ @@ -219,7 +219,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -227,16 +227,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -255,7 +265,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_14.plan index feeb47f9cf3..acc23040fd0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_14.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -219,7 +219,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -227,16 +227,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -255,7 +265,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_15.plan index 5d98c4cd1e0..24ca83b6d22 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_15.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col1,row.col5,row.col2]" }, { "Inputs": [ @@ -219,7 +219,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -227,16 +227,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -255,7 +265,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_16.plan index 738a9b612f0..682ff4afa05 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_16.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -219,7 +219,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -227,16 +227,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -255,7 +265,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_17.plan index fcb79cca3e3..ff285d83c45 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_17.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col5,row.col1,row.col2]" }, { "Inputs": [ @@ -219,7 +219,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -227,16 +227,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -255,7 +265,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_18.plan index b2eb8da5d99..96dda6dbb04 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_18.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_19.plan index b2eb8da5d99..96dda6dbb04 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_19.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_2.plan index 5d3db45fc78..27556368e74 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_2.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_20.plan index 99020985563..d31535c3d59 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_20.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_21.plan index e67009e41e5..24fc9f19ba5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_21.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col4,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_24.plan index 284f983ca74..0da0fcb4d3e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_24.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -159,7 +159,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -167,16 +167,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -195,7 +205,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_25.plan index c2005229d72..03ceea6dce8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_25.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ @@ -159,7 +159,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -167,16 +167,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -195,7 +205,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_26.plan index f8450a2c8fd..22b16113027 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_26.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -159,7 +159,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -167,16 +167,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -195,7 +205,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_27.plan index f8450a2c8fd..22b16113027 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_27.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -159,7 +159,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -167,16 +167,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -195,7 +205,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_28.plan index 3d0e0bac00d..1b940571f55 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_28.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_29.plan index 3d0e0bac00d..1b940571f55 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_29.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_3.plan index 96bd5d16cf3..4fff08e862a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_3.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_34.plan index 7b80d08023c..d17b3afbc65 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_34.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -185,7 +185,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -193,16 +193,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -221,7 +231,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_35.plan index 275198748d8..343c03e04f8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_35.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col6,row.col3,row.col7,row.col4,row.col5,row.col2]" }, { "Inputs": [ @@ -185,7 +185,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -193,16 +193,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -221,7 +231,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_36.plan index e9f6707def3..ebdeaa21d45 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_36.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -185,7 +185,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -193,16 +193,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -221,7 +231,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_37.plan index d085f4191a0..330757cf438 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_37.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col6,row.col3,row.col1,row.col7,row.col4,row.col5]" }, { "Inputs": [ @@ -185,7 +185,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -193,16 +193,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -221,7 +231,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_38.plan index 9d377c9a097..c0fc3f629ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_38.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -185,7 +185,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -193,16 +193,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -221,7 +231,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_39.plan index 7164382d0d0..235430d223d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_39.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col6,row.col4,row.col1,row.col5,row.col2,row.col3]" }, { "Inputs": [ @@ -185,7 +185,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -193,16 +193,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -221,7 +231,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_4.plan index ddca832b9d8..ec22fba566d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_4.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_40.plan index 5d29183781c..7c76530504d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_40.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_41.plan index 8291cfc3f74..754586cd242 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_41.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_46.plan index 5b2e431e6cd..b2485d5477f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_46.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_47.plan index 244bac1e82d..5df55d8153d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_47.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col7,row.col5,row.col6,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_48.plan index 4624082adf0..b27206187cd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_48.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_49.plan index 8b55e1f2309..1fd7ebdf8f3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_49.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col6,row.col7,row.col4,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_5.plan index e319d90b2d4..8691d31cff4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_5.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_50.plan index 41a8cb5b069..b40025db8c0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_50.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_51.plan index 4e2384d8d11..de59863ab3e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_51.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col1,row.col6,row.col7,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_52.plan index 54a8212ca10..507f456d9b6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_52.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_53.plan index 2e900038e0e..79da26bb2db 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_53.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_54.plan index 1d807c01207..5ce5ed26403 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_54.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_55.plan index bb088a5fc8a..b9151d639a2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_55.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_56.plan index f4311c94532..1fba57cd945 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_56.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_57.plan index 8a01d0c7df6..e3d26bad7f8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_57.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_58.plan index c6c4b32c973..60d37fda27b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_58.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_59.plan index c6c4b32c973..60d37fda27b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_59.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_6.plan index 05d272305cd..e4287ac1bfc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_6.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_60.plan index b553284763e..09931286c6d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_60.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_61.plan index b553284763e..09931286c6d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_61.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_62.plan index 333b6e2da02..b324f77aae2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_62.plan @@ -142,7 +142,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -150,16 +150,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -178,7 +188,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_63.plan index 333b6e2da02..b324f77aae2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_63.plan @@ -142,7 +142,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -150,16 +150,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -178,7 +188,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_64.plan index 02f26854bc7..cc69502a452 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_64.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_65.plan index 023b67d9ee0..0816588bdb0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_65.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_66.plan index 9b30eb0e370..72115b4616f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_66.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_67.plan index 0426649ac70..e6258f4899d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_67.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col5,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_68.plan index b623658d197..9b09d68d20a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_68.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_69.plan index 3d5e556f1ab..22d644e58c4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_69.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col5,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_7.plan index 71240ee4156..e26fc4858ec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_7.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col5,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_70.plan index 647c8a90783..cc674f3a8db 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_70.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_71.plan index 2367c980442..29c1082d00d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_71.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col1,row.col4,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_72.plan index 859f3fd7768..69bfa0bb7cc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_72.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_73.plan index e38560f64b4..b8e9d75a089 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_73.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_74.plan index 98b193af5b7..bf773796eb9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_74.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_75.plan index 840b9287288..2b74874cd75 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_75.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_76.plan index 677f581ba5a..beb026f8b3f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_76.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_77.plan index 3a20da8f96e..ff2bb62a84c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_77.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_78.plan index 4fd9f0be789..75b9c6564e1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_78.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_79.plan index 8d77a0091ef..370a1bd3460 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_79.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_8.plan index c2942effcb5..861664dd81f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_8.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -234,7 +234,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -242,16 +242,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -270,7 +280,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_80.plan index 0662c0dfb5c..96e6c280065 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_80.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_81.plan index 9649a270d70..7fcce53ffbd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_81.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_82.plan index d9dcfa220bd..8da80031bf2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_82.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_83.plan index ba72966a0c6..b29513d1361 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_83.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_88.plan index f4311c94532..1fba57cd945 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_88.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_89.plan index f4311c94532..1fba57cd945 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_89.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_9.plan index d6497bc1ae8..0811e2f39ec 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_9.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col5,row.col6,row.col2,row.col7,row.col1]" }, { "Inputs": [ @@ -234,7 +234,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -242,16 +242,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -270,7 +280,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_90.plan index 4102b38bd99..0c73afa5bee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_90.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_91.plan index 3baf7f86fc4..fa625cd2801 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_91.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_94.plan index 8dbff698462..ba4ca04c7b1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_94.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_95.plan index c6bd498043d..240514f818a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_95.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col7,row.col5,row.col6,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_96.plan index d2a1216662a..33f01e2b4da 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_96.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_97.plan index d2a1216662a..33f01e2b4da 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_97.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_98.plan index b33eb44cebd..e2d16205d78 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_98.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_99.plan index edd374518f9..6a94ae6e8f4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-13.test_/query_99.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_1.plan index 4d1b27d122d..e7281043bed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_1.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_10.plan index ce933336104..cf94ae8d8db 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_10.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_100.plan index 06048751169..4f74a538f86 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_100.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_101.plan index cae82fdf66a..5c9296d80f8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_101.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col1,row.col6,row.col4,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_102.plan index 9867e2429bc..744f9e7df33 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_102.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_103.plan index 49d9cca956d..91f072a9a4e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_103.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_104.plan index 5e54034f491..901c977ed17 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_104.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_105.plan index c3fa576ca78..0c0ab571b93 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_105.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_11.plan index 81e9f756f9f..cfcfb3a15b3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_11.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_12.plan index 1ecb8a4c713..9760e650423 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_12.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_13.plan index 1ecb8a4c713..9760e650423 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_13.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_14.plan index c05c62be4f2..bfc9ec97c59 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_14.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_15.plan index 171cb7f6b16..f72cfdc9659 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_15.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_16.plan index d60fd604af0..e85f5f2669c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_16.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_17.plan index 839c8b01ee4..808e7cfc213 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_17.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_18.plan index 4b71923bc1a..3c0f3bf185d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_18.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_19.plan index 6058c4b00f0..7144edce2f4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_19.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_2.plan index aaaaf59ba36..afa55a83e60 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_2.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_20.plan index e4c2e7b4a51..a0db7876f87 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_20.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_21.plan index 3d3ff6bf9f2..7612a8ec082 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_21.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_22.plan index 02ff2d8b71a..377141f45a1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_22.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -187,7 +187,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -195,16 +195,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -223,7 +233,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_23.plan index 646f2ca58a8..2f6eb5f124e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_23.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col1,row.col3,row.col4]" }, { "Inputs": [ @@ -187,7 +187,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -195,16 +195,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -223,7 +233,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_24.plan index 5163250b982..7de3fae8410 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_24.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_25.plan index 5163250b982..7de3fae8410 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_25.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_26.plan index 7b38121c855..bccaa80cef9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_26.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_27.plan index 129c67b91e3..ec9c7cd1e69 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_27.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_28.plan index 7c3fb00ea94..1460338108a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_28.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -203,7 +203,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -211,16 +211,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -239,7 +249,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_29.plan index 0015f76bf43..dd5ced81e33 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_29.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col5,row.col3,row.col7,row.col1,row.col6]" }, { "Inputs": [ @@ -203,7 +203,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -211,16 +211,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -239,7 +249,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_3.plan index aaaaf59ba36..afa55a83e60 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_3.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_30.plan index 05a063ca9ac..e8a2e724f56 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_30.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -203,7 +203,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -211,16 +211,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -239,7 +249,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_31.plan index 4b23349706b..fdbf5f0fef2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_31.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col7,row.col6,row.col4,row.col5,row.col3]" }, { "Inputs": [ @@ -203,7 +203,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -211,16 +211,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -239,7 +249,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_32.plan index 4acb26a2e1c..10fc560cf34 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_32.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_33.plan index 4acb26a2e1c..10fc560cf34 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_33.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_34.plan index 0eb50345af4..7208d50cc7a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_34.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_35.plan index 233e805fa69..c8d56348c40 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_35.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_36.plan index 8e65b058c93..056eabff389 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_36.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_37.plan index 8e65b058c93..056eabff389 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_37.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_38.plan index 206e2032844..40ac4e01f1b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_38.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_39.plan index b8d0875144d..11a3049b6fb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_39.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_4.plan index 0274840d33f..0489fbc8dbb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_4.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_42.plan index e608b6c3715..265a645f5f2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_42.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_43.plan index 94e17789a47..9d53aa7559c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_43.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col6,row.col4,row.col5,row.col2,row.col7,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_5.plan index 0274840d33f..0489fbc8dbb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_5.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_50.plan index 8c52f4b93ad..51a3d9d48a3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_50.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_51.plan index c7d2a2f12a5..774d5fc6c0c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_51.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_52.plan index 554245a6d5a..bc6860140d3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_52.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_53.plan index 83d6776300e..ed6130a6113 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_53.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col5,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_54.plan index ccd60c0ab71..2dd7620734d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_54.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_55.plan index fe5eb2b4f6d..3a55c44428a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_55.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col5,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_56.plan index d33dae1fe83..86d8f467b09 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_56.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_57.plan index 1989a116982..675d1b61852 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_57.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col5,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_58.plan index 7627a1c4a36..d2794da7b95 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_58.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_59.plan index b721c61b138..7e5decd1d7a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_59.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_60.plan index dd33f5a64f5..aa9c03b41ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_60.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -198,7 +198,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -206,16 +206,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -234,7 +244,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_61.plan index f513230a391..2d080b76327 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_61.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col2,row.col5,row.col6,row.col3]" }, { "Inputs": [ @@ -198,7 +198,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -206,16 +206,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -234,7 +244,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_62.plan index 0e213bb0233..734f67c4d8b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_62.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_63.plan index 0e213bb0233..734f67c4d8b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_63.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_64.plan index 88e6662f791..92edffc4113 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_64.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_65.plan index 88e6662f791..92edffc4113 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_65.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_68.plan index 3e5fdb0ea54..1f0be9fd2ed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_68.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_69.plan index fd0162927ad..5990af56a2d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_69.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_70.plan index a91d0dd0d2e..4708622cceb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_70.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_71.plan index 87005a0f3bc..38cfe765f1f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_71.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_72.plan index 38b2efe5091..f55ff802e17 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_72.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_73.plan index 8a86bbb1f61..3c5b8efc09b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_73.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col5,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_74.plan index 8f7a8013aa7..c6b51d03239 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_74.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_75.plan index edb0cb4917d..16c489d5d92 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_75.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_76.plan index 4060dd66594..00bbb152335 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_76.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -216,7 +216,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -224,16 +224,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -252,7 +262,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_77.plan index c3f5529b59a..4985ae626fd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_77.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col3,row.col5,row.col2]" }, { "Inputs": [ @@ -216,7 +216,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -224,16 +224,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -252,7 +262,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_78.plan index e550f8b30f5..a871e0a86b4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_78.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -216,7 +216,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -224,16 +224,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -252,7 +262,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_79.plan index e88673e38c5..cf72211c104 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_79.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -216,7 +216,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -224,16 +224,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -252,7 +262,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_80.plan index 2323785fc46..7c42bf0297b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_80.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -216,7 +216,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -224,16 +224,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -252,7 +262,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_81.plan index dd9687b3339..bd61c6427b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_81.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col5,row.col1]" }, { "Inputs": [ @@ -216,7 +216,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -224,16 +224,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -252,7 +262,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_82.plan index 24e8c082036..856b4d5fe76 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_82.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_83.plan index 24e8c082036..856b4d5fe76 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_83.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_84.plan index 8bb58d5c1a8..60c2c10e7ff 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_84.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_85.plan index 8bb58d5c1a8..60c2c10e7ff 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_85.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_86.plan index 4aec3784326..ac8642f93da 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_86.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_87.plan index 9176c3baac1..f1108fe1860 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_87.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_88.plan index cac06c8b605..6b88349e18e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_88.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -216,7 +216,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -224,16 +224,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -252,7 +262,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_89.plan index d70d78fd433..7ec42478d6a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_89.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col2,row.col3]" }, { "Inputs": [ @@ -216,7 +216,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -224,16 +224,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -252,7 +262,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_90.plan index efc4990ea48..8ff24cf4d55 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_90.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_91.plan index 909e8ac4554..4f31aa92eca 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-14.test_/query_91.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col5,row.col4,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_1.plan index c59f648c379..db6ad2a76e4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_1.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_10.plan index acb36cef678..f91dbc9df85 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_10.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col5,row.col1,row.col2,row.col6,row.col7]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_11.plan index 2a493a73daf..459c4698c1d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_11.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -168,7 +168,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -176,16 +176,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -204,7 +214,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_12.plan index 0a586e7801e..353f68a3043 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_12.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col2,row.col1]" }, { "Inputs": [ @@ -168,7 +168,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -176,16 +176,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -204,7 +214,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_13.plan index 83854d82b3c..2658c6e1a38 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_13.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_14.plan index 8561fdd15c7..a376e5c549a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_14.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_15.plan index a4dae52c5d1..12df222f4b3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_15.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_16.plan index a4dae52c5d1..12df222f4b3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_16.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_17.plan index 51eb7b64368..05e41862cd4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_17.plan @@ -154,7 +154,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -162,16 +162,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -190,7 +200,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_18.plan index 51eb7b64368..05e41862cd4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_18.plan @@ -154,7 +154,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -162,16 +162,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -190,7 +200,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_19.plan index fa12deb3437..11a4d1b07ba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_19.plan @@ -154,7 +154,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -162,16 +162,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -190,7 +200,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_2.plan index 0fba66e2339..12ea27f0f66 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_2.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_20.plan index fa12deb3437..11a4d1b07ba 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_20.plan @@ -154,7 +154,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -162,16 +162,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -190,7 +200,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_21.plan index a4b856477d1..abf11b7883c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_21.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_22.plan index edfc6162d2e..ccb84d9294d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_22.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_23.plan index 60b8d1c66c5..aeeb5442371 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_23.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_24.plan index 16397e99c30..826cadd7fa6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_24.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_25.plan index 10d18d38537..9cba8257720 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_25.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_26.plan index 350e577ea32..c2fb46bd964 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_26.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_27.plan index b640add212f..a7e9653068c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_27.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_28.plan index ccd5bb6284e..e399eb84441 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_28.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_29.plan index 4e81f818be7..1904fe4cc39 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_29.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_3.plan index a9fffa8919c..67ee6f31635 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_3.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -149,7 +149,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -157,16 +157,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -185,7 +195,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_30.plan index 151adc2b3b8..c6b6ecfbd8a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_30.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_31.plan index 90f1d95b2e7..049c8524c4e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_31.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_32.plan index 90f1d95b2e7..049c8524c4e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_32.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_4.plan index b6d420864c3..f8242c4debf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_4.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ @@ -149,7 +149,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -157,16 +157,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -185,7 +195,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_5.plan index 0e575f43f7a..26ef7b76171 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_5.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_6.plan index fb689dda60b..4071533ee55 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_6.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col5,row.col6,row.col3,row.col4,row.col7]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_7.plan index 34f8c00d638..eda5ea04c61 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_7.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_8.plan index f380405e2a9..da599170c22 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_8.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col1,row.col4,row.col5,row.col3,row.col6,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_9.plan index 065b85e7714..fef55a9aec2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-15.test_/query_9.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_1.plan index e420fdffe97..037d2696e60 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_1.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_100.plan index 061d131903a..340b414ca7d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_100.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -197,7 +197,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -205,16 +205,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -233,7 +243,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_101.plan index e02c9847d4c..e202b756fa7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_101.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col5,row.col7,row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -197,7 +197,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -205,16 +205,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -233,7 +243,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_102.plan index 5c31eb12a87..78496ced204 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_102.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_103.plan index 5226be87f5f..bbddf49207a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_103.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_104.plan index 790fe21ee74..6feebf11c8f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_104.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_105.plan index 790fe21ee74..6feebf11c8f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_105.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_106.plan index d09ffd3f209..c9750cb6649 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_106.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_107.plan index e951855828e..2675895bd22 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_107.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_108.plan index 2649960ca71..fc3eb0c1952 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_108.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_109.plan index 2649960ca71..fc3eb0c1952 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_109.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_110.plan index 08d688df1d5..8b1e31956ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_110.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_111.plan index 08d688df1d5..8b1e31956ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_111.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_112.plan index d7c489aee24..a8481868dad 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_112.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_113.plan index d7c489aee24..a8481868dad 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_113.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_118.plan index c2113311f8a..053fe508cfd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_118.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_119.plan index e7b4510f5ee..69976319ea2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_119.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_12.plan index 5fa2902f5f4..b0b342830dc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_12.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -159,7 +159,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -167,16 +167,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -195,7 +205,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_120.plan index 6d0ef2a024c..a2b2c1517b1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_120.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_121.plan index 07ce3922c90..58cbb3ed715 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_121.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_122.plan index 63146cf9f07..601ccb7c5ef 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_122.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_123.plan index 24f6a6821ab..f999a14c325 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_123.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_124.plan index da40567d5e1..ea84e7b2963 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_124.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_125.plan index da40567d5e1..ea84e7b2963 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_125.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_126.plan index 281b6114277..d555e3e1ff9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_126.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_127.plan index 301b731d4f0..d5113d83148 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_127.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_128.plan index db175eed862..6e8b1da4c9f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_128.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_129.plan index 4658dbf9a42..a7a5f578c14 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_129.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_13.plan index d5053565f45..7e43616b3c6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_13.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ @@ -159,7 +159,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -167,16 +167,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -195,7 +205,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_130.plan index a64c4573a09..52b41a448e1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_130.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_131.plan index 9858002a32b..66a54fb0ca7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_131.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_132.plan index f82fcf4f23a..85d33555d42 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_132.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_133.plan index 63bd10f3063..cc1281ce522 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_133.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_134.plan index 8b56f2228f7..545461f24bf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_134.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_135.plan index a4dfcbec7fa..5a63cf6e8d7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_135.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_136.plan index abc07da8328..be0cd1b3fa8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_136.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_136.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_137.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_137.plan index ef80dc89fea..9c312333d28 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_137.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_137.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_138.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_138.plan index 27cca794650..ee6c7358b40 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_138.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_138.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_139.plan index cf7acde2ff7..082ff88a33d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_139.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_139.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_14.plan index e623e534d71..32031c0d573 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_14.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -179,7 +179,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -187,16 +187,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -215,7 +225,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_140.plan index aa6bc2cd337..c49660906e6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_140.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_140.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -209,7 +209,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -217,16 +217,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -245,7 +255,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_141.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_141.plan index b115a7883d5..47c7bd35776 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_141.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_141.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col5,row.col1,row.col2,row.col7,row.col6]" }, { "Inputs": [ @@ -209,7 +209,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -217,16 +217,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -245,7 +255,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_142.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_142.plan index d653e044f47..ea444f617b9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_142.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_142.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_143.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_143.plan index d653e044f47..ea444f617b9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_143.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_143.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_144.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_144.plan index 0d0e00b5b55..1fb7fec4b70 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_144.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_144.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_145.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_145.plan index 2628472cccb..6751d7ce733 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_145.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_145.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col6,row.col7,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_15.plan index 7a1e80695d3..77300385b6d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_15.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col4,row.col5]" }, { "Inputs": [ @@ -179,7 +179,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -187,16 +187,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -215,7 +225,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_16.plan index cbbce6c4114..5a8ca5d21d4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_16.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -179,7 +179,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -187,16 +187,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -215,7 +225,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_17.plan index 9814a7286ba..0d89e5670de 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_17.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col5,row.col3,row.col1]" }, { "Inputs": [ @@ -179,7 +179,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -187,16 +187,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -215,7 +225,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_18.plan index 3a39432563f..58297673d0d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_18.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_19.plan index a096dc99f37..27f36b9f775 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_19.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_2.plan index 04c000e57b3..500747a2df1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_2.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_20.plan index 32913b6f6bd..cfba951bf8b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_20.plan @@ -138,7 +138,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_21.plan index 7f616582ff4..23d635263ab 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_21.plan @@ -138,7 +138,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col5,row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_22.plan index 9aea55f5df6..12c81e74316 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_22.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -183,7 +183,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -191,16 +191,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -219,7 +229,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_23.plan index 67c9a4f1dae..f87c9195f7a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_23.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col4,row.col2,row.col1]" }, { "Inputs": [ @@ -183,7 +183,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -191,16 +191,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -219,7 +229,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_24.plan index eb2ee7ed69f..ee82c1cbd78 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_24.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -172,7 +172,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -180,16 +180,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -208,7 +218,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_25.plan index edb826a155a..f22036e5621 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_25.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col4,row.col3,row.col1]" }, { "Inputs": [ @@ -172,7 +172,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -180,16 +180,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -208,7 +218,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_26.plan index cb405c0719a..4b2c0dc04eb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_26.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_27.plan index 65da7133c48..6d029b65c8f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_27.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col5,row.col6,row.col7,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_28.plan index f518536d096..8c821def858 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_28.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_29.plan index 9f6aca3c215..802dfbe0a68 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_29.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col6,row.col7,row.col5,row.col3,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_3.plan index d676c76ef7e..8b749172d44 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_3.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_30.plan index ac604696116..d3d79acb39b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_30.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_31.plan index 44888e3d4a0..31fab68e492 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_31.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_32.plan index 157658289d4..b99606ed50c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_32.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_33.plan index 157658289d4..b99606ed50c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_33.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_34.plan index e50190ff247..81f11b51548 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_34.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_35.plan index 964a736d4ce..a4a41f0d725 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_35.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_36.plan index 87073b7cb4c..09609640248 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_36.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_37.plan index 81240416ef0..a8fcadd17fb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_37.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_38.plan index a9f6bbe0f35..4c60e68319b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_38.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_39.plan index b3f86372313..a7801f634a2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_39.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_4.plan index 30d110f6068..ab7eaf4ab77 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_4.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_40.plan index fe426a19501..13e776c1063 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_40.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -216,7 +216,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -224,16 +224,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -252,7 +262,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_41.plan index 35fd3b718c3..1a5395ceb7e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_41.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col5,row.col2,row.col6,row.col4,row.col7]" }, { "Inputs": [ @@ -216,7 +216,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -224,16 +224,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -252,7 +262,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_42.plan index a712a0b2efb..08b824f2a2c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_42.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_43.plan index 223f852dbbd..4a3ddbe588d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_43.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col6,row.col1,row.col4,row.col3,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_44.plan index 63fbc465f3e..bb6eb570313 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_44.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -182,7 +182,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -190,16 +190,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -218,7 +228,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_45.plan index b1f2a225428..5b5447c9fc9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_45.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col2,row.col3,row.col6,row.col5]" }, { "Inputs": [ @@ -182,7 +182,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -190,16 +190,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -218,7 +228,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_46.plan index 9b73ccdab21..a87e2fa8fb3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_46.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_47.plan index 9620872640a..78078e4fef7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_47.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col5,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_48.plan index 0dea854b576..37bbd61122f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_48.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_49.plan index 9e09b034168..a386fe67f9b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_49.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_5.plan index b67a400832a..adfb49f1cb8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_5.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_50.plan index ab964169728..f1397a18e6c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_50.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_51.plan index 5de7f3911aa..f0efae2bc4a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_51.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col3,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_52.plan index a9e3f96cad7..2c721ae43a4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_52.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_53.plan index 72d63a4072e..0a281e26259 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_53.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col3,row.col6,row.col4,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_54.plan index 92e4b359f2e..34a3729a85e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_54.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -174,7 +174,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -182,16 +182,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -210,7 +220,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_55.plan index 50afa177608..8a8887978a6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_55.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col1,row.col2,row.col4]" }, { "Inputs": [ @@ -174,7 +174,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -182,16 +182,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -210,7 +220,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_56.plan index 2e46943a88d..1a43d8a982f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_56.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_57.plan index 397ceb51a0c..0f290ea672f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_57.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col1,row.col4,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_58.plan index 6b4ec7bece8..34144722d86 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_58.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_59.plan index 85645710282..b846abd0ecc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_59.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col3,row.col5,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_6.plan index cfba374e857..14156a97bbd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_6.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_60.plan index 168dfcfab43..a111f197c7a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_60.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_61.plan index d155da6fb07..a44a49cddcd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_61.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_62.plan index d8f8ffeb7aa..88eaf6baf4d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_62.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_63.plan index f8861d59f74..2ddca7653f0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_63.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col5,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_64.plan index 7501b223469..ae0da6c51d0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_64.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -172,7 +172,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -180,16 +180,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -208,7 +218,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_65.plan index 3ff05915585..a6ce4ec0e5e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_65.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ @@ -172,7 +172,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -180,16 +180,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -208,7 +218,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_66.plan index 82ec92116e7..3fe5b6fd665 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_66.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -172,7 +172,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -180,16 +180,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -208,7 +218,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_67.plan index 282a0549773..c9933db2f86 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_67.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ @@ -172,7 +172,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -180,16 +180,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -208,7 +218,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_68.plan index a31094ef077..55e32575e1f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_68.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_69.plan index 29458a2b526..c722f6af990 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_69.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col5,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_7.plan index cfba374e857..14156a97bbd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_7.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_70.plan index b69e4496151..4562120c12b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_70.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_71.plan index bbd45d7a928..802917a3f59 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_71.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col5,row.col3,row.col6,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_72.plan index 5be407bd08f..23231f04c46 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_72.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -245,7 +245,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -253,16 +253,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -281,7 +291,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_73.plan index 65b687c94dc..686e32df7e2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_73.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col6,row.col3,row.col5,row.col7,row.col1]" }, { "Inputs": [ @@ -245,7 +245,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -253,16 +253,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -281,7 +291,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_74.plan index 575893b330c..387027447f6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_74.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_75.plan index 575893b330c..387027447f6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_75.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_76.plan index 68060fd62fd..f7e0ad49725 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_76.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_77.plan index 583940977c1..c286145eb9f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_77.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col4,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_78.plan index 0e2779d6c2f..13f52e95b75 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_78.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_79.plan index 5afa5cc7e3c..22ab9721e56 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_79.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_80.plan index 2df897a0134..acbfacdcf17 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_80.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_81.plan index ec579766fa7..97667bc32d1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_81.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_82.plan index 073728f2908..db3321a391b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_82.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_83.plan index 26d20be62b5..8086a80f2a1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_83.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_84.plan index 65ab756d873..a3d39db1ee3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_84.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_85.plan index 354f4e10776..502d06975fe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_85.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_86.plan index ab374d218c3..6e571293b8a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_86.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_87.plan index ab374d218c3..6e571293b8a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_87.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_88.plan index bd091267dde..7fa932bfa3c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_88.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_89.plan index bd091267dde..7fa932bfa3c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_89.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_90.plan index 78d2f1c64c2..3577bb3d64f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_90.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_91.plan index 78d2f1c64c2..3577bb3d64f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_91.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_92.plan index a5fd99f545c..ce3bbb2ecdd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_92.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_93.plan index f0dc4c10972..d0e8ea259fc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_93.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_94.plan index 8b6f6c68ea3..c84fa1b4306 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_94.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -156,7 +156,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -164,16 +164,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -192,7 +202,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_95.plan index fc26294142c..8934461ff06 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_95.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ @@ -156,7 +156,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -164,16 +164,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -192,7 +202,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_96.plan index 33f1e9f01be..b16108390d6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_96.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_97.plan index 33f1e9f01be..b16108390d6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_97.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_98.plan index a5428177af5..40220c9d9b9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_98.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -197,7 +197,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -205,16 +205,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -233,7 +243,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_99.plan index 8df94bfe8bf..e9ef3342a7a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-2.test_/query_99.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col7,row.col5,row.col6,row.col3,row.col4,row.col2]" }, { "Inputs": [ @@ -197,7 +197,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -205,16 +205,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -233,7 +243,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_1.plan index 820e21b9eb2..fbde5f983ca 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_1.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -229,7 +229,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -237,16 +237,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -265,7 +275,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_10.plan index 22a26422165..4fce025e0f0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_10.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col7,row.col3,row.col6,row.col4,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_100.plan index 8e20532dc32..6224cf2fd4b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_100.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col6,row.col2,row.col7,row.col5,row.col3,row.col1]" }, { "Inputs": [ @@ -200,7 +200,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -208,16 +208,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -236,7 +246,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_101.plan index 4533a5e3274..ac8c70efbb3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_101.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -200,7 +200,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -208,16 +208,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -236,7 +246,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_102.plan index a9e5a749eec..bb8b6ebd896 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_102.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col1,row.col5,row.col7,row.col4,row.col2,row.col3]" }, { "Inputs": [ @@ -200,7 +200,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -208,16 +208,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -236,7 +246,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_103.plan index a1de0f12765..7ef17e1a323 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_103.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_104.plan index eb47bec8264..e41744e10ad 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_104.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_105.plan index a803614586d..0247f2564a1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_105.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_106.plan index 9d04dda3578..06156344d56 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_106.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_107.plan index ee50520a1bc..58a21d076bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_107.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -173,7 +173,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -181,16 +181,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -209,7 +219,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_108.plan index bc7e88d2e6a..0d79b39fa38 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_108.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col4,row.col1,row.col3]" }, { "Inputs": [ @@ -173,7 +173,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -181,16 +181,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -209,7 +219,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_109.plan index c3ae877e8ce..c47afe7e182 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_109.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_11.plan index 3c209268ea1..828681091f3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_11.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_110.plan index ee38f61aedc..273495903be 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_110.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_111.plan index 868d87fe25d..0500649dd53 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_111.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_112.plan index 513f248e959..e3ecfcc2275 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_112.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_113.plan index bdc9a972598..d22ee901c0a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_113.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_114.plan index efd336815f8..3988b07d557 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_114.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_115.plan index 2b03aa46dee..efa106f8ddf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_115.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_116.plan index 06a4ffa891f..323e19551df 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_116.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col6,row.col4,row.col7,row.col1,row.col5,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_119.plan index 8c87de31f9c..20936498505 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_119.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -181,7 +181,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -189,16 +189,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -217,7 +227,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_12.plan index 81cb6688137..e58fcfa2a49 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_12.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_120.plan index a8f72befe00..a0168dca834 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_120.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ @@ -181,7 +181,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -189,16 +189,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -217,7 +227,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_121.plan index c24443007ed..2ac6da7a27c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_121.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_122.plan index 5f1086ec609..179a29b28e7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_122.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col7,row.col6,row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_125.plan index 0d9bf97bb33..bc46529106b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_125.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_126.plan index ff2ef85ce0f..701ad4ffbbf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_126.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_127.plan index 6ea617840d0..b5b3f3ee1a5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_127.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_13.plan index d92249e615f..58ac913e461 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_13.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_14.plan index 18682a9354b..e1412057705 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_14.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_15.plan index e701f901641..c573c5b1e01 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_15.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_16.plan index d9710b1122a..e62ff1ba9f1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_16.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col4,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_19.plan index c0b6e704830..d462f171100 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_19.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_2.plan index f423ee2ac1c..2fd1a2b4303 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_2.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col6,row.col1,row.col2,row.col5,row.col3]" }, { "Inputs": [ @@ -229,7 +229,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -237,16 +237,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -265,7 +275,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_20.plan index 01027936d62..9e5a327ef6f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_20.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_21.plan index e34e13d4d48..5cbe4821539 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_21.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_22.plan index c4e02f10d39..86fd14d5205 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_22.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col5,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_27.plan index d9f40291275..a7c64ecd51a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_27.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_28.plan index 64967107215..a9af450ce88 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_28.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col3,row.col4,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_29.plan index 4546ddfe7a3..280ad762fca 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_29.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -200,7 +200,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -208,16 +208,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -236,7 +246,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_3.plan index 2ee1f1e5402..9ce9dd72a8d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_3.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -229,7 +229,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -237,16 +237,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -265,7 +275,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_30.plan index 370469b91ee..e50a7703520 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_30.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col6,row.col4,row.col5,row.col3]" }, { "Inputs": [ @@ -200,7 +200,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -208,16 +208,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -236,7 +246,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_31.plan index 0f286627d8c..417e1030faf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_31.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_32.plan index 93974bcc882..b78dd3f3cc5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_32.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_33.plan index e7b55db7f3c..78a3894a085 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_33.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_34.plan index 2a1307ad484..cacedb6304d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_34.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col5,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_35.plan index 7b2bdc88e9d..e1a1b0aa641 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_35.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_36.plan index 7b2bdc88e9d..e1a1b0aa641 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_36.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_37.plan index 66116d3168c..86bbfccd884 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_37.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_38.plan index 79e46fb7b6f..90a1cf04929 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_38.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col2,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_39.plan index de3cdfe8ffd..f2af5bd57fc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_39.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_4.plan index 2b696208fb8..8dd173b2fe4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_4.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col5,row.col2,row.col3,row.col4,row.col1]" }, { "Inputs": [ @@ -229,7 +229,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -237,16 +237,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -265,7 +275,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_40.plan index 7b37f553776..9f22b002783 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_40.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col5,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_43.plan index 10becc6e783..6796e1f17a8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_43.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -194,7 +194,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -202,16 +202,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -230,7 +240,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_44.plan index 360e54eb899..6cca32aee54 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_44.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col1,row.col6,row.col4,row.col2,row.col3]" }, { "Inputs": [ @@ -194,7 +194,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -202,16 +202,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -230,7 +240,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_45.plan index 054906ce907..118355d6676 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_45.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -221,7 +221,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -229,16 +229,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -257,7 +267,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_46.plan index ee76e36dc0b..acf0d9d1b4d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_46.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col6,row.col2,row.col1,row.col4,row.col5]" }, { "Inputs": [ @@ -221,7 +221,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -229,16 +229,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -257,7 +267,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_47.plan index 800139b1159..f5dc70c0df7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_47.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_48.plan index 77a2bec4504..23725fc9112 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_48.plan @@ -105,7 +105,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col2,row.col3,row.col4,row.col7,row.col1,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_49.plan index ea3b93dcf2f..53c144826e0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_49.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_5.plan index 963f35d46a3..4acb969d7cf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_5.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_50.plan index 1e998ea85ea..b4ab0588797 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_50.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col6,row.col2,row.col5,row.col3,row.col7,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_51.plan index 7d657ec3bda..c09eaa210d5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_51.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_52.plan index 6a10829d3ee..544f7e9996e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_52.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col6,row.col4,row.col2,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_53.plan index 40807dfeee6..3cdcb8e28a9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_53.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_54.plan index d8a9c9cf7c5..196c396d1a7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_54.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col2,row.col6,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_55.plan index fc25bca69b3..d7186ecaf8c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_55.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_56.plan index 8981b439f9e..7d16efea651 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_56.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col1,row.col4,row.col5,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_6.plan index 07dc5758058..79998450fc7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_6.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col1,row.col3,row.col6,row.col7,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_61.plan index aa0e44441b7..c354c84fe90 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_61.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_62.plan index aa0e44441b7..c354c84fe90 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_62.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_7.plan index f3308532e53..1949e42454e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_7.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_73.plan index 98738b72a18..7f726f36233 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_73.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_74.plan index ff81d5d20f1..94a5f8bdc15 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_74.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col6,row.col5,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_75.plan index db83557d7a1..02700b32253 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_75.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_76.plan index 938f53f2474..f5dca77cc15 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_76.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col5,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_77.plan index 608443b060a..5e028f97395 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_77.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_78.plan index 58f6d9747cd..2698956a864 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_78.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col1,row.col2,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_79.plan index 9e239d023c1..debfbe17ff7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_79.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_8.plan index a5cfdbefd32..a0eac9004af 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_8.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col6,row.col4,row.col7,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_80.plan index d49dca7f417..2b67dfeb274 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_80.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col5,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_81.plan index 17c5dcccbe3..2c3f1e34b56 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_81.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_82.plan index 0491ea0b29d..f8d1a949282 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_82.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_83.plan index 555698629e7..e523b285dd3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_83.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_84.plan index 9a3f0cd53e8..f2ec3dd431b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_84.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_87.plan index bc69615f3f9..6aca94b0d94 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_87.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_88.plan index 549c7b7799e..f6c6a20f3fa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_88.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_89.plan index 8ce9019536c..ef98fc10493 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_89.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_9.plan index 2ec1a61d5cd..54232997fb0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_9.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_90.plan index 5d1643b0f4b..5e0954f28dc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_90.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_91.plan index c50dfddd414..7fdbf7fd1db 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_91.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_92.plan index 41ef2542e06..cd86f7bc804 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_92.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col5,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_93.plan index edf460137eb..2fec8a8ffcb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_93.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_94.plan index 848a6d5396e..f18c4109a2a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_94.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_95.plan index dbdf1d4ab50..0e786328b2b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_95.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_96.plan index 4f254290c61..d6946c28c1f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_96.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col6,row.col7,row.col4,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_97.plan index e9930cc391a..16e305b839b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_97.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -200,7 +200,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -208,16 +208,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -236,7 +246,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_98.plan index 9861ebcc843..2a4e86b766a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_98.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col5,row.col6,row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -200,7 +200,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -208,16 +208,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -236,7 +246,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_99.plan index 0b69b9cf1bb..d189f61f5c8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-3.test_/query_99.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -200,7 +200,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -208,16 +208,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -236,7 +246,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_1.plan index 3a73d44bb2a..24d47bd6e13 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_1.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_10.plan index 427296a0809..441e60c5063 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_10.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_100.plan index 079a493460a..ff333c255fc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_100.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_101.plan index 1dac7de1986..8f7e1642d03 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_101.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col4,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_11.plan index 427296a0809..441e60c5063 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_11.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_12.plan index 9588df2eed3..40279013a6c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_12.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_13.plan index 9588df2eed3..40279013a6c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_13.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_14.plan index b6a22a52520..7b408c36d67 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_14.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_15.plan index 178d84fbfba..0f7f21ca61a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_15.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_16.plan index edee7fc6bf2..a973a3b6a48 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_16.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -219,7 +219,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -227,16 +227,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -255,7 +265,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_17.plan index ffd31fc5aa9..006d6fd0d10 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_17.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col2,row.col7,row.col3,row.col6,row.col1]" }, { "Inputs": [ @@ -219,7 +219,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -227,16 +227,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -255,7 +265,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_20.plan index fe42ea79b09..941b62e6dd3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_20.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_21.plan index d3aedc5247b..df3e521f4f2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_21.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2,row.col4,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_22.plan index 3fa4aca6b83..250b19814bf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_22.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_23.plan index 8f37d85a4e6..2a1892586f1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_23.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_24.plan index 8c36bf917cf..c59ef9078c7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_24.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_25.plan index 446ffe93a35..1aa6600847d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_25.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_26.plan index bad69416337..09fa5f1c396 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_26.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_27.plan index bad69416337..09fa5f1c396 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_27.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_28.plan index cf156aa390e..73c983ac7d3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_28.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -194,7 +194,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -202,16 +202,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -230,7 +240,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_29.plan index 2909dc94664..e5446ce687b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_29.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2]" }, { "Inputs": [ @@ -194,7 +194,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -202,16 +202,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -230,7 +240,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_34.plan index 00e725dc127..647e08373c0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_34.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_35.plan index d2283d58f8e..0899e9fcdc8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_35.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_36.plan index 8a2010d0079..e71d1226140 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_36.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_37.plan index ccfc0a06e20..418f5e9bcad 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_37.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col2,row.col7,row.col3,row.col5,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_40.plan index 276a831b20e..54041cfe015 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_40.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -161,7 +161,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -169,16 +169,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -197,7 +207,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_41.plan index d0a17ed7698..40079b44e4d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_41.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ @@ -161,7 +161,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -169,16 +169,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -197,7 +207,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_42.plan index 09c861219cb..c1a2cb575a2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_42.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -161,7 +161,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -169,16 +169,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -197,7 +207,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_43.plan index 09c861219cb..c1a2cb575a2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_43.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -161,7 +161,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -169,16 +169,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -197,7 +207,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_44.plan index 810f4950cfd..5d3cf93ae1d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_44.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_45.plan index e8d4d52bd18..9410849d459 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_45.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_46.plan index b4b1b30fea1..de710c37220 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_46.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_47.plan index 244e8772e0e..83ac929f592 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_47.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_48.plan index 8f5f38e20f1..0dcdce8daf0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_48.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_49.plan index 5ec8fabb452..3c8cbc0c9d9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_49.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_50.plan index aa5f1ce5439..d5be364f1ae 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_50.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_51.plan index 23fd084c7da..d1cab3159ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_51.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col5,row.col6,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_52.plan index b5c1dd3a6ec..9ade04c0e78 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_52.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_53.plan index c703b3fdff1..c6e099371e6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_53.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col3,row.col4,row.col5,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_54.plan index 10a439a902c..765cf261d24 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_54.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_55.plan index 0008c950e36..27adc7cf7b5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_55.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col5,row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_56.plan index 0e0cad16ff5..f4eb7145fff 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_56.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_57.plan index 12d963b0a03..21ca6e999e9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_57.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_6.plan index 17e213d3509..dbe9ab2d7e7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_6.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_60.plan index daacf85759f..86b6d89f28c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_60.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_61.plan index 84b2b510909..fe4cbb124a6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_61.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_62.plan index 5e2e6a37926..6025150790b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_62.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_63.plan index 5e2e6a37926..6025150790b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_63.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_64.plan index 40da67ff905..0492b6101bc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_64.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_65.plan index c2e2fe5ce21..50992f005a3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_65.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_66.plan index 66641008f08..0a0d48fa6f2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_66.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_67.plan index 21c12fd868b..2033cf47b65 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_67.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col7,row.col5,row.col2,row.col1,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_68.plan index e8ebc35d04b..459b8a2b37b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_68.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -183,7 +183,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -191,16 +191,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -219,7 +229,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_69.plan index f66eb07a12a..e13cedd6651 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_69.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2,row.col5]" }, { "Inputs": [ @@ -183,7 +183,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -191,16 +191,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -219,7 +229,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_7.plan index 82b3fef18bd..5c0db354831 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_7.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col6,row.col1,row.col5,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_70.plan index 93ee1274772..00145db0cf6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_70.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -183,7 +183,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -191,16 +191,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -219,7 +229,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_71.plan index 08338590c05..434114a243d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_71.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col3,row.col1,row.col2]" }, { "Inputs": [ @@ -183,7 +183,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -191,16 +191,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -219,7 +229,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_76.plan index 9a48e85287b..75fdf6bb8a9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_76.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -147,7 +147,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -155,16 +155,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -183,7 +193,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_77.plan index 9a48e85287b..75fdf6bb8a9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_77.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -147,7 +147,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -155,16 +155,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -183,7 +193,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_78.plan index 542e7e846b7..a971392c790 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_78.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_79.plan index 78a72fa2369..e83dfe35c45 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_79.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_80.plan index 08a4344e56c..a74f8486fe4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_80.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_81.plan index 787b934a1bf..7d87cad8e06 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_81.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col5,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_82.plan index af8dda36001..f088bf2b4b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_82.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_83.plan index b074ebffd6b..f1ba0d6aa17 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_83.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col5,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_84.plan index dd708c21dd0..492bcc1dcf3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_84.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_85.plan index acada808eee..e9efb17106f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_85.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col5,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_88.plan index a57cca01364..3f14b8cfa6a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_88.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_89.plan index d64ded9354f..2d335483b0d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_89.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col7,row.col4,row.col2,row.col1,row.col6,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_90.plan index d36fad31189..bfe978aa0ff 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_90.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_91.plan index 18837b92218..fac00334549 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_91.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_92.plan index 62977824ed5..7087803019f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_92.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_93.plan index da06f676d99..96bfcf27fbb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_93.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_94.plan index e8d24a8dbb9..65d67855707 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_94.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_95.plan index 49647ae8408..8efb924dac8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_95.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col1,row.col4,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_96.plan index 336356600fe..838cd933f33 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_96.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_97.plan index a2cc77a87f2..dc7a3958ebb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_97.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col5,row.col6,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_98.plan index 43f471cc168..f20494d50c1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_98.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_99.plan index 63faaff2551..bafc9d5155f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-4.test_/query_99.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col6,row.col5,row.col1,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_1.plan index 49f7c2d47e2..fc98e517bc4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_1.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_10.plan index 35d80c6f919..b30026121d0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_10.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_103.plan index 3d8c436d5bd..88d51509702 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_103.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_104.plan index c62982691c1..7657bf30b63 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_104.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_105.plan index 0be9a4864d4..bce9662de49 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_105.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_106.plan index bf3d00ce041..a7903d6365e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_106.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col5,row.col6,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_107.plan index 85aa6db2c3b..b737d49adaa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_107.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_108.plan index 85aa6db2c3b..b737d49adaa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_108.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_11.plan index eed0527e7ae..c15e68674fb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_11.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_12.plan index 8f89fb79aa6..659b2f949ad 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_12.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col5,row.col4,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_13.plan index c5daeaa59e2..033cd78867e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_13.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -161,7 +161,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -169,16 +169,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -197,7 +207,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_14.plan index c5daeaa59e2..033cd78867e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_14.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -161,7 +161,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -169,16 +169,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -197,7 +207,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_15.plan index 077f54c0f44..4cb5ea07dcd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_15.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_16.plan index 077f54c0f44..4cb5ea07dcd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_16.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_17.plan index 76a5dc9328b..73bd07bea67 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_17.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_18.plan index 76a5dc9328b..73bd07bea67 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_18.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_19.plan index e21f3a2f686..7295a87b76e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_19.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_2.plan index 7f5be9e2796..d94f3ee11fd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_2.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_20.plan index 22bcff17961..ab0f9cdeb5d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_20.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_21.plan index d6198f326ae..a068406cd42 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_21.plan @@ -153,7 +153,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -161,16 +161,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -189,7 +199,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_22.plan index d6198f326ae..a068406cd42 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_22.plan @@ -153,7 +153,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -161,16 +161,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -189,7 +199,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_23.plan index 073e1f74494..423b26e12ae 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_23.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_24.plan index e5203dc99ed..4bf27657f92 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_24.plan @@ -99,7 +99,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_25.plan index 3335f1f7283..58cd78356c2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_25.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_26.plan index d53d42c6adf..3a1f6fb6e6f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_26.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_27.plan index 49cf3d22d4e..e6fef852f38 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_27.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -221,7 +221,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -229,16 +229,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -257,7 +267,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_28.plan index 08eb30225ba..2fae69be2b1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_28.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col1,row.col4,row.col5,row.col2,row.col3]" }, { "Inputs": [ @@ -221,7 +221,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -229,16 +229,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -257,7 +267,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_29.plan index f789adff812..02bd2da786e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_29.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_3.plan index 82163d78d6a..ad3288e1d32 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_3.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_30.plan index 861e8f65d1e..f3bb1fe7263 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_30.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_31.plan index 07a1b081838..af62640a97c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_31.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_32.plan index 14af4851def..d4395baabfb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_32.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_33.plan index 192d0122ddd..0411da4bfb8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_33.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_34.plan index 4a06b13f162..35cda7d8a7a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_34.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_35.plan index a88f67d14cc..8eb1adc0848 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_35.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_36.plan index d2d5b64d445..c2588b912bf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_36.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_37.plan index 1fc62039053..c7549b1195a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_37.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_38.plan index 1fc62039053..c7549b1195a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_38.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_39.plan index 2e544d7466a..87e3be03a85 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_39.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_4.plan index 41d7222271a..1282ac5a058 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_4.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col4,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_40.plan index fb4b86cd81a..73de035f0db 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_40.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_41.plan index def828dffdb..177db5b60cf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_41.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_42.plan index 4c072186f28..8686ec7a6b1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_42.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_43.plan index 8dd44f9e397..7911c4da77f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_43.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_44.plan index 8dd44f9e397..7911c4da77f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_44.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_45.plan index 3d62e4c56ba..ee5f5d7932f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_45.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_46.plan index 3d62e4c56ba..ee5f5d7932f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_46.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_47.plan index 34d19c61c6d..a2f90ec67b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_47.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_48.plan index 4b4b1a0bffd..d92d98ed12d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_48.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_49.plan index 2d3a46d529d..6dec90b2146 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_49.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_5.plan index 00b10a0ad75..2eecb8a946e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_5.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_50.plan index 2e7d1895598..140ed4052d6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_50.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_51.plan index 3d4c8a2ee40..589bdafcd8f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_51.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_52.plan index c48689b550a..e7b14f148d4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_52.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_53.plan index b73978ab132..316b92f31ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_53.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_54.plan index 56f09e7400f..2dea9fe46be 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_54.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col1,row.col2,row.col4,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_55.plan index 33dade99cfb..133a6a8e584 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_55.plan @@ -142,7 +142,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -150,16 +150,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -178,7 +188,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_56.plan index 33dade99cfb..133a6a8e584 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_56.plan @@ -142,7 +142,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -150,16 +150,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -178,7 +188,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_59.plan index ae69f443a7f..4de9b9eb996 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_59.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_6.plan index b422a5a5cd2..ff41133a725 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_6.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_60.plan index ae69f443a7f..4de9b9eb996 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_60.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_61.plan index 5bdbdc8cf22..a9b6d0a7b00 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_61.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_62.plan index 5bdbdc8cf22..a9b6d0a7b00 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_62.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_63.plan index 8f1062f3de8..bfdd1218bc0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_63.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_64.plan index 8f1062f3de8..bfdd1218bc0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_64.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_65.plan index b06d06b0862..3439d8c958f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_65.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_66.plan index 5ca6f32118b..2bc6efd4e6b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_66.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_69.plan index ba61954c129..0075335146c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_69.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_7.plan index 704afa3f985..ab274d4afbc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_7.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_70.plan index bdad1d6259c..6b5d883dbf2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_70.plan @@ -129,7 +129,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col3,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_71.plan index 69e804f23ae..39d640b9ab5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_71.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_72.plan index 8eb2465250f..657b220a398 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_72.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col6,row.col4,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_73.plan index c101a0aecbe..659998aa23c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_73.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_74.plan index 77431bd7c32..e07961addf7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_74.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_75.plan index eb842cda3e8..809c7613773 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_75.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -190,7 +190,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -198,16 +198,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -226,7 +236,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_76.plan index 32c96d46997..4cd46a432a8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_76.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col6,row.col5,row.col1]" }, { "Inputs": [ @@ -190,7 +190,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -198,16 +198,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -226,7 +236,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_77.plan index 505a4d415f6..5abb3c6bb84 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_77.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.c,Arg.b]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_78.plan index 82d4728be72..c05f87f01bd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_78.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.b,Arg.c]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_79.plan index c36252f79dc..8f8d52aa5c7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_79.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_8.plan index 0e25abc7980..173988f2bcf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_8.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_80.plan index b177f981036..6a6bcb6ca7e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_80.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_83.plan index c545ab49160..5155aba20f7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_83.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_84.plan index e36698577b7..c3647e83a00 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_84.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_85.plan index 2d0b3f6cef7..3cb0892b34d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_85.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_86.plan index 9a0541f9821..7efb2f0a2b3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_86.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_87.plan index 83c3ba054fe..50c0765560a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_87.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_88.plan index db9a232958e..43aef1e4eed 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_88.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_89.plan index 630aec8a376..964d8ae0775 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_89.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_9.plan index 35d80c6f919..b30026121d0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_9.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_90.plan index 51ac3e1bb57..b67286db84d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_90.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_91.plan index dce047c9db9..0e0da32357c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_91.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_92.plan index a29eff529eb..f12a73c1a7d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_92.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_93.plan index 364cf32f1ca..78a1040068e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_93.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_94.plan index b72f6451d75..3fd11e07ef2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_94.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_95.plan index d1cdc83c755..8fca20d9653 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_95.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_96.plan index 9d01d27e493..e75228e9b52 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-5.test_/query_96.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_1.plan index d3eefa89985..ff9df286974 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_1.plan @@ -135,7 +135,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_10.plan index a7a3a2c8fb4..b45a4b96161 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_10.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_100.plan index 8328d3aac3b..49ca2107049 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_100.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col6,row.col5,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_101.plan index 79a163cec94..3e5b0d4359a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_101.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_102.plan index b2a0bb0f7c4..022b53db2a7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_102.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_103.plan index 13d5b46aa14..c6dfd2b483b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_103.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -197,7 +197,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -205,16 +205,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -233,7 +243,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_104.plan index 85a68c08874..72c9347f109 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_104.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1]" }, { "Inputs": [ @@ -197,7 +197,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -205,16 +205,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -233,7 +243,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_105.plan index 826d0d63613..2a3cee03f72 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_105.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_106.plan index 7d20000e400..678f9b011dc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_106.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col6,row.col7,row.col3,row.col4,row.col5,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_107.plan index 9adb62da2e7..1b4d25f8eb9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_107.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -177,7 +177,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -185,16 +185,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -213,7 +223,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_108.plan index a3ab4dded35..341ab5c2d71 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_108.plan @@ -78,7 +78,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col2,row.col5,row.col3]" }, { "Inputs": [ @@ -177,7 +177,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -185,16 +185,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -213,7 +223,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_109.plan index a781483156a..a5804cb72ea 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_109.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_11.plan index 1fab617c5c6..7f041aaebd2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_11.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_110.plan index 015c79ec355..4f5beecd13c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_110.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_111.plan index 3eae9542314..61748e549b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_111.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_112.plan index 6ac6dcef8af..4363c088aa7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_112.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_113.plan index 73a5fae2446..a03ff010972 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_113.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_114.plan index e8505dcf75e..200b19710c0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_114.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col6,row.col7,row.col5,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_115.plan index 4cdd52f9bcb..b5c7e68650c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_115.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_116.plan index d4657570cdc..1961f8961cf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_116.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_117.plan index 2a1ac125822..465ba44c60c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_117.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_118.plan index 2a1ac125822..465ba44c60c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_118.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_12.plan index 3efcbb97b0f..03f5f5926f5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_12.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_131.plan index 63c1dc0a158..34cdef8ee3c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_131.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -197,7 +197,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -205,16 +205,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -233,7 +243,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_132.plan index d23a8d1251d..cd50e170193 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_132.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col6,row.col4,row.col3,row.col1,row.col5,row.col2]" }, { "Inputs": [ @@ -197,7 +197,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -205,16 +205,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -233,7 +243,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_133.plan index 833ae31c152..1d36688bc95 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_133.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -197,7 +197,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -205,16 +205,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -233,7 +243,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_134.plan index c74693a41fb..81a6acfa74c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_134.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col5,row.col6,row.col1,row.col4,row.col3,row.col2]" }, { "Inputs": [ @@ -197,7 +197,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -205,16 +205,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -233,7 +243,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_135.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_135.plan index 13cde7118c1..610aaffeb5a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_135.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_135.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_136.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_136.plan index 1ad6f33839f..1758a85ac77 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_136.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_136.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_15.plan index 1eafc26a208..67d4348f942 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_15.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_16.plan index 07cfd5b7450..ec40662bd80 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_16.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col2,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_17.plan index c386d7bc091..590bd080c5a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_17.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_18.plan index f1a32765d91..64e049120b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_18.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_19.plan index ae73edce7df..76fbe6a6102 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_19.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_2.plan index 8139b1ad1ec..342bf347d2f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_2.plan @@ -135,7 +135,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col6,row.col2,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_20.plan index 63b305eabda..98223043a71 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_20.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_21.plan index 557f2e9be80..b1b795c6398 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_21.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_22.plan index 0b0cd747b10..5a4a9877541 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_22.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_23.plan index 4fce68bf12b..11fa9bfd35c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_23.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_24.plan index fcc1670ff22..908cafe1494 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_24.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col1,row.col3,row.col6,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_25.plan index 2f58f384474..b31a96a9257 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_25.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_26.plan index d3f74a56b37..762408e641d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_26.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col6,row.col4,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_27.plan index d7ff0abc62e..80faa567c6d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_27.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_28.plan index 57902439256..fa13236a593 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_28.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col1,row.col5,row.col6,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_29.plan index d4456ff3aa3..01aed88a78b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_29.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_3.plan index 99b33f93020..f0d254109a7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_3.plan @@ -135,7 +135,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_30.plan index 0b550bce1a0..15d5ded3e53 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_30.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col6,row.col3,row.col5,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_31.plan index f1c6da979c8..0ffdb6b6164 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_31.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_32.plan index d3899e2a78a..d6f9c0e77a3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_32.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col5,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_33.plan index b5c04a4fd54..9c58dcda4c9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_33.plan @@ -154,7 +154,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -162,16 +162,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -190,7 +200,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_34.plan index b5c04a4fd54..9c58dcda4c9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_34.plan @@ -154,7 +154,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -162,16 +162,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -190,7 +200,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_35.plan index a4f8cf49c9a..c32556d8573 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_35.plan @@ -154,7 +154,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -162,16 +162,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -190,7 +200,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_36.plan index a4f8cf49c9a..c32556d8573 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_36.plan @@ -154,7 +154,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -162,16 +162,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -190,7 +200,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_37.plan index 410c20a0032..7faab70f660 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_37.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_38.plan index a66ae313c6e..5468cff8e73 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_38.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_39.plan index f7ae81fa225..1f2a4c43ba5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_39.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_4.plan index 40fa8b51a6e..e0a6ca5366b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_4.plan @@ -135,7 +135,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col3,row.col6,row.col5,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_40.plan index f7ae81fa225..1f2a4c43ba5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_40.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_41.plan index feff10809b3..40d54d12179 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_41.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_42.plan index f3d5c3c253e..a70e7e91549 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_42.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_43.plan index c4089c52b4d..bd7aecf3c36 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_43.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_44.plan index c4089c52b4d..bd7aecf3c36 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_44.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_45.plan index 62ee6dc47fa..230a8f2e33e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_45.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_46.plan index a2ae5dcea55..4da9d0a6a64 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_46.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_47.plan index 41660c4522a..7f8fa76a55a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_47.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_48.plan index a2a7766c0e1..1616244bf1d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_48.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_49.plan index 727201469a5..5739e407a81 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_49.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -226,7 +226,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -234,16 +234,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -262,7 +272,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_5.plan index adbb526eb54..d8eb3531205 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_5.plan @@ -135,7 +135,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_50.plan index a19bd1b69f5..9767418dd62 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_50.plan @@ -114,7 +114,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col6,row.col5,row.col2,row.col3]" }, { "Inputs": [ @@ -226,7 +226,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -234,16 +234,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -262,7 +272,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_51.plan index c5de759d5b2..39f4e34b6a4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_51.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_52.plan index f16411d7204..71753934f99 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_52.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col4,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_53.plan index 7afe5ca10cf..450bc5c4770 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_53.plan @@ -144,7 +144,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_54.plan index 9b771c2f000..a6187fdb23d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_54.plan @@ -144,7 +144,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_55.plan index 7afe5ca10cf..450bc5c4770 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_55.plan @@ -144,7 +144,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_56.plan index 18e6f66e9fb..0c9961dca79 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_56.plan @@ -144,7 +144,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_57.plan index 7afe5ca10cf..450bc5c4770 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_57.plan @@ -144,7 +144,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_58.plan index 5ebf5c6837d..101fb370ac2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_58.plan @@ -144,7 +144,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_6.plan index b01cde0c6e3..7124cc141f6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_6.plan @@ -135,7 +135,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col6,row.col2,row.col3,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_65.plan index fa8fbb6a018..547659d2744 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_65.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_66.plan index dba489696f0..1a9f90ffdf9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_66.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_67.plan index 3d8c97c0cef..b9f59e665ce 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_67.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_68.plan index 3d8c97c0cef..b9f59e665ce 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_68.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_69.plan index 36fdbcb4ab7..4509612c175 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_69.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_7.plan index e2dab4119b1..822ed7aa5b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_7.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_70.plan index 01c1f6d1a0e..69652d16461 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_70.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_71.plan index c9f4543604e..e6ea37404a1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_71.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_72.plan index 6c65366a284..73ee2958995 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_72.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_73.plan index c53acd5f2b9..167fb09086c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_73.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_74.plan index c53acd5f2b9..167fb09086c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_74.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_77.plan index 1b9233cd053..91693fed959 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_77.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_78.plan index e4daac21f4b..2c0b72269a1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_78.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_79.plan index 673ef6e66e0..7a250463b7c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_79.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_8.plan index e2dab4119b1..822ed7aa5b0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_8.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_80.plan index fad4aa5bf95..40e1a2b48c0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_80.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_81.plan index 1b4512056df..4c294dc4284 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_81.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_82.plan index 490b77025e4..d7146fa62a4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_82.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_83.plan index 5ed0adf1883..c42d9ffc4c0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_83.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_84.plan index 832ff986017..9ca1f776196 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_84.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col5,row.col7,row.col3,row.col4,row.col6]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_85.plan index 41cb36cea35..21653691732 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_85.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_86.plan index 15cdbf74b6d..58af4fd07dc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_86.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col7,row.col4,row.col1,row.col6,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_87.plan index 22a1ae0d872..9a35bea4376 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_87.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_88.plan index 22a1ae0d872..9a35bea4376 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_88.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_89.plan index 985be044cd4..585e3e91f59 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_89.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_9.plan index 47b2d7b2d43..171b51396c4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_9.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_90.plan index b12d0b21930..b24fe464be4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_90.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_91.plan index fdc60ca41b7..2bbb094bfdf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_91.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_92.plan index fdc60ca41b7..2bbb094bfdf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_92.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_93.plan index e5da82b56ac..64f6fd42249 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_93.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_94.plan index e5da82b56ac..64f6fd42249 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_94.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_99.plan index 0e2eea41aa7..8147bff45b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-6.test_/query_99.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_1.plan index a7554e925e6..eec0f6950a6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_1.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -184,7 +184,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -192,16 +192,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -220,7 +230,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_10.plan index 1bc1943e4a6..600bd849199 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_10.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_100.plan index 5ae2274082a..1d89b5a046a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_100.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_101.plan index b5c08a5a163..a8b9e1027bf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_101.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_102.plan index a2ed08ee667..3909a4b4676 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_102.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_103.plan index b137fc556db..586ba4a7a48 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_103.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_104.plan index 5393500be0a..e91834e76b7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_104.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_105.plan index 0de3c26ade9..311ea620808 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_105.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_106.plan index f42556e9e31..17d2104da78 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_106.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_107.plan index 50dcd0641d1..a6e9f7ed3f2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_107.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_108.plan index 0a6a4bf1beb..9922669a90a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_108.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col6,row.col1,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_109.plan index 2493513ae67..08689a7eff7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_109.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -166,7 +166,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -174,16 +174,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -202,7 +212,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_11.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_11.plan index be7cd5e167e..2f38f82cee7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_11.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_11.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_110.plan index 39b6290f223..90101f3a0ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_110.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col1,row.col4,row.col2,row.col3]" }, { "Inputs": [ @@ -166,7 +166,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -174,16 +174,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -202,7 +212,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_111.plan index 1dd288c6d57..6114873c5bd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_111.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_112.plan index c13cc0dc3ea..1cd4c94938d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_112.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col3,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_113.plan index 210e6b2f310..b846be1ede6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_113.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -215,7 +215,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -223,16 +223,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -251,7 +261,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_114.plan index 357d0d424e3..0088a9ac3d3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_114.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col1,row.col7,row.col2,row.col3]" }, { "Inputs": [ @@ -215,7 +215,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -223,16 +223,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -251,7 +261,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_115.plan index 3cd40e38a62..c66673fd2ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_115.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_116.plan index b4b855a833d..d9cfac0b8e5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_116.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col6,row.col4,row.col3,row.col1,row.col7,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_117.plan index 24f0b0e464f..a4f35c03f5c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_117.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_118.plan index c18dfb3a68d..d4dceb6d668 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_118.plan @@ -117,7 +117,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col6,row.col1,row.col2,row.col7,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_119.plan index d0af2adf867..bed91915a29 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_119.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -223,7 +223,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -231,16 +231,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -259,7 +269,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_12.plan index 6a0712655c6..463155131cc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_12.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_120.plan index 698c3e49cf3..bd0bb349f26 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_120.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col5,row.col6,row.col4,row.col2,row.col3]" }, { "Inputs": [ @@ -223,7 +223,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -231,16 +231,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -259,7 +269,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_121.plan index f04ad91f9b0..30013c3c9d2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_121.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -223,7 +223,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -231,16 +231,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -259,7 +269,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_122.plan index 35fa6aa3590..e925e6de72b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_122.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col6,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -223,7 +223,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -231,16 +231,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -259,7 +269,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_123.plan index 2e6c0ca3e56..acd7f74649d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_123.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -223,7 +223,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -231,16 +231,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -259,7 +269,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_13.plan index 1feaab68fb3..4bc61667612 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_13.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_14.plan index 1feaab68fb3..4bc61667612 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_14.plan @@ -42,7 +42,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_15.plan index 4ba83981594..83fadd7f48f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_15.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_16.plan index 3f14a3ff6e4..86da19843a6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_16.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_17.plan index 81e626b7400..1008d177669 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_17.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_18.plan index cd7ef71af73..edf6a0c1daf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_18.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_19.plan index 6bf0a5e45b2..7fc6a54f602 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_19.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_2.plan index c3a63980f53..30e400323a7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_2.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col3,row.col6,row.col2,row.col1]" }, { "Inputs": [ @@ -184,7 +184,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -192,16 +192,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -220,7 +230,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_20.plan index 0d6b5e510c0..2c4e34f574b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_20.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_21.plan index df8127e54dd..6f4f0428622 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_21.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_22.plan index df8127e54dd..6f4f0428622 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_22.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_23.plan index 67d4304bf9a..7c5b6a46fc8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_23.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_24.plan index 67d4304bf9a..7c5b6a46fc8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_24.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_25.plan index fc8126e48e3..d360534a96d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_25.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_26.plan index b7ac21d450e..523473557d4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_26.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col2,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_27.plan index fbbf57d2dd7..c0aab276c49 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_27.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_28.plan index acc2af7250f..887c57642ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_28.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col5,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_29.plan index 630449644bf..7217f631247 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_29.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_3.plan index f50b597bbfd..4a97029fb07 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_3.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_30.plan index 8bd50143d46..64c2ca4a0d2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_30.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_31.plan index 2b528759599..6b449edff2f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_31.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_32.plan index 2b528759599..6b449edff2f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_32.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_37.plan index bcc45427175..253447df251 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_37.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_38.plan index c9f3a278351..c453963beb9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_38.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_39.plan index 3360291e0d8..72568d2b830 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_39.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_4.plan index b8092cd0856..69a0058c0fc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_4.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_40.plan index 896b6a53095..ddc7d9b32ae 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_40.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_41.plan index 0f6c84b2968..e3cb0e81c4a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_41.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_42.plan index 716c8f67a9a..a7091ce6c9c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_42.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_43.plan index dcaf83f34c3..3512cf015fe 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_43.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_44.plan index 6780b3d4567..dd9cd0c8992 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_44.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col2,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_45.plan index b15450f2682..306e145a9f0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_45.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_46.plan index 5cbd633c246..c6810662227 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_46.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col4,row.col5,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_47.plan index acf885c012b..d4023451a8e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_47.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_48.plan index 46d2359b402..ba40f64f629 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_48.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_49.plan index b99a41d0b8a..44b363ce098 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_49.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_5.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_5.plan index e120ce224c5..b11d3bb11c2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_5.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_5.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_50.plan index f4a682ecd83..209d17e97a9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_50.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_51.plan index cdb5e20a7ef..0669e812e72 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_51.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_52.plan index c249c550e18..74f9d44ff87 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_52.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_53.plan index 92345f5ae05..693738c48e1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_53.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_54.plan index c08383d3860..76f2b753002 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_54.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_6.plan index e120ce224c5..b11d3bb11c2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_6.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_63.plan index f9d941a4d3d..069aa3bf273 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_63.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_64.plan index 3d912d1a6c8..2acd3f487f5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_64.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_65.plan index a53a95f22d8..150649dfa65 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_65.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_66.plan index 467a33ff765..1a1b70bb754 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_66.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_67.plan index 71503c5054e..dc092cae267 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_67.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_68.plan index 061609579c8..a3da6795f60 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_68.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_69.plan index 278234d896c..8ed39e58bae 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_69.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_7.plan index 76f17878e91..e8130f82c79 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_7.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_70.plan index 278234d896c..8ed39e58bae 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_70.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_71.plan index d78fca876fb..4a51fd29222 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_71.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_72.plan index 023956ab794..38103370b85 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_72.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_73.plan index 8132c6d9489..71a5b021c82 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_73.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_74.plan index 9aa900a1979..637282c3536 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_74.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_75.plan index dafd9069d60..00ea4eadc6c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_75.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_76.plan index 7da027dbc3a..449ee711759 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_76.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_77.plan index f817195074e..99a7ad9809f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_77.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_78.plan index ac91208fbfd..f3ceff2faae 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_78.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col6,row.col1,row.col4,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_79.plan index b1b567b5962..d601cbafdaf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_79.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_8.plan index 8d2e6270e13..3cdda910925 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_8.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_80.plan index 449da40e847..9ee66adcd1f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_80.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col1,row.col2,row.col5,row.col3,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_81.plan index b38832b3852..6bd95e31666 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_81.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_82.plan index 20a2cd4002c..a8b6d1661b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_82.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_83.plan index 185aef89c21..da9a8d78616 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_83.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_84.plan index d0f77bed595..de142972c56 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_84.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_85.plan index 888e61dcc8a..58af312ed7a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_85.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_86.plan index e3d4dc01b4b..550484e87aa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_86.plan @@ -60,7 +60,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_87.plan index cdf4230478a..39faf16a09e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_87.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_88.plan index 8780bc814f2..954e5ffb15a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_88.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col1,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_89.plan index 4d451ba6f44..243ab78e4a5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_89.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_9.plan index 1bc1943e4a6..600bd849199 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_9.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_90.plan index ebf36374075..598c3c64016 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_90.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_91.plan index f13c0f311aa..68215ae11b8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_91.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_92.plan index f13c0f311aa..68215ae11b8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_92.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_93.plan index 56cd94e12c0..fafe9c3dfb0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_93.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_94.plan index 06b07afec6e..0ef9aec2afa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_94.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col7,row.col6,row.col1,row.col4,row.col5,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_95.plan index 624b6d10ddd..b31a97fda74 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_95.plan @@ -123,7 +123,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_96.plan index 5d30b81f3e0..047f1af7cac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_96.plan @@ -123,7 +123,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col5,row.col6,row.col7,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_99.plan index b58cb68ec3d..6c0cf9691b2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-7.test_/query_99.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_1.plan index d4e06d902a7..c3cf8ab57f5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_1.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col6,row.col5,row.col2,row.col1]" }, { "Inputs": [ @@ -223,7 +223,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -231,16 +231,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -259,7 +269,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_100.plan index 94f5f6625b3..80de50b70a2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_100.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_101.plan index 94f5f6625b3..80de50b70a2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_101.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_102.plan index 2c41e88fd5b..b3962099ff0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_102.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_103.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_103.plan index 2c41e88fd5b..b3962099ff0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_103.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_103.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_104.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_104.plan index 2563a561829..1eeeca2abef 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_104.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_104.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_105.plan index 6d109e3ff69..90191557b1e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_105.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_106.plan index 09590e57d04..6b3e5cd24a9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_106.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_107.plan index 445c4acc81f..d640db78850 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_107.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_108.plan index 52b6dc76878..c51025a684a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_108.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -199,7 +199,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -207,16 +207,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -235,7 +245,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_109.plan index 96fed6db86f..baf4395a5af 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_109.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col6,row.col3,row.col4,row.col1,row.col2]" }, { "Inputs": [ @@ -199,7 +199,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -207,16 +207,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -235,7 +245,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_110.plan index 0491b4da4ce..4d850de0579 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_110.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -199,7 +199,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -207,16 +207,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -235,7 +245,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_111.plan index 1f098a84d5e..67893b63b56 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_111.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col4,row.col3,row.col6,row.col1]" }, { "Inputs": [ @@ -199,7 +199,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -207,16 +207,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -235,7 +245,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_112.plan index 45046065509..c7c8a723d10 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_112.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_113.plan index e34900a4479..41f0a7eb664 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_113.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col2,row.col4,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_114.plan index aed1ec0d756..c379c294f3e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_114.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -185,7 +185,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -193,16 +193,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -221,7 +231,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_115.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_115.plan index 10d371c3eb0..9fa221c1ad8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_115.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_115.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col1,row.col7,row.col3,row.col4,row.col6]" }, { "Inputs": [ @@ -185,7 +185,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -193,16 +193,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -221,7 +231,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_116.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_116.plan index 54d76623561..9482af80cc2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_116.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_116.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -185,7 +185,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -193,16 +193,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -221,7 +231,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_117.plan index b92c5971a12..0cf26da4679 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_117.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col6,row.col7,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -185,7 +185,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -193,16 +193,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -221,7 +231,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_12.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_12.plan index f400a79893e..a0cdc9f2326 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_12.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_12.plan @@ -156,7 +156,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_120.plan index 344f163b80e..afb41244812 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_120.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ @@ -159,7 +159,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -167,16 +167,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -195,7 +205,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_121.plan index 169730434a3..4d4d845b674 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_121.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ @@ -159,7 +159,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -167,16 +167,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -195,7 +205,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_13.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_13.plan index 9cd00c2c11c..9a1ea0cfa16 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_13.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_13.plan @@ -156,7 +156,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col7,row.col1,row.col6,row.col4,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_14.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_14.plan index 1f00c913bed..de21842248e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_14.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_14.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_15.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_15.plan index 1af131dfa2f..904193155d7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_15.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_15.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col5,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_16.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_16.plan index 72b6ba6b75a..9e299261e74 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_16.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_16.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_17.plan index 1f3d1fafc14..51839ca7b9f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_17.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col5,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_18.plan index 185bfc145bc..b01c1d0a530 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_18.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_19.plan index 50421310c86..18aa0850a3c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_19.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col1,row.col5,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_2.plan index 564f6f4fad2..7e5e009c5fc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_2.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -223,7 +223,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -231,16 +231,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -259,7 +269,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_20.plan index d7dd8a198d0..7d8601089b8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_20.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_21.plan index fb40c336fa0..aa17739bd2c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_21.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col6,row.col1,row.col5,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_22.plan index 375c1a633da..6143b148921 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_22.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_23.plan index a7abb5f8f42..2e400429a7c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_23.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col3,row.col5,row.col2,row.col1,row.col4]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_24.plan index e079c8a5309..ce4170175a2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_24.plan @@ -141,7 +141,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_25.plan index 70fc85d0e76..59d1dba986d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_25.plan @@ -141,7 +141,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col3,row.col2,row.col1,row.col5,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_26.plan index 1cf7e399bd4..5878d46c451 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_26.plan @@ -141,7 +141,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_27.plan index 9a091aa7a41..09d04c103de 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_27.plan @@ -141,7 +141,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col2,row.col6,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_28.plan index 2aee288a034..2cba5c8141f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_28.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_29.plan index 1ca9bad50f0..59c9c0f08f8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_29.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col6,row.col4,row.col5,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_3.plan index 006b8c936c3..0614a05a17d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_3.plan @@ -111,7 +111,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col3,row.col6,row.col4,row.col1]" }, { "Inputs": [ @@ -223,7 +223,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -231,16 +231,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -259,7 +269,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_38.plan index c2ba6f690a5..54f5a238bb7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_38.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_39.plan index c2ba6f690a5..54f5a238bb7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_39.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_40.plan index ec23fd03091..b4eb26b5e6d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_40.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_41.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_41.plan index f69b7448f50..244d46c3a71 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_41.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_41.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3,row.col4,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_42.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_42.plan index 5d0d6f857d4..65a2b9d330a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_42.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_42.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_43.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_43.plan index ee06f2a3519..c7309ce92a3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_43.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_43.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col2,row.col5,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_44.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_44.plan index d943a62661b..676689a72ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_44.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_44.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_45.plan index 97b48d6bb60..97594369e13 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_45.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_46.plan index 13975178181..c42b6f961b5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_46.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_47.plan index fa611f09701..541062630a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_47.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_48.plan index f329b23421f..192390deab4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_48.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_49.plan index 66d8fef7f52..c17a185d70d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_49.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_50.plan index 26f7d2165c4..187bd401d06 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_50.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_51.plan index a5b1b3a8142..4862fdd650b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_51.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_52.plan index a5bed0ac982..631fdc407d2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_52.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_53.plan index 3fecb2ae401..154cdf5e55d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_53.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_54.plan index 52725bc22e3..028561507c8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_54.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_55.plan index 68186aed9df..72c726f4548 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_55.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_56.plan index 337389f4935..492b9727e32 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_56.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_57.plan index d2bebace6c0..6bae087f204 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_57.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_58.plan index 6a65b38041d..87394878487 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_58.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -239,7 +239,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -247,16 +247,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -275,7 +285,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_59.plan index 643554219ad..075e75473d5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_59.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col6,row.col7,row.col4,row.col2,row.col1]" }, { "Inputs": [ @@ -239,7 +239,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -247,16 +247,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -275,7 +285,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_6.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_6.plan index 99ba47dd04d..dae9726a2f1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_6.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_6.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_60.plan index c3fb9760832..265aed96d85 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_60.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -239,7 +239,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -247,16 +247,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -275,7 +285,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_61.plan index 52099d09458..541b9877bfc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_61.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col6,row.col7,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -239,7 +239,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -247,16 +247,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -275,7 +285,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_62.plan index 4a29f334373..9b420d3c271 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_62.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -239,7 +239,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -247,16 +247,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -275,7 +285,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_63.plan index c16604516fa..dbdc8eec88f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_63.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col1,row.col3,row.col5,row.col7,row.col4,row.col2]" }, { "Inputs": [ @@ -239,7 +239,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -247,16 +247,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -275,7 +285,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_64.plan index 2cfb3a1a140..974aeecd03f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_64.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.b,Arg.e]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_65.plan index a9074b207d1..44853f43efc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_65.plan @@ -39,7 +39,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[Arg.e,Arg.b]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_66.plan index aad1b53eb5a..a5c3fde78f5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_66.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_67.plan index c1a376d745b..fe4f8f7d32a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_67.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col4,row.col1,row.col6,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_68.plan index aecbff5f3af..998c0d1ed77 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_68.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_69.plan index e72dc9644fc..b229cb497aa 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_69.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_7.plan index 2f5b2519b51..ff6a72faaf4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_7.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col4,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_70.plan index 5359c7617b2..c6e9a07f642 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_70.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_71.plan index 5359c7617b2..c6e9a07f642 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_71.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_72.plan index e4d9cf5c382..0c625cc0842 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_72.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_73.plan index cd6584fb389..54f67f9e012 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_73.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_74.plan index 5b80dce1e27..5fcedefead5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_74.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_75.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_75.plan index 41d8c86873d..ba3971f2c0f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_75.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_75.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_76.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_76.plan index fe14288b9bd..67fc5e5e6a3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_76.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_76.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_77.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_77.plan index 711ab14d790..a1dfdde2c4b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_77.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_77.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col6,row.col4,row.col5,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_78.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_78.plan index 777b5e8039f..5e103fc085a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_78.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_78.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_79.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_79.plan index f20be36c8a2..dfc17acb0d5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_79.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_79.plan @@ -87,7 +87,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col6,row.col1,row.col4,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_80.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_80.plan index 6559de6f3a2..31265ea6eb7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_80.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_80.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -179,7 +179,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -187,16 +187,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -215,7 +225,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_81.plan index 4484281a030..4ecf29710ee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_81.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1]" }, { "Inputs": [ @@ -179,7 +179,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -187,16 +187,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -215,7 +225,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_82.plan index d151312a682..3c45f60c4e0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_82.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -179,7 +179,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -187,16 +187,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -215,7 +225,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_83.plan index de134942952..7e94b319a48 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_83.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2,row.col4]" }, { "Inputs": [ @@ -179,7 +179,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -187,16 +187,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -215,7 +225,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_84.plan index 9881ca8bb01..bed3ae949d7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_84.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -179,7 +179,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -187,16 +187,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -215,7 +225,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_85.plan index 74d83fc46e9..f99150a015c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_85.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col4,row.col1]" }, { "Inputs": [ @@ -179,7 +179,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -187,16 +187,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -215,7 +225,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_86.plan index 889d5341d81..99431e3fb18 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_86.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -179,7 +179,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -187,16 +187,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -215,7 +225,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_87.plan index af7b13af5d6..8a8661e8c9e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_87.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col2,row.col3]" }, { "Inputs": [ @@ -179,7 +179,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -187,16 +187,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -215,7 +225,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_92.plan index 8dc54e58cd6..12f4f917ec1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_92.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -177,7 +177,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -185,16 +185,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -213,7 +223,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_93.plan index 8ae726e37fd..3ef520ea52c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_93.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ @@ -177,7 +177,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -185,16 +185,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -213,7 +223,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_94.plan index 3440ecf8bf8..54ca05693e7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_94.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_95.plan index 303aa0431c5..0e174bd1cb6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_95.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col3,row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_96.plan index a38ebee94af..b373c040f49 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_96.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_97.plan index d043579b795..25956c5eccd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_97.plan @@ -63,7 +63,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_98.plan index a4d8a983be1..52a5df9fb00 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_98.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_99.plan index 516a9283813..cd69373ea06 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-8.test_/query_99.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col5,row.col4,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_1.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_1.plan index 45673544379..1ecdcd99f15 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_1.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_1.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_10.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_10.plan index 9ec7e0f39ec..915beee806a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_10.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_10.plan @@ -150,7 +150,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col6,row.col7,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_100.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_100.plan index 04188476f24..93094adbb21 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_100.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_100.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col4,row.col3,row.col6,row.col2,row.col1]" }, { "Inputs": [ @@ -196,7 +196,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -204,16 +204,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -232,7 +242,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_101.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_101.plan index 7569982365e..4c8e16def42 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_101.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_101.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -196,7 +196,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -204,16 +204,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -232,7 +242,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_102.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_102.plan index 5c6eeb306a2..ccd70fe3387 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_102.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_102.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col6,row.col4,row.col5,row.col3]" }, { "Inputs": [ @@ -196,7 +196,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -204,16 +204,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -232,7 +242,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_105.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_105.plan index f68476a3484..f13d5a9ca09 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_105.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_105.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_106.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_106.plan index 62851bccd4b..637ff2b5f6b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_106.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_106.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col6,row.col3,row.col7,row.col4,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_107.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_107.plan index 8892087caa6..09d3553771f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_107.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_107.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_108.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_108.plan index e205b6687d6..8bf4296bf2f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_108.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_108.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col7,row.col1,row.col2,row.col6,row.col5,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_109.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_109.plan index 4f26ceeef39..85c17717498 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_109.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_109.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_110.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_110.plan index 30143a212ad..ef1a23cc535 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_110.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_110.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col2,row.col6,row.col1,row.col5,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_111.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_111.plan index 046775e6306..b8b456d1146 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_111.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_111.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_112.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_112.plan index dfdef284db9..228c7c20e9b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_112.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_112.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col6,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_113.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_113.plan index 046775e6306..b8b456d1146 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_113.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_113.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_114.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_114.plan index 99bdd239688..82be8083987 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_114.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_114.plan @@ -132,7 +132,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col6,row.col2,row.col1,row.col5,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_117.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_117.plan index 671bdd03b05..d424e3b5bf8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_117.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_117.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_118.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_118.plan index 3b502823aee..eee81b7daff 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_118.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_118.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_119.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_119.plan index 6c8f033cb2f..9d29f95f88d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_119.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_119.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_120.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_120.plan index 6c8f033cb2f..9d29f95f88d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_120.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_120.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_121.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_121.plan index 1741895cfbb..c593904009d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_121.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_121.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_122.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_122.plan index 1741895cfbb..c593904009d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_122.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_122.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_123.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_123.plan index 0fcc9b42ac3..af4e64a30f0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_123.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_123.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_124.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_124.plan index 0fcc9b42ac3..af4e64a30f0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_124.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_124.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_125.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_125.plan index 0238ab95bfa..af839007147 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_125.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_125.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_126.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_126.plan index 0238ab95bfa..af839007147 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_126.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_126.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_127.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_127.plan index 8d44ecb83ba..de7135b3452 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_127.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_127.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_128.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_128.plan index 10a6f1132b7..4c5ce7564c3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_128.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_128.plan @@ -48,7 +48,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_129.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_129.plan index 6578a38cb9c..63466a92ef6 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_129.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_129.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -186,7 +186,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -194,16 +194,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -222,7 +232,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_130.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_130.plan index ff58aa574ff..bdc5715724c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_130.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_130.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3,row.col5,row.col4]" }, { "Inputs": [ @@ -186,7 +186,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -194,16 +194,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -222,7 +232,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_131.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_131.plan index 6294d1759f4..e1f33e60c03 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_131.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_131.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_132.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_132.plan index 7b6c2fe77e5..fb0a681a201 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_132.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_132.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_133.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_133.plan index c0112bfaa2f..c6a85f6a279 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_133.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_133.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -205,7 +205,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -213,16 +213,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -241,7 +251,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_134.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_134.plan index eaca6dce4b5..c38eec5b7a5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_134.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_134.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col1,row.col5,row.col4,row.col2,row.col3]" }, { "Inputs": [ @@ -205,7 +205,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -213,16 +213,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -241,7 +251,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_139.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_139.plan index 5e18fa25a0e..3c07012f131 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_139.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_139.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_140.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_140.plan index b486de2a8b8..9af8cf165be 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_140.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_140.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col4,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_143.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_143.plan index 92fc173d185..863d2fa044d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_143.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_143.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_144.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_144.plan index bb433afbead..73766da5a1c 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_144.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_144.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col5,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_145.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_145.plan index a739a620f11..c09737a126b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_145.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_145.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_146.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_146.plan index f2e91e03159..8e4415dc5c4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_146.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_146.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col3,row.col2,row.col5,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_147.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_147.plan index bbb9a09f0bd..a88b62248b4 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_147.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_147.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_148.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_148.plan index ac18040ba91..e0563a96910 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_148.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_148.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col5,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_149.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_149.plan index 88f0e0560cd..bd183dc3d5f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_149.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_149.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_150.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_150.plan index a791e27ec86..f7833d83ac3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_150.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_150.plan @@ -69,7 +69,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_17.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_17.plan index 7fd867d5fef..bbaff0afb63 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_17.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_17.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_18.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_18.plan index a310d833e78..2c24a7d550e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_18.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_18.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1,row.col4,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_19.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_19.plan index 965b2de5b80..eee91325c24 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_19.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_19.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_2.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_2.plan index 88c7521067e..1d698aee655 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_2.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_2.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col1,row.col5,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_20.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_20.plan index 61f46524b7a..b605c787fa0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_20.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_20.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col5,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_21.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_21.plan index 3fa3aa1e17b..94450f3b098 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_21.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_21.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -203,7 +203,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -211,16 +211,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -239,7 +249,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_22.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_22.plan index ac273553d1f..3bd54daafdb 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_22.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_22.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col7,row.col2,row.col6,row.col1,row.col4,row.col3]" }, { "Inputs": [ @@ -203,7 +203,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -211,16 +211,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -239,7 +249,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_23.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_23.plan index ca3d6de6676..6f33fc0e610 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_23.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_23.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -203,7 +203,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -211,16 +211,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -239,7 +249,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_24.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_24.plan index 929454f8230..185385572f7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_24.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_24.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col2,row.col1,row.col7,row.col4,row.col5,row.col3]" }, { "Inputs": [ @@ -203,7 +203,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -211,16 +211,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -239,7 +249,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_25.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_25.plan index b8891e6b721..128d3158382 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_25.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_25.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_26.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_26.plan index c46de017d4f..a21dd95df00 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_26.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_26.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col4,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_27.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_27.plan index 1e295f8db19..245a0c05842 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_27.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_27.plan @@ -123,7 +123,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -225,7 +225,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -233,16 +233,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -261,7 +271,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_28.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_28.plan index fe26b92cf1d..88023398901 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_28.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_28.plan @@ -123,7 +123,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col5,row.col3,row.col6,row.col7,row.col4,row.col1]" }, { "Inputs": [ @@ -225,7 +225,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -233,16 +233,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -261,7 +271,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_29.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_29.plan index bb840eb7b7e..a0ff7866e74 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_29.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_29.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -175,7 +175,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -183,16 +183,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -211,7 +221,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_3.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_3.plan index 99ac7cfea2b..578839655af 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_3.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_3.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -190,7 +190,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -198,16 +198,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -226,7 +236,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_30.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_30.plan index ea66ee9d95d..87c98f705e2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_30.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_30.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col3,row.col2,row.col4,row.col1]" }, { "Inputs": [ @@ -175,7 +175,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -183,16 +183,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -211,7 +221,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_31.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_31.plan index 635234e91bf..593bceda70b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_31.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_31.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -153,7 +153,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -161,16 +161,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -189,7 +199,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_32.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_32.plan index c16a283d0c6..cebc16d04df 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_32.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_32.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ @@ -153,7 +153,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -161,16 +161,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -189,7 +199,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_33.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_33.plan index e48e6fca6a9..0dd1ff71141 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_33.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_33.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_34.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_34.plan index b448568878c..71b3c61c85b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_34.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_34.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col1,row.col5,row.col3,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_35.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_35.plan index 8f5a8efb0bb..4b572a65aee 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_35.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_35.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_36.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_36.plan index 2a36975b7a1..fbd52dc4a3a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_36.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_36.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col3,row.col2,row.col5]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_37.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_37.plan index 39bf481079d..88c111cfac5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_37.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_37.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_38.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_38.plan index e92d5b58e0c..37a71015197 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_38.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_38.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_39.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_39.plan index ed3ac04b9e7..f7ade398c5f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_39.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_39.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_4.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_4.plan index 7cf4ef5b89a..526d4d24523 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_4.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_4.plan @@ -81,7 +81,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col2,row.col1]" }, { "Inputs": [ @@ -190,7 +190,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -198,16 +198,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -226,7 +236,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_40.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_40.plan index 5afb502734d..b648b2d2ffc 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_40.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_40.plan @@ -75,7 +75,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col4,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_45.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_45.plan index 8300cae0d4f..88387ffa7a3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_45.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_45.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_46.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_46.plan index ed7574eb375..3664ebb2fa2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_46.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_46.plan @@ -108,7 +108,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col4,row.col3,row.col5]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_47.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_47.plan index 42b88bf9cee..9265ae3d2c2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_47.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_47.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_48.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_48.plan index 42b88bf9cee..9265ae3d2c2 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_48.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_48.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_49.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_49.plan index 4ad16bc4195..be6816bf2b1 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_49.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_49.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_50.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_50.plan index 9fc34c9ecb2..a010aa313e0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_50.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_50.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_51.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_51.plan index 489b44445b0..4db1482082e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_51.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_51.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_52.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_52.plan index 489b44445b0..4db1482082e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_52.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_52.plan @@ -93,7 +93,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_53.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_53.plan index ec031c97d5e..891f67bd29a 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_53.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_53.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_54.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_54.plan index 55d64a986fa..766c3151bce 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_54.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_54.plan @@ -66,7 +66,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2,row.col3]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_55.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_55.plan index 87d0d72c7b3..ba49b468d25 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_55.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_55.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_56.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_56.plan index 87d0d72c7b3..ba49b468d25 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_56.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_56.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_57.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_57.plan index 7ce3442c8c6..e760884a0a8 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_57.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_57.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_58.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_58.plan index de5a51fdae7..4f8ab63ee3f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_58.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_58.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_59.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_59.plan index bb7442c2084..ee9bc4e053e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_59.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_59.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_60.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_60.plan index 1a5ff8d617a..46a56dc9dd9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_60.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_60.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_61.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_61.plan index f8abc1e728b..ecef03d33b9 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_61.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_61.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_62.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_62.plan index 90ea4752506..34983d1aac5 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_62.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_62.plan @@ -96,7 +96,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_63.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_63.plan index c05e50b7c18..19c1d0ef1f3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_63.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_63.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -182,7 +182,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -190,16 +190,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -218,7 +228,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_64.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_64.plan index e6ecf01ad1e..a82f919b30f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_64.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_64.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col2,row.col3]" }, { "Inputs": [ @@ -182,7 +182,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -190,16 +190,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -218,7 +228,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_65.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_65.plan index c6835f308c1..48f28afbcab 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_65.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_65.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -182,7 +182,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -190,16 +190,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -218,7 +228,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_66.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_66.plan index f9e8fd209a6..c9b378ae562 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_66.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_66.plan @@ -72,7 +72,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col4,row.col2,row.col1]" }, { "Inputs": [ @@ -182,7 +182,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -190,16 +190,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -218,7 +228,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_67.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_67.plan index 07f6d31296d..7fab89ffd1e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_67.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_67.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_68.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_68.plan index ef35f3bf3f9..e9600a46403 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_68.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_68.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_69.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_69.plan index 91bc8652eeb..c426e51f1ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_69.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_69.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_7.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_7.plan index 2dac94d3e4f..1844efbb968 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_7.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_7.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -226,7 +226,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -234,16 +234,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -262,7 +272,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_70.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_70.plan index 91bc8652eeb..c426e51f1ac 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_70.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_70.plan @@ -57,7 +57,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_71.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_71.plan index cdb0b05c229..cf70cf8fff7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_71.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_71.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_72.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_72.plan index cdb0b05c229..cf70cf8fff7 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_72.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_72.plan @@ -45,7 +45,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_73.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_73.plan index cec64066702..d7e85d2888b 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_73.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_73.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -203,7 +203,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -211,16 +211,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -239,7 +249,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_74.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_74.plan index c9e6c9bd8c8..cf80d860abd 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_74.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_74.plan @@ -90,7 +90,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col7,row.col6,row.col5,row.col3,row.col4,row.col2,row.col1]" }, { "Inputs": [ @@ -203,7 +203,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -211,16 +211,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -239,7 +249,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_8.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_8.plan index 63ee6dbf633..ac5a5cc0d51 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_8.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_8.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col1,row.col3,row.col4]" }, { "Inputs": [ @@ -226,7 +226,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -234,16 +234,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -262,7 +272,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_81.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_81.plan index 80ee7d1f919..2fcd6d8490d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_81.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_81.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col4,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_82.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_82.plan index 077ba0cd115..e7409ac4287 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_82.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_82.plan @@ -126,7 +126,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col4,row.col1,row.col3]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_83.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_83.plan index 3807a99eb27..181f1372e81 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_83.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_83.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_84.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_84.plan index 3807a99eb27..181f1372e81 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_84.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_84.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_85.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_85.plan index f4f6d3b657f..f986b2236bf 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_85.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_85.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_86.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_86.plan index 467c09d3d20..c67557bf7ce 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_86.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_86.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col1,row.col3,row.col6,row.col4]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_87.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_87.plan index 4e8cd116481..8bf92e95de0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_87.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_87.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_88.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_88.plan index ea610b2431e..cf756e0e876 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_88.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_88.plan @@ -120,7 +120,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col1,row.col4,row.col3,row.col6,row.col5,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_89.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_89.plan index e8a57ade5c6..6ab93b4d753 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_89.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_89.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_9.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_9.plan index 31a1ed62580..a28feb4fd1f 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_9.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_9.plan @@ -150,7 +150,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col7,row.col4,row.col5,row.col2,row.col3,row.col1]" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_90.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_90.plan index beb21881fef..eefdeb8acda 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_90.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_90.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_91.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_91.plan index e7697667007..73494c7c31e 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_91.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_91.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -151,7 +151,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -159,16 +159,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -187,7 +197,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_92.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_92.plan index 554f2098b15..4fdae13beca 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_92.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_92.plan @@ -54,7 +54,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col1,row.col3]" }, { "Inputs": [ @@ -151,7 +151,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -159,16 +159,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -187,7 +197,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_93.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_93.plan index 9f1759358bc..22df4332888 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_93.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_93.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -213,7 +213,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -221,16 +221,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -249,7 +259,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_94.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_94.plan index 8a9f5fcf2aa..e8eaf6e8762 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_94.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_94.plan @@ -102,7 +102,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col5,row.col2,row.col3,row.col6,row.col4,row.col1]" }, { "Inputs": [ @@ -213,7 +213,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -221,16 +221,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -249,7 +259,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_95.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_95.plan index c5afa27481d..35e1310bc41 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_95.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_95.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_96.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_96.plan index 81d21f1f619..961372920a0 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_96.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_96.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col3,row.col1,row.col2]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_97.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_97.plan index a02209877b3..8fa1869216d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_97.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_97.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_98.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_98.plan index a02209877b3..8fa1869216d 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_98.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_98.plan @@ -51,7 +51,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col2,row.col3,row.col1]" }, { "Inputs": [ diff --git a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_99.plan b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_99.plan index 7d7622125c5..88b1a5370d3 100644 --- a/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_99.plan +++ b/ydb/tests/functional/suite_tests/canondata/test_sql_logic.TestSQLLogic.test_sql_suite_plan-select3-9.test_/query_99.plan @@ -84,7 +84,7 @@ ], "Limit": "1001", "Name": "TopSort", - "TopSortBy": "" + "TopSortBy": "[row.col6,row.col4,row.col5,row.col2,row.col3,row.col1]" }, { "Inputs": [ @@ -196,7 +196,7 @@ "PlanNodeType": "Materialize", "Plans": [ { - "Node Type": "Aggregate-Limit", + "Node Type": "Aggregate-Limit-Aggregate", "Operators": [ { "Inputs": [ @@ -204,16 +204,26 @@ "InternalOperatorId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Final" }, { "Inputs": [ { - "ExternalPlanNodeId": 3 + "InternalOperatorId": 2 } ], "Limit": "1", "Name": "Limit" + }, + { + "Inputs": [ + { + "ExternalPlanNodeId": 3 + } + ], + "Name": "Aggregate", + "Phase": "Final" } ], "PlanNodeId": 4, @@ -232,7 +242,8 @@ "ExternalPlanNodeId": 1 } ], - "Name": "Aggregate" + "Name": "Aggregate", + "Phase": "Intermediate" } ], "PlanNodeId": 2, -- cgit v1.3