Merge d41beaa into 1ca8874

Author: pashandor789

ydb/core/kqp/ut/join/data/queries/join_order_hints_complex.sql

@@ -2,15 +2,15 @@ PRAGMA TablePathPrefix='/Root';
 
 PRAGMA ydb.OptimizerHints = 
 '
-    Card(Unused # 10e8)
+    Rows(Unused # 10e8)
     JoinOrder( (Unused1 Unused2) (Unused3 Unused4) )
 
-    Card(R # 10e8)
-    Card(T # 1)
-    Card(R T # 1)
-    Card(R S # 10e8)
-    Card(T U # 10e8)
-    Card(V # 1)
+    Rows(R # 10e8)
+    Rows(T # 1)
+    Rows(R T # 1)
+    Rows(R S # 10e8)
+    Rows(T U # 10e8)
+    Rows(V # 1)
     JoinOrder( (R S) (T U) )
 ';
 

ydb/core/kqp/ut/join/data/queries/join_order_hints_many_hint_trees.sql

@@ -2,12 +2,12 @@ PRAGMA TablePathPrefix='/Root';
 
 PRAGMA ydb.OptimizerHints = 
 '
-    Card(R # 10e8)
-    Card(T # 1)
-    Card(R T # 1)
-    Card(R S # 10e8)
-    Card(T U # 10e8)
-    Card(V # 1)
+    Rows(R # 10e8)
+    Rows(T # 1)
+    Rows(R T # 1)
+    Rows(R S # 10e8)
+    Rows(T U # 10e8)
+    Rows(V # 1)
     JoinOrder(T U)
     JoinOrder(R S)
 ';

ydb/core/kqp/ut/join/data/queries/join_order_hints_simple.sql

@@ -2,11 +2,11 @@ PRAGMA TablePathPrefix='/Root';
 
 PRAGMA ydb.OptimizerHints = 
 '
-    Card(R # 10e8) 
-    Card(T # 1) 
-    Card(S # 10e8) 
-    Card(R T # 1) 
-    Card(R S # 10e8) 
+    Rows(R # 10e8) 
+    Rows(T # 1) 
+    Rows(S # 10e8) 
+    Rows(R T # 1) 
+    Rows(R S # 10e8) 
     JoinOrder(T (R S))
 ';
 

ydb/library/yql/core/cbo/cbo_hints.cpp

@@ -22,13 +22,13 @@ class TOptimizerHintsParser {
 private:
     void Start() {
         while (Pos < Size) {
-            auto hintType = Keyword({"JoinOrder", "JoinAlgo", "Card"});
-            if (hintType == "JoinOrder") {
-                JoinOrder();
-            } else if (hintType == "JoinAlgo") {
-                JoinAlgo();
-            } else if (hintType == "Card"){
-                Card();
+            auto hintType = Keyword({"JoinOrder", "Leading", "JoinType", "Rows"});
+            if (hintType == "JoinOrder" || hintType == "Leading") {
+                JoinOrder(hintType == "Leading");
+            } else if (hintType == "JoinType") {
+                JoinType();
+            } else if (hintType == "Rows"){
+                Rows();
             } else {
                 ParseError(Sprintf("Undefined hints type: %s", hintType.c_str()), Pos - hintType.Size());
             }
@@ -45,43 +45,46 @@ class TOptimizerHintsParser {
         return labels;
     }
 
-    void JoinAlgo() {        
+    void JoinType() {        
         i32 beginPos = Pos + 1;
 
         Keyword({"("});
 
         i32 labelsBeginPos = Pos + 1;
         TVector<TString> labels = CollectLabels();
         if (labels.size() <= 1) {
-            ParseError(Sprintf("Bad labels for JoinAlgo hint: %s, example of the format: JoinAlgo(t1 t2 Grace)", JoinSeq(", ", labels).c_str()), labelsBeginPos);
+            ParseError(Sprintf("Bad labels for JoinType hint: %s, example of the format: JoinType(t1 t2 Shuffle)", JoinSeq(", ", labels).c_str()), labelsBeginPos);
         }
         TString reqJoinAlgoStr = std::move(labels.back());
         labels.pop_back();
 
         Keyword({")"});
 
         TVector<EJoinAlgoType> joinAlgos = {EJoinAlgoType::GraceJoin, EJoinAlgoType::LookupJoin, EJoinAlgoType::MapJoin};
-        TVector<TString> joinAlgosStr = {"Grace", "Lookup", "Map"};
+        TVector<TString> joinAlgosStr = {"Shuffle", "Lookup", "Broadcast"};
 
-        for (const auto& [joinAlgo, joinAlgoStr]: Zip(joinAlgos, joinAlgosStr)) {
+        for (const auto& [JoinType, joinAlgoStr]: Zip(joinAlgos, joinAlgosStr)) {
             if (reqJoinAlgoStr == joinAlgoStr) {
-                Hints.JoinAlgoHints->PushBack(std::move(labels), joinAlgo, "JoinAlgo" + Text.substr(beginPos, Pos - beginPos + 1));
+                Hints.JoinAlgoHints->PushBack(std::move(labels), JoinType, "JoinType" + Text.substr(beginPos, Pos - beginPos + 1));
                 return;
             }
         }
 
-        ParseError(Sprintf("Unknown JoinAlgo: '%s', supported algos: [%s]", reqJoinAlgoStr.c_str(), JoinSeq(", ", joinAlgosStr).c_str()), Pos - reqJoinAlgoStr.Size());
+        ParseError(Sprintf("Unknown JoinType: '%s', supported algos: [%s]", reqJoinAlgoStr.c_str(), JoinSeq(", ", joinAlgosStr).c_str()), Pos - reqJoinAlgoStr.Size());
         Y_UNREACHABLE();
     }
 
-    void JoinOrder() {
+    void JoinOrder(bool leading /* is keyword "Leading" or "JoinOrder" */) {
         i32 beginPos = Pos + 1;
 
         Keyword({"("});
         auto joinOrderHintTree = JoinOrderLabels();
         Keyword({")"});
 
-        Hints.JoinOrderHints->PushBack(std::move(joinOrderHintTree), "JoinOrder" + Text.substr(beginPos, Pos - beginPos + 1));
+        Hints.JoinOrderHints->PushBack(
+            std::move(joinOrderHintTree), 
+            leading? "Leading" : "JoinOrder" + Text.substr(beginPos, Pos - beginPos + 1)
+        );
     }
 
     std::shared_ptr<TJoinOrderHints::ITreeNode> JoinOrderLabels() {
@@ -103,7 +106,7 @@ class TOptimizerHintsParser {
         Y_UNREACHABLE();
     }
 
-    void Card() {
+    void Rows() {
         i32 beginPos = Pos + 1;
 
         Keyword({"("});
@@ -124,7 +127,7 @@ class TOptimizerHintsParser {
             default: {ParseError(Sprintf("Unknown operation: '%c'", sign), Pos - 1); Y_UNREACHABLE();}
         }
 
-        Hints.CardinalityHints->PushBack(std::move(labels), op, value, "Card" + Text.substr(beginPos, Pos - beginPos + 1));
+        Hints.CardinalityHints->PushBack(std::move(labels), op, value, "Rows" + Text.substr(beginPos, Pos - beginPos + 1));
     }
 
 private: