Merge 4652438 into 742f46d

ydb-platform · Jan 30, 2024 · 6cc7b36 · 6cc7b36
2 parents 742f46d + 4652438
commit 6cc7b36
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
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
@@ -718,7 +718,7 @@ template <int N> std::bitset<N> TDPccpSolver<N>::NextBitset(const std::bitset<N>
     return res;
 
     // TODO: We can optimize this with a few long integer operations,
-    // but it will only work for 64 bit bitsets
+    // but it will only work for 128 bit bitsets
     // return std::bitset<N>((prev | ~final).to_ulong() + 1) & final;
 }
 
@@ -1014,7 +1014,7 @@ std::shared_ptr<TJoinOptimizerNode> OptimizeSubtree(const std::shared_ptr<TJoinO
         return PickBestNonReorderabeJoin(joinTree->LeftArg, joinTree->RightArg, joinTree->JoinConditions, joinTree->JoinType, ctx);
     }
 
-    TGraph<64> joinGraph;
+    TGraph<128> joinGraph;
     TVector<std::shared_ptr<IBaseOptimizerNode>> rels;
     std::set<std::pair<TJoinColumn, TJoinColumn>> joinConditions;
 
@@ -1024,10 +1024,10 @@ std::shared_ptr<TJoinOptimizerNode> OptimizeSubtree(const std::shared_ptr<TJoinO
         joinGraph.AddNode(i, rels[i]->Labels());
     }
 
-    // Check if we have more rels than DPccp can handle (64)
+    // Check if we have more rels than DPccp can handle (128)
     // If that's the case - don't optimize the plan and just return it with
     // computed statistics
-    if (rels.size() >= 64) {
+    if (rels.size() >= 128) {
         ComputeStatistics(joinTree, ctx);
         return joinTree;
     }
@@ -1055,7 +1055,7 @@ std::shared_ptr<TJoinOptimizerNode> OptimizeSubtree(const std::shared_ptr<TJoinO
         YQL_CLOG(TRACE, CoreDq) << str.str();
     }
 
-    TDPccpSolver<64> solver(joinGraph, rels, ctx);
+    TDPccpSolver<128> solver(joinGraph, rels, ctx);
 
     // Check that the dynamic table of DPccp is not too big
     // If it is, just compute the statistics for the join tree and return it
@@ -1172,7 +1172,7 @@ class TOptimizerNative: public IOptimizer {
 
     TOutput JoinSearch() override {
         auto dummyProviderCtx = TDummyProviderContext();
-        TDPccpSolver<64> solver(JoinGraph, Rels, dummyProviderCtx);
+        TDPccpSolver<128> solver(JoinGraph, Rels, dummyProviderCtx);
         std::shared_ptr<TJoinOptimizerNode> result = solver.Solve();
         if (Log) {
             std::stringstream str;
@@ -1282,7 +1282,7 @@ class TOptimizerNative: public IOptimizer {
     const std::function<void(const TString&)> Log;
 
     TVector<std::shared_ptr<IBaseOptimizerNode>> Rels;
-    TGraph<64> JoinGraph;
+    TGraph<128> JoinGraph;
 };
 
 IOptimizer* MakeNativeOptimizer(const IOptimizer::TInput& input, const std::function<void(const TString&)>& log) {

diff --git a/ydb/library/yql/providers/dq/common/yql_dq_settings.h b/ydb/library/yql/providers/dq/common/yql_dq_settings.h
@@ -57,7 +57,7 @@ struct TDqSettings {
         static constexpr ETaskRunnerStats TaskRunnerStats = ETaskRunnerStats::Basic;
         static constexpr ESpillingEngine SpillingEngine = ESpillingEngine::Disable;
         static constexpr ui32 CostBasedOptimizationLevel = 0;
-        static constexpr ui32 MaxDPccpDPTableSize = 10000U;
+        static constexpr ui32 MaxDPccpDPTableSize = 16400U;
 
     };