fix

ydb-platform · Nov 25, 2024 · 156b603 · 156b603
1 parent a04d541
commit 156b603
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/ydb/core/kqp/opt/logical/kqp_opt_log.cpp b/ydb/core/kqp/opt/logical/kqp_opt_log.cpp
@@ -94,7 +94,7 @@ class TKqpLogicalOptTransformer : public TOptimizeTransformerBase {
 
         if (status == TStatus::Ok) {
             for (const auto& hint: KqpCtx.GetOptimizerHints().GetUnappliedString()) {
-                ctx.AddWarning(YqlIssue({}, TIssuesIds::DQ_OPTIMIZE_ERROR, "Unapplied hint: " + hint));
+                ctx.AddWarning(YqlIssue({}, TIssuesIds::YQL_UNUSED_HINT, "Unapplied hint: " + hint));
             }
         }
 

diff --git a/ydb/library/yql/dq/opt/dq_opt_join_cost_based.cpp b/ydb/library/yql/dq/opt/dq_opt_join_cost_based.cpp
@@ -235,9 +235,10 @@ void ComputeStatistics(const std::shared_ptr<TJoinOptimizerNode>& join, IProvide
 
 class TOptimizerNativeNew: public IOptimizerNew {
 public:
-    TOptimizerNativeNew(IProviderContext& ctx, ui32 maxDPhypDPTableSize)
+    TOptimizerNativeNew(IProviderContext& ctx, ui32 maxDPhypDPTableSize, TExprContext* exprCtx = nullptr)
         : IOptimizerNew(ctx)
-        , MaxDPhypTableSize_(maxDPhypDPTableSize)
+        , MaxDPHypTableSize_(maxDPhypDPTableSize)
+        , ExprCtx(exprCtx)
     {}
 
     std::shared_ptr<TJoinOptimizerNode> JoinSearch(
@@ -272,8 +273,17 @@ class TOptimizerNativeNew: public IOptimizerNew {
         TJoinHypergraph<TNodeSet> hypergraph = MakeJoinHypergraph<TNodeSet>(joinTree, hints);
         TDPHypSolver<TNodeSet> solver(hypergraph, this->Pctx);
 
-        if (solver.CountCC(MaxDPhypTableSize_) >= MaxDPhypTableSize_) {
+        if (solver.CountCC(MaxDPHypTableSize_) >= MaxDPHypTableSize_) {
             YQL_CLOG(TRACE, CoreDq) << "Maximum DPhyp threshold exceeded";
+            if (ExprCtx) {
+                ExprCtx.AddWarning(
+                    YqlIssue(
+                        {}, TIssuesIds::DQ_OPTIMIZE_ERROR, 
+                        "Cost Based Optimizer didn't work: "
+                        "Enumeration is too large, use PRAGMA MaxDPHypDPTableSize='4294967295' to disable the limitation"
+                    )
+                );
+            }
             ComputeStatistics(joinTree, this->Pctx);
             return joinTree;
         }
@@ -304,11 +314,12 @@ class TOptimizerNativeNew: public IOptimizerNew {
     }
 
 private:
-    ui32 MaxDPhypTableSize_;
+    ui32 MaxDPHypTableSize_;
+    TExprContext* ExprCtx;
 };
 
-IOptimizerNew* MakeNativeOptimizerNew(IProviderContext& ctx, const ui32 maxDPhypDPTableSize) {
-    return new TOptimizerNativeNew(ctx, maxDPhypDPTableSize);
+IOptimizerNew* MakeNativeOptimizerNew(IProviderContext& ctx, const ui32 maxDPhypDPTableSize, TExprContext* exprCtx = nullptr) {
+    return new TOptimizerNativeNew(ctx, maxDPhypDPTableSize, exprCtx);
 }
 
 TExprBase DqOptimizeEquiJoinWithCosts(
@@ -357,7 +368,7 @@ TExprBase DqOptimizeEquiJoinWithCosts(
     // of the EquiJoin and n-1 argument are the parameters to EquiJoin
 
     if (!DqCollectJoinRelationsWithStats(rels, typesCtx, equiJoin, providerCollect)){
-        ctx.AddWarning(YqlIssue({}, TIssuesIds::WARNING, "Cost Based Optimizer didn't work: couldn't load statistics"));
+        ctx.AddWarning(YqlIssue({}, TIssuesIds::DQ_OPTIMIZE_ERROR, "Cost Based Optimizer didn't work: couldn't load statistics"));
         return node;
     }