[CBO] Hints warning messages improvement

Author: pashandor789

ydb/library/yql/core/cbo/cbo_optimizer_new.h

@@ -101,15 +101,15 @@ struct TCardinalityHints {
 struct TJoinAlgoHints {
     struct TJoinAlgoHint {
         TVector<TString> JoinLabels;
-        EJoinAlgoType JoinHint;
+        EJoinAlgoType Algo;
         TString StringRepr;
         bool Applied = false;
     };
 
     TVector<TJoinAlgoHint> Hints;
 
-    void PushBack(TVector<TString> labels, EJoinAlgoType joinHint, TString stringRepr) {
-        Hints.push_back({.JoinLabels = std::move(labels), .JoinHint = joinHint, .StringRepr = std::move(stringRepr)});
+    void PushBack(TVector<TString> labels, EJoinAlgoType algo, TString stringRepr) {
+        Hints.push_back({.JoinLabels = std::move(labels), .Algo = algo, .StringRepr = std::move(stringRepr)});
     }
 };
 

ydb/library/yql/dq/opt/dq_opt_dphyp_solver.h

@@ -420,19 +420,20 @@ template <typename TNodeSet> std::shared_ptr<TJoinOptimizerNodeInternal> TDPHypS
     const TVector<TString>& rightJoinKeys,
     IProviderContext& ctx,
     TCardinalityHints::TCardinalityHint* maybeCardHint,
-    TJoinAlgoHints::TJoinAlgoHint* maybeJoinHint
+    TJoinAlgoHints::TJoinAlgoHint* maybeJoinAlgoHint
 ) {
+    if (maybeJoinAlgoHint) {
+        maybeJoinAlgoHint->Applied = true;
+        return MakeJoinInternal(left, right, joinConditions, leftJoinKeys, rightJoinKeys, joinKind, maybeJoinAlgoHint->Algo, leftAny, rightAny, ctx, maybeCardHint);
+    }
+
     double bestCost = std::numeric_limits<double>::infinity();
     EJoinAlgoType bestAlgo = EJoinAlgoType::Undefined;
     bool bestJoinIsReversed = false;
 
     for (auto joinAlgo : AllJoinAlgos) {
         if (ctx.IsJoinApplicable(left, right, joinConditions, leftJoinKeys, rightJoinKeys, joinAlgo, joinKind)){
             auto cost = ctx.ComputeJoinStats(*left->Stats, *right->Stats, leftJoinKeys, rightJoinKeys, joinAlgo, joinKind, maybeCardHint).Cost;
-            if (maybeJoinHint && joinAlgo == maybeJoinHint->JoinHint) {
-                cost = -1;
-                maybeJoinHint->Applied = true;
-            }
             if (cost < bestCost) {
                 bestCost = cost;
                 bestAlgo = joinAlgo;
@@ -443,10 +444,6 @@ template <typename TNodeSet> std::shared_ptr<TJoinOptimizerNodeInternal> TDPHypS
         if (isCommutative) {
             if (ctx.IsJoinApplicable(right, left, reversedJoinConditions, rightJoinKeys, leftJoinKeys, joinAlgo, joinKind)){
                 auto cost = ctx.ComputeJoinStats(*right->Stats, *left->Stats,  rightJoinKeys, leftJoinKeys, joinAlgo, joinKind, maybeCardHint).Cost;
-                if (maybeJoinHint && joinAlgo == maybeJoinHint->JoinHint) {
-                    cost = -1;
-                    maybeJoinHint->Applied = true;
-                }
                 if (cost < bestCost) {
                     bestCost = cost;
                     bestAlgo = joinAlgo;