Merge ebb174e into e2dfc63

ydb-platform · Aug 29, 2024 · 8092de2 · 8092de2
2 parents e2dfc63 + ebb174e
commit 8092de2
Show file tree

Hide file tree

Showing 10 changed files with 424 additions and 10 deletions.
diff --git a/ydb/library/yql/core/common_opt/yql_co_finalizers.cpp b/ydb/library/yql/core/common_opt/yql_co_finalizers.cpp
@@ -50,7 +50,8 @@ IGraphTransformer::TStatus MultiUsageFlatMapOverJoin(const TExprNode::TPtr& node
 bool IsFilterMultiusageEnabled(const TOptimizeContext& optCtx) {
     YQL_ENSURE(optCtx.Types);
     static const TString multiUsageFlags = to_lower(TString("FilterPushdownEnableMultiusage"));
-    return optCtx.Types->OptimizerFlags.contains(multiUsageFlags);
+    static const TString noMultiUsageFlags = to_lower(TString("FilterPushdownDisableMultiusage"));
+    return optCtx.Types->OptimizerFlags.contains(multiUsageFlags) && !optCtx.Types->OptimizerFlags.contains(noMultiUsageFlags);
 }
 
 void FilterPushdownWithMultiusage(const TExprNode::TPtr& node, TNodeOnNodeOwnedMap& toOptimize, TExprContext& ctx, TOptimizeContext& optCtx) {