fix 2.0 p0

apache · Aug 2, 2024 · ed8a50d · ed8a50d
1 parent c639014
commit ed8a50d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 11 deletions.
diff --git a/regression-test/data/empty_relation/eliminate_empty.out b/regression-test/data/empty_relation/eliminate_empty.out
@@ -76,7 +76,7 @@ PhysicalResultSink
 
 -- !null_explain_union_empty_data --
 PhysicalResultSink
---PhysicalDistribute[DistributionSpecGather]
+--PhysicalDistribute
 ----hashAgg[LOCAL]
 ------PhysicalProject
 --------PhysicalOlapScan[nation]
@@ -103,20 +103,20 @@ PhysicalResultSink
 
 -- !null_explain_except_data_empty --
 PhysicalResultSink
---PhysicalDistribute[DistributionSpecGather]
+--PhysicalDistribute
 ----PhysicalProject
 ------hashAgg[LOCAL]
 --------PhysicalProject
 ----------PhysicalOlapScan[nation]
 
 -- !null_explain_except_data_empty_data --
 PhysicalResultSink
---PhysicalDistribute[DistributionSpecGather]
+--PhysicalDistribute
 ----PhysicalExcept
-------PhysicalDistribute[DistributionSpecHash]
+------PhysicalDistribute
 --------PhysicalProject
 ----------PhysicalOlapScan[nation]
-------PhysicalDistribute[DistributionSpecHash]
+------PhysicalDistribute
 --------PhysicalProject
 ----------filter(( not (n_nationkey = 1)))
 ------------PhysicalOlapScan[nation]
@@ -139,11 +139,25 @@ PhysicalResultSink
 
 -- !prune_partition1 --
 PhysicalResultSink
---PhysicalEmptyRelation
+--PhysicalDistribute
+----PhysicalProject
+------hashAgg[GLOBAL]
+--------PhysicalDistribute
+----------hashAgg[LOCAL]
+------------PhysicalProject
+--------------filter((eliminate_partition_prune.k1 = 100))
+----------------PhysicalOlapScan[eliminate_partition_prune]
 
 -- !prune_partition2 --
 PhysicalResultSink
---PhysicalEmptyRelation
+--PhysicalDistribute
+----PhysicalProject
+------hashAgg[GLOBAL]
+--------PhysicalDistribute
+----------hashAgg[LOCAL]
+------------PhysicalProject
+--------------filter((eliminate_partition_prune.k1 = 100))
+----------------PhysicalOlapScan[eliminate_partition_prune]
 
 -- !join_with_empty_child --
 2	8	e	v	3

diff --git a/regression-test/suites/nereids_rules_p0/partition_prune/test_multi_range_partition.groovy b/regression-test/suites/nereids_rules_p0/partition_prune/test_multi_range_partition.groovy
@@ -169,12 +169,12 @@ suite("test_multi_range_partition") {
 
     explain {
         sql "select * from pt where k1=7 and k2 in (null);"
-        contains "partitions=0/3"
+        contains "VEMPTYSET"
     }
 
     explain {
         sql "select * from pt where k1=7 and k2 not in (null);"
-        contains "partitions=0/3"
+        contains "VEMPTYSET"
     }
 
     explain {
@@ -189,13 +189,13 @@ suite("test_multi_range_partition") {
 
     explain {
         sql "select * from pt where k2 in (null);"
-        contains "partitions=0/3"
+        contains "VEMPTYSET"
     }
 
     // p1/p2/p3 NOT pruned
     explain {
         sql "select * from pt where k2 not in (null)"
-        contains "partitions=0/3"
+        contains "VEMPTYSET"
     }
 
     explain {