fix test

fix

fix

src/Interpreters/InterpreterSelectWithUnionQuery.cpp

@@ -33,10 +33,8 @@ struct CustomizeASTSelectWithUnionQueryNormalize
     {
         if (auto * inner_union = ast_select->as<ASTSelectWithUnionQuery>())
         {
-            /// We need flatten from last to first
+            for (auto & child : inner_union->list_of_selects->children)
-            for (auto child = inner_union->list_of_selects->children.rbegin(); child != inner_union->list_of_selects->children.rend();
+                getSelectsFromUnionListNode(child, selects);
-                 ++child)
-                getSelectsFromUnionListNode(*child, selects);
 
             return;
         }
@@ -85,13 +83,13 @@ struct CustomizeASTSelectWithUnionQueryNormalize
                 auto distinct_list = std::make_shared<ASTSelectWithUnionQuery>();
                 distinct_list->list_of_selects = std::make_shared<ASTExpressionList>();
                 distinct_list->children.push_back(distinct_list->list_of_selects);
-                for (int j = i + 1; j >= 0; j--)
+
+                for (int j = 0; j <= i + 1; ++j)
                 {
                     getSelectsFromUnionListNode(select_list[j], distinct_list->list_of_selects->children);
                 }
+
                 distinct_list->union_mode = ASTSelectWithUnionQuery::Mode::DISTINCT;
-                // Reverse children list
-                std::reverse(distinct_list->list_of_selects->children.begin(), distinct_list->list_of_selects->children.end());
                 distinct_list->is_normalized = true;
                 selects.push_back(std::move(distinct_list));
                 break;

src/Parsers/ParserSelectWithUnionQuery.cpp

@@ -38,7 +38,7 @@ bool ParserSelectWithUnionQuery::parseImpl(Pos & pos, ASTPtr & node, Expected &
     auto select_with_union_query = std::make_shared<ASTSelectWithUnionQuery>();
 
     node = select_with_union_query;
-    select_with_union_query->list_of_selects = list_node; //std::make_shared<ASTExpressionList>();
+    select_with_union_query->list_of_selects = list_node;
     select_with_union_query->children.push_back(select_with_union_query->list_of_selects);
     select_with_union_query->list_of_modes = parser.getUnionModes();
 

tests/queries/0_stateless/01556_explain_select_with_union_query.reference

@@ -1,252 +1,324 @@
 Union
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
 Union
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
 Distinct
   Union
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
 Distinct
   Union
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
 Distinct
   Union
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
 Distinct
   Union
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
 Union
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Distinct
     Union
       Expression (Projection)
         Expression (Before ORDER BY and SELECT)
-          ReadFromStorage (Read from SystemOne)
+          SettingQuotaAndLimits (Set limits and quota after reading from storage)
+            ReadFromStorage (SystemOne)
       Expression (Projection)
         Expression (Before ORDER BY and SELECT)
-          ReadFromStorage (Read from SystemOne)
+          SettingQuotaAndLimits (Set limits and quota after reading from storage)
+            ReadFromStorage (SystemOne)
       Expression (Projection)
         Expression (Before ORDER BY and SELECT)
-          ReadFromStorage (Read from SystemOne)
+          SettingQuotaAndLimits (Set limits and quota after reading from storage)
+            ReadFromStorage (SystemOne)
   Distinct
     Union
       Expression (Projection)
         Expression (Before ORDER BY and SELECT)
-          ReadFromStorage (Read from SystemOne)
+          SettingQuotaAndLimits (Set limits and quota after reading from storage)
+            ReadFromStorage (SystemOne)
       Expression (Projection)
         Expression (Before ORDER BY and SELECT)
-          ReadFromStorage (Read from SystemOne)
+          SettingQuotaAndLimits (Set limits and quota after reading from storage)
+            ReadFromStorage (SystemOne)
       Expression (Projection)
         Expression (Before ORDER BY and SELECT)
-          ReadFromStorage (Read from SystemOne)
+          SettingQuotaAndLimits (Set limits and quota after reading from storage)
+            ReadFromStorage (SystemOne)
       Expression (Projection)
         Expression (Before ORDER BY and SELECT)
-          ReadFromStorage (Read from SystemOne)
+          SettingQuotaAndLimits (Set limits and quota after reading from storage)
+            ReadFromStorage (SystemOne)
       Expression (Projection)
         Expression (Before ORDER BY and SELECT)
-          ReadFromStorage (Read from SystemOne)
+          SettingQuotaAndLimits (Set limits and quota after reading from storage)
+            ReadFromStorage (SystemOne)
       Expression (Projection)
         Expression (Before ORDER BY and SELECT)
-          ReadFromStorage (Read from SystemOne)
+          SettingQuotaAndLimits (Set limits and quota after reading from storage)
+            ReadFromStorage (SystemOne)
 Distinct
   Union
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
 Distinct
   Union
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
 Distinct
   Union
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
 Union
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
 Union
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
 Union
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
 Distinct
   Union
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
 Distinct
   Union
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
 Distinct
   Union
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
     Expression (Projection)
       Expression (Before ORDER BY and SELECT)
-        ReadFromStorage (Read from SystemOne)
+        SettingQuotaAndLimits (Set limits and quota after reading from storage)
+          ReadFromStorage (SystemOne)
 Union
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Distinct
     Union
       Expression (Projection)
         Expression (Before ORDER BY and SELECT)
-          ReadFromStorage (Read from SystemOne)
+          SettingQuotaAndLimits (Set limits and quota after reading from storage)
+            ReadFromStorage (SystemOne)
       Expression (Projection)
         Expression (Before ORDER BY and SELECT)
-          ReadFromStorage (Read from SystemOne)
+          SettingQuotaAndLimits (Set limits and quota after reading from storage)
+            ReadFromStorage (SystemOne)
       Expression (Projection)
         Expression (Before ORDER BY and SELECT)
-          ReadFromStorage (Read from SystemOne)
+          SettingQuotaAndLimits (Set limits and quota after reading from storage)
+            ReadFromStorage (SystemOne)
       Expression (Projection)
         Expression (Before ORDER BY and SELECT)
-          ReadFromStorage (Read from SystemOne)
+          SettingQuotaAndLimits (Set limits and quota after reading from storage)
+            ReadFromStorage (SystemOne)
 Union
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
 Union
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
 Union
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)
   Expression (Projection)
     Expression (Before ORDER BY and SELECT)
-      ReadFromStorage (Read from SystemOne)
+      SettingQuotaAndLimits (Set limits and quota after reading from storage)
+        ReadFromStorage (SystemOne)