From ffe1030d2d773b3fe6f0e558d40f0c639d0aff93 Mon Sep 17 00:00:00 2001 From: Ruihang Xia Date: Fri, 10 Apr 2026 05:17:07 +0800 Subject: [PATCH] update sqlness interceptor Signed-off-by: Ruihang Xia --- .../reduce_aggregate_repartition.result | 30 +++++++++++-------- .../reduce_aggregate_repartition.sql | 4 +++ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/tests/cases/standalone/optimizer/reduce_aggregate_repartition.result b/tests/cases/standalone/optimizer/reduce_aggregate_repartition.result index ecc0ffacfd..eebf993717 100644 --- a/tests/cases/standalone/optimizer/reduce_aggregate_repartition.result +++ b/tests/cases/standalone/optimizer/reduce_aggregate_repartition.result @@ -44,6 +44,7 @@ ORDER BY a, b; -- SQLNESS REPLACE (-+) - -- SQLNESS REPLACE (\s\s+) _ +-- SQLNESS REPLACE (Hash.*) REDACTED -- SQLNESS REPLACE (peers.*) REDACTED EXPLAIN VERBOSE SELECT a, b, sum(m) @@ -179,7 +180,7 @@ GROUP BY b, a; | physical_plan after EnforceDistribution_| OutputRequirementExec: order_by=[], dist_by=Unspecified_| |_|_ProjectionExec: expr=[a@1 as a, b@0 as b, sum(s.m)@2 as sum(s.m)]_| |_|_AggregateExec: mode=FinalPartitioned, gby=[b@0 as b, a@1 as a], aggr=[sum(s.m)]_| -|_|_RepartitionExec: partitioning=Hash([b@0, a@1], 32), input_partitions=32_| +|_|_RepartitionExec: partitioning=REDACTED |_|_AggregateExec: mode=Partial, gby=[b@0 as b, a@1 as a], aggr=[sum(s.m)]_| |_|_MergeScanExec: REDACTED |_|_| @@ -191,7 +192,7 @@ GROUP BY b, a; | physical_plan after ProjectionPushdown_| SAME TEXT AS ABOVE_| | physical_plan after OutputRequirements_| ProjectionExec: expr=[a@1 as a, b@0 as b, sum(s.m)@2 as sum(s.m)]_| |_|_AggregateExec: mode=FinalPartitioned, gby=[b@0 as b, a@1 as a], aggr=[sum(s.m)]_| -|_|_RepartitionExec: partitioning=Hash([b@0, a@1], 32), input_partitions=32_| +|_|_RepartitionExec: partitioning=REDACTED |_|_AggregateExec: mode=Partial, gby=[b@0 as b, a@1 as a], aggr=[sum(s.m)]_| |_|_MergeScanExec: REDACTED |_|_| @@ -208,19 +209,19 @@ GROUP BY b, a; | physical_plan after SanityCheckPlan_| SAME TEXT AS ABOVE_| | physical_plan_| ProjectionExec: expr=[a@1 as a, b@0 as b, sum(s.m)@2 as sum(s.m)]_| |_|_AggregateExec: mode=FinalPartitioned, gby=[b@0 as b, a@1 as a], aggr=[sum(s.m)]_| -|_|_RepartitionExec: partitioning=Hash([b@0, a@1], 32), input_partitions=32_| +|_|_RepartitionExec: partitioning=REDACTED |_|_AggregateExec: mode=Partial, gby=[b@0 as b, a@1 as a], aggr=[sum(s.m)]_| |_|_MergeScanExec: REDACTED |_|_| | physical_plan_with_stats_| ProjectionExec: expr=[a@1 as a, b@0 as b, sum(s.m)@2 as sum(s.m)], statistics=[Rows=Absent, Bytes=Absent, [(Col[0]:),(Col[1]:),(Col[2]:)]]_| |_|_AggregateExec: mode=FinalPartitioned, gby=[b@0 as b, a@1 as a], aggr=[sum(s.m)], statistics=[Rows=Absent, Bytes=Absent, [(Col[0]:),(Col[1]:),(Col[2]:)]]_| -|_|_RepartitionExec: partitioning=Hash([b@0, a@1], 32), input_partitions=32, statistics=[Rows=Absent, Bytes=Absent, [(Col[0]:),(Col[1]:),(Col[2]:)]]_| +|_|_RepartitionExec: partitioning=REDACTED |_|_AggregateExec: mode=Partial, gby=[b@0 as b, a@1 as a], aggr=[sum(s.m)], statistics=[Rows=Absent, Bytes=Absent, [(Col[0]:),(Col[1]:),(Col[2]:)]]_| |_|_MergeScanExec: REDACTED |_|_| | physical_plan_with_schema_| ProjectionExec: expr=[a@1 as a, b@0 as b, sum(s.m)@2 as sum(s.m)], schema=[a:Utf8;N, b:Utf8;N, sum(s.m):Int64;N]_| |_|_AggregateExec: mode=FinalPartitioned, gby=[b@0 as b, a@1 as a], aggr=[sum(s.m)], schema=[b:Utf8;N, a:Utf8;N, sum(s.m):Int64;N]_| -|_|_RepartitionExec: partitioning=Hash([b@0, a@1], 32), input_partitions=32, schema=[b:Utf8;N, a:Utf8;N, sum(s.m)[sum]:Int64;N]_| +|_|_RepartitionExec: partitioning=REDACTED |_|_AggregateExec: mode=Partial, gby=[b@0 as b, a@1 as a], aggr=[sum(s.m)], schema=[b:Utf8;N, a:Utf8;N, sum(s.m)[sum]:Int64;N]_| |_|_MergeScanExec: REDACTED |_|_| @@ -228,6 +229,7 @@ GROUP BY b, a; -- SQLNESS REPLACE (-+) - -- SQLNESS REPLACE (\s\s+) _ +-- SQLNESS REPLACE (Hash.*) REDACTED -- SQLNESS REPLACE (metrics.*) REDACTED -- SQLNESS REPLACE (peers.*) REDACTED -- SQLNESS REPLACE (RoundRobinBatch.*) REDACTED @@ -246,7 +248,7 @@ GROUP BY b, a; +-+-+-+ | 0_| 0_|_ProjectionExec: expr=[a@1 as a, b@0 as b, sum(s.m)@2 as sum(s.m)] REDACTED |_|_|_AggregateExec: mode=FinalPartitioned, gby=[b@0 as b, a@1 as a], aggr=[sum(s.m)] REDACTED -|_|_|_RepartitionExec: partitioning=Hash([b@0, a@1], 32), input_partitions=32 REDACTED +|_|_|_RepartitionExec: partitioning=REDACTED |_|_|_AggregateExec: mode=Partial, gby=[b@0 as b, a@1 as a], aggr=[sum(s.m)] REDACTED |_|_|_MergeScanExec: REDACTED |_|_|_| @@ -255,7 +257,7 @@ GROUP BY b, a; |_|_|_AggregateExec: mode=Partial, gby=[b@1 as b, a@0 as a], aggr=[__sum_state(s.m)] REDACTED |_|_|_ProjectionExec: expr=[a@0 as a, b@1 as b, min(reduce_aggregate_repartition.val)@3 as m] REDACTED |_|_|_AggregateExec: mode=FinalPartitioned, gby=[a@0 as a, b@1 as b, c@2 as c], aggr=[min(reduce_aggregate_repartition.val)] REDACTED -|_|_|_RepartitionExec: partitioning=Hash([a@0, b@1, c@2], 32), input_partitions=32 REDACTED +|_|_|_RepartitionExec: partitioning=REDACTED |_|_|_AggregateExec: mode=Partial, gby=[a@0 as a, b@1 as b, c@2 as c], aggr=[min(reduce_aggregate_repartition.val)] REDACTED |_|_|_SeqScan: region=REDACTED, "partition_count":{"count":1, "mem_ranges":1, "files":0, "file_ranges":0} REDACTED |_|_|_| @@ -264,7 +266,7 @@ GROUP BY b, a; |_|_|_AggregateExec: mode=Partial, gby=[b@1 as b, a@0 as a], aggr=[__sum_state(s.m)] REDACTED |_|_|_ProjectionExec: expr=[a@0 as a, b@1 as b, min(reduce_aggregate_repartition.val)@3 as m] REDACTED |_|_|_AggregateExec: mode=FinalPartitioned, gby=[a@0 as a, b@1 as b, c@2 as c], aggr=[min(reduce_aggregate_repartition.val)] REDACTED -|_|_|_RepartitionExec: partitioning=Hash([a@0, b@1, c@2], 32), input_partitions=32 REDACTED +|_|_|_RepartitionExec: partitioning=REDACTED |_|_|_AggregateExec: mode=Partial, gby=[a@0 as a, b@1 as b, c@2 as c], aggr=[min(reduce_aggregate_repartition.val)] REDACTED |_|_|_SeqScan: region=REDACTED, "partition_count":{"count":1, "mem_ranges":1, "files":0, "file_ranges":0} REDACTED |_|_|_| @@ -287,6 +289,7 @@ FROM ( -- SQLNESS REPLACE (-+) - -- SQLNESS REPLACE (\s\s+) _ +-- SQLNESS REPLACE (Hash.*) REDACTED -- SQLNESS REPLACE (metrics.*) REDACTED -- SQLNESS REPLACE (peers.*) REDACTED -- SQLNESS REPLACE (RoundRobinBatch.*) REDACTED @@ -312,7 +315,7 @@ FROM ( |_|_|_AggregateExec: mode=Partial, gby=[], aggr=[__sum_state(s.m)] REDACTED |_|_|_ProjectionExec: expr=[min(reduce_aggregate_repartition.val)@3 as m] REDACTED |_|_|_AggregateExec: mode=FinalPartitioned, gby=[a@0 as a, b@1 as b, c@2 as c], aggr=[min(reduce_aggregate_repartition.val)] REDACTED -|_|_|_RepartitionExec: partitioning=Hash([a@0, b@1, c@2], 32), input_partitions=32 REDACTED +|_|_|_RepartitionExec: partitioning=REDACTED |_|_|_AggregateExec: mode=Partial, gby=[a@0 as a, b@1 as b, c@2 as c], aggr=[min(reduce_aggregate_repartition.val)] REDACTED |_|_|_SeqScan: region=REDACTED, "partition_count":{"count":1, "mem_ranges":1, "files":0, "file_ranges":0} REDACTED |_|_|_| @@ -321,7 +324,7 @@ FROM ( |_|_|_AggregateExec: mode=Partial, gby=[], aggr=[__sum_state(s.m)] REDACTED |_|_|_ProjectionExec: expr=[min(reduce_aggregate_repartition.val)@3 as m] REDACTED |_|_|_AggregateExec: mode=FinalPartitioned, gby=[a@0 as a, b@1 as b, c@2 as c], aggr=[min(reduce_aggregate_repartition.val)] REDACTED -|_|_|_RepartitionExec: partitioning=Hash([a@0, b@1, c@2], 32), input_partitions=32 REDACTED +|_|_|_RepartitionExec: partitioning=REDACTED |_|_|_AggregateExec: mode=Partial, gby=[a@0 as a, b@1 as b, c@2 as c], aggr=[min(reduce_aggregate_repartition.val)] REDACTED |_|_|_SeqScan: region=REDACTED, "partition_count":{"count":1, "mem_ranges":1, "files":0, "file_ranges":0} REDACTED |_|_|_| @@ -369,6 +372,7 @@ ORDER BY b; -- SQLNESS REPLACE (-+) - -- SQLNESS REPLACE (\s\s+) _ +-- SQLNESS REPLACE (Hash.*) REDACTED -- SQLNESS REPLACE (metrics.*) REDACTED -- SQLNESS REPLACE (peers.*) REDACTED -- SQLNESS REPLACE (RoundRobinBatch.*) REDACTED @@ -382,17 +386,17 @@ GROUP BY b; | stage | node | plan_| +-+-+-+ | 0_| 0_|_AggregateExec: mode=FinalPartitioned, gby=[b@0 as b], aggr=[sum(reduce_aggregate_repartition_non_subset.val)] REDACTED -|_|_|_RepartitionExec: partitioning=Hash([b@0], 32), input_partitions=32 REDACTED +|_|_|_RepartitionExec: partitioning=REDACTED |_|_|_AggregateExec: mode=Partial, gby=[b@0 as b], aggr=[sum(reduce_aggregate_repartition_non_subset.val)] REDACTED |_|_|_MergeScanExec: REDACTED |_|_|_| | 1_| 0_|_AggregateExec: mode=FinalPartitioned, gby=[b@0 as b], aggr=[__sum_state(reduce_aggregate_repartition_non_subset.val)] REDACTED -|_|_|_RepartitionExec: partitioning=Hash([b@0], 32), input_partitions=32 REDACTED +|_|_|_RepartitionExec: partitioning=REDACTED |_|_|_AggregateExec: mode=Partial, gby=[b@0 as b], aggr=[__sum_state(reduce_aggregate_repartition_non_subset.val)] REDACTED |_|_|_SeqScan: region=REDACTED, "partition_count":{"count":1, "mem_ranges":1, "files":0, "file_ranges":0} REDACTED |_|_|_| | 1_| 1_|_AggregateExec: mode=FinalPartitioned, gby=[b@0 as b], aggr=[__sum_state(reduce_aggregate_repartition_non_subset.val)] REDACTED -|_|_|_RepartitionExec: partitioning=Hash([b@0], 32), input_partitions=32 REDACTED +|_|_|_RepartitionExec: partitioning=REDACTED |_|_|_AggregateExec: mode=Partial, gby=[b@0 as b], aggr=[__sum_state(reduce_aggregate_repartition_non_subset.val)] REDACTED |_|_|_SeqScan: region=REDACTED, "partition_count":{"count":1, "mem_ranges":1, "files":0, "file_ranges":0} REDACTED |_|_|_| diff --git a/tests/cases/standalone/optimizer/reduce_aggregate_repartition.sql b/tests/cases/standalone/optimizer/reduce_aggregate_repartition.sql index 75a55c9a4e..1597c0a6cf 100644 --- a/tests/cases/standalone/optimizer/reduce_aggregate_repartition.sql +++ b/tests/cases/standalone/optimizer/reduce_aggregate_repartition.sql @@ -31,6 +31,7 @@ ORDER BY a, b; -- SQLNESS REPLACE (-+) - -- SQLNESS REPLACE (\s\s+) _ +-- SQLNESS REPLACE (Hash.*) REDACTED -- SQLNESS REPLACE (peers.*) REDACTED EXPLAIN VERBOSE SELECT a, b, sum(m) @@ -43,6 +44,7 @@ GROUP BY b, a; -- SQLNESS REPLACE (-+) - -- SQLNESS REPLACE (\s\s+) _ +-- SQLNESS REPLACE (Hash.*) REDACTED -- SQLNESS REPLACE (metrics.*) REDACTED -- SQLNESS REPLACE (peers.*) REDACTED -- SQLNESS REPLACE (RoundRobinBatch.*) REDACTED @@ -66,6 +68,7 @@ FROM ( -- SQLNESS REPLACE (-+) - -- SQLNESS REPLACE (\s\s+) _ +-- SQLNESS REPLACE (Hash.*) REDACTED -- SQLNESS REPLACE (metrics.*) REDACTED -- SQLNESS REPLACE (peers.*) REDACTED -- SQLNESS REPLACE (RoundRobinBatch.*) REDACTED @@ -106,6 +109,7 @@ ORDER BY b; -- SQLNESS REPLACE (-+) - -- SQLNESS REPLACE (\s\s+) _ +-- SQLNESS REPLACE (Hash.*) REDACTED -- SQLNESS REPLACE (metrics.*) REDACTED -- SQLNESS REPLACE (peers.*) REDACTED -- SQLNESS REPLACE (RoundRobinBatch.*) REDACTED