YQL-19309 Remove yt provider dependecy on dq internals

commit_hash:94de9654226b766f9fd4f8fff607b59e747a6f96

6 files changed, 34 insertions, 4 deletions

diff --git a/yql/essentials/core/dq_integration/yql_dq_helper.cpp b/yql/essentials/core/dq_integration/yql_dq_helper.cpp
new file mode 100644
index 0000000000..e083986833
--- /dev/null
+++ b/yql/essentials/core/dq_integration/yql_dq_helper.cpp
@@ -0,0 +1 @@
+#include "yql_dq_helper.h"
diff --git a/yql/essentials/core/dq_integration/yql_dq_helper.h b/yql/essentials/core/dq_integration/yql_dq_helper.h
new file mode 100644
index 0000000000..9876c3389b
--- /dev/null
+++ b/yql/essentials/core/dq_integration/yql_dq_helper.h
@@ -0,0 +1,29 @@
+#pragma once
+
+#include <yql/essentials/ast/yql_expr.h>
+
+#include <util/generic/string.h>
+#include <util/generic/vector.h>
+#include <util/generic/map.h>
+#include <util/generic/maybe.h>
+
+
+namespace NYql {
+
+class IOptimizationContext;
+
+class IDqHelper {
+public:
+    using TPtr = std::shared_ptr<IDqHelper>;
+
+    virtual ~IDqHelper() {}
+
+    virtual bool IsSingleConsumerConnection(const TExprNode::TPtr& node, const TParentsMap& parentsMap) = 0;
+    virtual TExprNode::TPtr PushLambdaAndCreateCnResult(const TExprNode::TPtr& dcUnionAll, const TExprNode::TPtr& lambda, TPositionHandle pos,
+        TExprContext& ctx, IOptimizationContext& optCtx) = 0;
+    virtual TExprNode::TPtr CreateDqStageSettings(bool singleTask, TExprContext& ctx, TPositionHandle pos) = 0;
+    virtual TExprNode::TListType RemoveVariadicDqStageSettings(const TExprNode& settings) = 0;
+};
+
+
+} // namespace NYql
diff --git a/yql/essentials/core/extract_predicate/ut/extract_predicate_ut.cpp b/yql/essentials/core/extract_predicate/ut/extract_predicate_ut.cpp
index ec4a49a65c..5c55117901 100644
--- a/yql/essentials/core/extract_predicate/ut/extract_predicate_ut.cpp
+++ b/yql/essentials/core/extract_predicate/ut/extract_predicate_ut.cpp
@@ -155,7 +155,7 @@ Y_UNIT_TEST_SUITE(TYqlExtractPredicate) {
             auto ytGateway = CreateYtFileGateway(yqlNativeServices);
 
             TVector<TDataProviderInitializer> dataProvidersInit;
-            dataProvidersInit.push_back(GetYtNativeDataProviderInitializer(ytGateway, MakeSimpleCBOOptimizerFactory()));
+            dataProvidersInit.push_back(GetYtNativeDataProviderInitializer(ytGateway, MakeSimpleCBOOptimizerFactory(), {}));
             TProgramFactory factory(true, funcReg, 0ULL, dataProvidersInit, "ut");
 
             TProgramPtr program = factory.Create("-stdin-", Src);
diff --git a/yql/essentials/core/ut/yql_execution_ut.cpp b/yql/essentials/core/ut/yql_execution_ut.cpp
index 312d5db913..8860188a54 100644
--- a/yql/essentials/core/ut/yql_execution_ut.cpp
+++ b/yql/essentials/core/ut/yql_execution_ut.cpp
@@ -59,7 +59,7 @@ namespace NYql {
             auto ytGateway = CreateYtFileGateway(yqlNativeServices);
 
             TVector<TDataProviderInitializer> dataProvidersInit;
-            dataProvidersInit.push_back(GetYtNativeDataProviderInitializer(ytGateway, MakeSimpleCBOOptimizerFactory()));
+            dataProvidersInit.push_back(GetYtNativeDataProviderInitializer(ytGateway, MakeSimpleCBOOptimizerFactory(), {}));
             TProgramFactory factory(true, funcReg, 0ULL, dataProvidersInit, "ut");
 
             TProgramPtr program = factory.Create("-stdin-", Src);
diff --git a/yql/essentials/core/ut/yql_qplayer_ut.cpp b/yql/essentials/core/ut/yql_qplayer_ut.cpp
index 8fa8eb9d84..89d27699d8 100644
--- a/yql/essentials/core/ut/yql_qplayer_ut.cpp
+++ b/yql/essentials/core/ut/yql_qplayer_ut.cpp
@@ -83,7 +83,7 @@ bool RunProgram(bool replay, const TString& query, const TQContext& qContext, co
     auto ytGateway = CreateYtFileGateway(yqlNativeServices);
 
     TVector<TDataProviderInitializer> dataProvidersInit;
-    dataProvidersInit.push_back(GetYtNativeDataProviderInitializer(ytGateway, MakeSimpleCBOOptimizerFactory()));
+    dataProvidersInit.push_back(GetYtNativeDataProviderInitializer(ytGateway, MakeSimpleCBOOptimizerFactory(), {}));
 
     TExprContext modulesCtx;
     IModuleResolver::TPtr moduleResolver;
diff --git a/yql/essentials/tools/pgrun/pgrun.cpp b/yql/essentials/tools/pgrun/pgrun.cpp
index dfcf373f0a..404f129717 100644
--- a/yql/essentials/tools/pgrun/pgrun.cpp
+++ b/yql/essentials/tools/pgrun/pgrun.cpp
@@ -1170,7 +1170,7 @@ int Main(int argc, char* argv[])
     }
 
     TVector<TDataProviderInitializer> dataProvidersInit;
-    dataProvidersInit.push_back(GetYtNativeDataProviderInitializer(ytNativeGateway, MakeSimpleCBOOptimizerFactory()));
+    dataProvidersInit.push_back(GetYtNativeDataProviderInitializer(ytNativeGateway, MakeSimpleCBOOptimizerFactory(), {}));
     dataProvidersInit.push_back(GetPgDataProviderInitializer());
 
     TExprContext ctx;