ydb-platform
diff --git a/‎ydb/library/yql/core/common_opt/yql_co_finalizers.cpp
Lines changed: 2 additions & 1 deletion b/‎ydb/library/yql/core/common_opt/yql_co_finalizers.cpp
Lines changed: 2 additions & 1 deletion
@@ -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) {
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,8 @@ IGraphTransformer::TStatus MultiUsageFlatMapOverJoin(const TExprNode::TPtr& node`
`50`	`50`	`bool IsFilterMultiusageEnabled(const TOptimizeContext& optCtx) {`
`51`	`51`	`YQL_ENSURE(optCtx.Types);`
`52`	`52`	`static const TString multiUsageFlags = to_lower(TString("FilterPushdownEnableMultiusage"));`
`53`		`- return optCtx.Types->OptimizerFlags.contains(multiUsageFlags);`
	`53`	`+ static const TString noMultiUsageFlags = to_lower(TString("FilterPushdownDisableMultiusage"));`
	`54`	`+ return optCtx.Types->OptimizerFlags.contains(multiUsageFlags) && !optCtx.Types->OptimizerFlags.contains(noMultiUsageFlags);`
`54`	`55`	`}`
`55`	`56`
`56`	`57`	`void FilterPushdownWithMultiusage(const TExprNode::TPtr& node, TNodeOnNodeOwnedMap& toOptimize, TExprContext& ctx, TOptimizeContext& optCtx) {`