Intermediate changes

commit_hash:c8d74820e197343a1019edeff4f8c21fc5805244

6 files changed, 9 insertions, 48 deletions

diff --git a/yql/essentials/sql/v1/complete/analysis/yql/cluster.cpp b/yql/essentials/sql/v1/complete/analysis/yql/cluster.cpp
index 0f01463ae0b..939cb7b25a7 100644
--- a/yql/essentials/sql/v1/complete/analysis/yql/cluster.cpp
+++ b/yql/essentials/sql/v1/complete/analysis/yql/cluster.cpp
@@ -1,6 +1,5 @@
 #include "cluster.h"
 
-#define USE_CURRENT_UDF_ABI_VERSION
 #include <yql/essentials/core/yql_expr_optimize.h>
 
 namespace NSQLComplete {
diff --git a/yql/essentials/sql/v1/complete/analysis/yql/table.cpp b/yql/essentials/sql/v1/complete/analysis/yql/table.cpp
index d14b59e4a61..51ec1b74307 100644
--- a/yql/essentials/sql/v1/complete/analysis/yql/table.cpp
+++ b/yql/essentials/sql/v1/complete/analysis/yql/table.cpp
@@ -2,7 +2,6 @@
 
 #include "cluster.h"
 
-#define USE_CURRENT_UDF_ABI_VERSION
 #include <yql/essentials/core/yql_expr_optimize.h>
 
 namespace NSQLComplete {
diff --git a/yql/essentials/sql/v1/complete/analysis/yql/ut/ya.make b/yql/essentials/sql/v1/complete/analysis/yql/ut/ya.make
index 3d9249e0c8e..457113470ef 100644
--- a/yql/essentials/sql/v1/complete/analysis/yql/ut/ya.make
+++ b/yql/essentials/sql/v1/complete/analysis/yql/ut/ya.make
@@ -5,7 +5,6 @@ SRCS(
 )
 
 PEERDIR(
-    yql/essentials/minikql/invoke_builtins/no_llvm
     yql/essentials/providers/common/provider
     yql/essentials/parser/pg_wrapper
     yql/essentials/public/udf/service/stub
diff --git a/yql/essentials/sql/v1/complete/analysis/yql/ya.make b/yql/essentials/sql/v1/complete/analysis/yql/ya.make
index bfc97e7d04b..9526baef5a6 100644
--- a/yql/essentials/sql/v1/complete/analysis/yql/ya.make
+++ b/yql/essentials/sql/v1/complete/analysis/yql/ya.make
@@ -9,11 +9,10 @@ SRCS(
 PEERDIR(
     yql/essentials/ast
     yql/essentials/core
-    yql/essentials/core/services
-    yql/essentials/minikql
-    yql/essentials/minikql/invoke_builtins
 )
 
+YQL_LAST_ABI_VERSION()
+
 END()
 
 RECURSE_FOR_TESTS(
diff --git a/yql/essentials/sql/v1/complete/analysis/yql/yql.cpp b/yql/essentials/sql/v1/complete/analysis/yql/yql.cpp
index 8a8746e6839..052d9a8840b 100644
--- a/yql/essentials/sql/v1/complete/analysis/yql/yql.cpp
+++ b/yql/essentials/sql/v1/complete/analysis/yql/yql.cpp
@@ -3,12 +3,6 @@
 #include "cluster.h"
 #include "table.h"
 
-#define USE_CURRENT_UDF_ABI_VERSION
-#include <yql/essentials/core/yql_type_annotation.h>
-#include <yql/essentials/core/services/yql_eval_expr.h>
-#include <yql/essentials/minikql/mkql_function_registry.h>
-#include <yql/essentials/minikql/invoke_builtins/mkql_builtins.h>
-
 #include <library/cpp/iterator/iterate_keys.h>
 
 namespace NSQLComplete {
@@ -34,16 +28,8 @@ namespace NSQLComplete {
 
         class TYqlAnalysis: public IYqlAnalysis {
         public:
-            TYqlAnalysis()
-                : FunctionRegistry_(
-                      NKikimr::NMiniKQL::CreateFunctionRegistry(
-                          NKikimr::NMiniKQL::CreateBuiltinRegistry()))
-                , Types_(MakeIntrusive<NYql::TTypeAnnotationContext>())
-            {
-            }
-
             TYqlContext Analyze(NYql::TExprNode::TPtr root, NYql::TExprContext& ctx) const override {
-                root = Optimized(std::move(root), ctx);
+                Y_UNUSED(ctx);
 
                 TYqlContext yqlCtx;
 
@@ -55,30 +41,6 @@ namespace NSQLComplete {
 
                 return yqlCtx;
             }
-
-        private:
-            NYql::TExprNode::TPtr Optimized(NYql::TExprNode::TPtr expr, NYql::TExprContext& ctx) const {
-                constexpr size_t AttemptsLimit = 128;
-
-                for (size_t i = 0; i < AttemptsLimit; ++i) {
-                    auto status = NYql::EvaluateExpression(expr, expr, *Types_, ctx, *FunctionRegistry_);
-                    if (status.Level != NYql::IGraphTransformer::TStatus::Repeat) {
-                        Y_ENSURE(status == NYql::IGraphTransformer::TStatus::Ok, "" << status);
-                        return expr;
-                    }
-                }
-
-                ythrow yexception() << "Optimization was not converged after "
-                                    << AttemptsLimit << " attempts";
-            }
-
-            static void Print(IOutputStream& out, const NYql::TExprNode& root, NYql::TExprContext& ctx) {
-                auto ast = ConvertToAst(root, ctx, NYql::TExprAnnotationFlags::None, true);
-                ast.Root->PrettyPrintTo(out, NYql::TAstPrintFlags::PerLine | NYql::TAstPrintFlags::ShortQuote);
-            }
-
-            TIntrusivePtr<NKikimr::NMiniKQL::IFunctionRegistry> FunctionRegistry_;
-            NYql::TTypeAnnotationContextPtr Types_;
         };
 
     } // namespace
diff --git a/yql/essentials/sql/v1/complete/check/check_complete.cpp b/yql/essentials/sql/v1/complete/check/check_complete.cpp
index e91ddf14331..301625d7bcf 100644
--- a/yql/essentials/sql/v1/complete/check/check_complete.cpp
+++ b/yql/essentials/sql/v1/complete/check/check_complete.cpp
@@ -67,7 +67,10 @@ namespace NSQLComplete {
             },
             MakeDefaultRanking());
 
-        auto engine = MakeSqlCompletionEngine(MakePureLexerSupplier(), std::move(service));
+        auto engine = MakeSqlCompletionEngine(
+            MakePureLexerSupplier(),
+            std::move(service),
+            MakeYQLConfiguration());
 
         for (size_t i = 0, j = 0; i < Attempts && j < MaxAttempts; ++j) {
             size_t pos = RandomNumber<size_t>(query.size() + 1);
@@ -92,7 +95,7 @@ namespace NSQLComplete {
     bool CheckComplete(TStringBuf query, NYql::TExprNode::TPtr root, NYql::TExprContext& ctx, NYql::TIssues& issues) try {
         return CheckComplete(query, MakeYqlAnalysis()->Analyze(root, ctx));
     } catch (...) {
-        issues.AddIssue(CurrentExceptionMessage());
+        issues.AddIssue(FormatCurrentException());
         return false;
     }
 
@@ -102,7 +105,7 @@ namespace NSQLComplete {
             .Transform([&](auto&& ctx) { return CheckComplete(query, std::move(ctx)); })
             .GetOrElse(false);
     } catch (...) {
-        issues.AddIssue(CurrentExceptionMessage());
+        issues.AddIssue(FormatCurrentException());
         return false;
     }