Fix: expression description in plan after lift up unioin optimization

2024-11-09 17:14:47 +00:00 · 2024-08-31 12:09:02 +00:00 · 2024-08-31 12:09:02 +00:00 · a6145e5099
commit a6145e5099
parent e7f403a27e
5 changed files with 18 additions and 18 deletions
--- a/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.reference
+++ b/tests/queries/0_stateless/01952_optimize_distributed_group_by_sharding_key.reference
@ -21,7 +21,7 @@ Expression (Projection)
    Union
      Expression ((Before LIMIT BY + (Before ORDER BY + (Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Projection + Before ORDER BY))))))
        ReadFromSystemNumbers
-      Expression
+      Expression (Before LIMIT BY)
        ReadFromRemote (Read from remote replica)
 explain select distinct on (k1, k2) v from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- optimized
 Union
@ -96,7 +96,7 @@ Expression (Project names)
        LimitBy
          Expression ((Before LIMIT BY + (Projection + (Change column names to column identifiers + (Convert VIEW subquery result to VIEW table structure + (Materialize constants after VIEW subquery + (Project names + (Projection + (Change column names to column identifiers + (Project names + (Projection + Change column names to column identifiers)))))))))))
            ReadFromSystemNumbers
-      Expression
+      Expression (Before LIMIT BY)
        ReadFromRemote (Read from remote replica)
 explain select distinct on (k1, k2) v from remote('127.{1,2}', view(select 1 k1, 2 k2, 3 v from numbers(2)), cityHash64(k1, k2)); -- optimized
 Union
--- a/tests/queries/0_stateless/02496_remove_redundant_sorting.reference
+++ b/tests/queries/0_stateless/02496_remove_redundant_sorting.reference
@ -395,9 +395,9 @@ Expression ((Projection + Before ORDER BY))
        Union
          Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
            ReadFromStorage (SystemOne)
-          Expression (( + (Conversion before UNION + (Projection + Before ORDER BY))))
+          Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
            ReadFromStorage (SystemOne)
-          Expression (( + (Conversion before UNION + (Projection + Before ORDER BY))))
+          Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
            ReadFromStorage (SystemOne)
 -- execute
 Float64	9007199254740994
@ -427,9 +427,9 @@ Expression ((Projection + Before ORDER BY))
        Union
          Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
            ReadFromStorage (SystemOne)
-          Expression (( + (Conversion before UNION + (Projection + Before ORDER BY))))
+          Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
            ReadFromStorage (SystemOne)
-          Expression (( + (Conversion before UNION + (Projection + Before ORDER BY))))
+          Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
            ReadFromStorage (SystemOne)
 -- execute
 Nullable(Float64)	9007199254740994
@ -459,9 +459,9 @@ Expression ((Projection + Before ORDER BY))
        Union
          Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
            ReadFromStorage (SystemOne)
-          Expression (( + (Conversion before UNION + (Projection + Before ORDER BY))))
+          Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
            ReadFromStorage (SystemOne)
-          Expression (( + (Conversion before UNION + (Projection + Before ORDER BY))))
+          Expression ((Before ORDER BY + (Conversion before UNION + (Projection + Before ORDER BY))))
            ReadFromStorage (SystemOne)
 -- execute
 Float64	9007199254740994
--- a/tests/queries/0_stateless/02496_remove_redundant_sorting_analyzer.reference
+++ b/tests/queries/0_stateless/02496_remove_redundant_sorting_analyzer.reference
@ -394,9 +394,9 @@ Expression ((Project names + Projection))
        Union
          Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
            ReadFromStorage (SystemOne)
-          Expression (( + ( + ( + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+          Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
            ReadFromStorage (SystemOne)
-          Expression (( + ( + ( + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+          Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
            ReadFromStorage (SystemOne)
 -- execute
 Float64	9007199254740994
@ -426,9 +426,9 @@ Expression ((Project names + Projection))
        Union
          Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
            ReadFromStorage (SystemOne)
-          Expression (( + ( + ( + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+          Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
            ReadFromStorage (SystemOne)
-          Expression (( + ( + ( + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+          Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
            ReadFromStorage (SystemOne)
 -- execute
 Nullable(Float64)	9007199254740994
@ -458,9 +458,9 @@ Expression ((Project names + Projection))
        Union
          Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
            ReadFromStorage (SystemOne)
-          Expression (( + ( + ( + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+          Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
            ReadFromStorage (SystemOne)
-          Expression (( + ( + ( + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
+          Expression ((Before ORDER BY + (Projection + (Change column names to column identifiers + (Conversion before UNION + (Project names + (Projection + Change column names to column identifiers)))))))
            ReadFromStorage (SystemOne)
 -- execute
 Float64	9007199254740994
--- a/tests/queries/0_stateless/02500_remove_redundant_distinct.reference
+++ b/tests/queries/0_stateless/02500_remove_redundant_distinct.reference
@ -53,7 +53,7 @@ Expression (Projection)
              Distinct (Preliminary DISTINCT)
                Expression (Before ORDER BY)
                  ReadFromSystemNumbers
-          Expression (( + Projection))
+          Expression ((Before ORDER BY + Projection))
            Distinct
              Distinct (Preliminary DISTINCT)
                Expression (Before ORDER BY)
@ -536,7 +536,7 @@ Expression (Projection)
              Distinct (Preliminary DISTINCT)
                Expression (Before ORDER BY)
                  ReadFromSystemNumbers
-          Expression (( + Projection))
+          Expression ((Before ORDER BY + Projection))
            Distinct
              Distinct (Preliminary DISTINCT)
                Expression (Before ORDER BY)
--- a/tests/queries/0_stateless/02500_remove_redundant_distinct_analyzer.reference
+++ b/tests/queries/0_stateless/02500_remove_redundant_distinct_analyzer.reference
@ -54,7 +54,7 @@ Expression (Project names)
                Distinct (Preliminary DISTINCT)
                  Expression ((Projection + Change column names to column identifiers))
                    ReadFromSystemNumbers
-            Expression (( + ( + Project names)))
+            Expression ((Projection + (Change column names to column identifiers + Project names)))
              Distinct (DISTINCT)
                Distinct (Preliminary DISTINCT)
                  Expression ((Projection + Change column names to column identifiers))
@ -542,7 +542,7 @@ Expression (Project names)
                Distinct (Preliminary DISTINCT)
                  Expression ((Projection + Change column names to column identifiers))
                    ReadFromSystemNumbers
-            Expression (( + ( + Project names)))
+            Expression ((Projection + (Change column names to column identifiers + Project names)))
              Distinct (DISTINCT)
                Distinct (Preliminary DISTINCT)
                  Expression ((Projection + Change column names to column identifiers))