From c3eed92629687af94073f570c29ea338bdd66548 Mon Sep 17 00:00:00 2001 From: vityaman Date: Tue, 15 Apr 2025 14:30:08 +0300 Subject: YQL-19747 Remove default completion engine factory This is to decouple from the `sql/v1/lexer` implementation. - Related to https://github.com/ydb-platform/ydb/issues/9056 - Related to https://github.com/vityaman/ydb/issues/18 - Following https://github.com/ydb-platform/ydb/pull/16820 --- Pull Request resolved: https://github.com/ytsaurus/ytsaurus/pull/1196 commit_hash:4995f3a7cb14b0b735a48e211111764f65be8033 --- yql/essentials/sql/v1/complete/sql_complete.cpp | 19 ------------------- yql/essentials/sql/v1/complete/sql_complete.h | 3 --- yql/essentials/sql/v1/complete/ya.make | 3 --- 3 files changed, 25 deletions(-) diff --git a/yql/essentials/sql/v1/complete/sql_complete.cpp b/yql/essentials/sql/v1/complete/sql_complete.cpp index fe2cde67baa..0789aa4bfc0 100644 --- a/yql/essentials/sql/v1/complete/sql_complete.cpp +++ b/yql/essentials/sql/v1/complete/sql_complete.cpp @@ -5,10 +5,6 @@ #include #include -// FIXME(YQL-19747): unwanted dependency on a lexer implementation -#include -#include - #include #include @@ -130,21 +126,6 @@ namespace NSQLComplete { INameService::TPtr Names; }; - // FIXME(YQL-19747): unwanted dependency on a lexer implementation - ISqlCompletionEngine::TPtr MakeSqlCompletionEngine() { - NSQLTranslationV1::TLexers lexers; - lexers.Antlr4Pure = NSQLTranslationV1::MakeAntlr4PureLexerFactory(); - lexers.Antlr4PureAnsi = NSQLTranslationV1::MakeAntlr4PureAnsiLexerFactory(); - - INameService::TPtr names = MakeStaticNameService(MakeDefaultNameSet(), MakeDefaultRanking()); - - return MakeSqlCompletionEngine([lexers = std::move(lexers)](bool ansi) { - return NSQLTranslationV1::MakeLexer( - lexers, ansi, /* antlr4 = */ true, - NSQLTranslationV1::ELexerFlavor::Pure); - }, std::move(names)); - } - ISqlCompletionEngine::TPtr MakeSqlCompletionEngine( TLexerSupplier lexer, INameService::TPtr names, diff --git a/yql/essentials/sql/v1/complete/sql_complete.h b/yql/essentials/sql/v1/complete/sql_complete.h index de7a597d517..44bb98c3b21 100644 --- a/yql/essentials/sql/v1/complete/sql_complete.h +++ b/yql/essentials/sql/v1/complete/sql_complete.h @@ -52,9 +52,6 @@ namespace NSQLComplete { using TLexerSupplier = std::function; - // FIXME(YQL-19747): unwanted dependency on a lexer implementation - ISqlCompletionEngine::TPtr MakeSqlCompletionEngine(); - ISqlCompletionEngine::TPtr MakeSqlCompletionEngine( TLexerSupplier lexer, INameService::TPtr names, diff --git a/yql/essentials/sql/v1/complete/ya.make b/yql/essentials/sql/v1/complete/ya.make index 0fc358e88b5..59c15502af5 100644 --- a/yql/essentials/sql/v1/complete/ya.make +++ b/yql/essentials/sql/v1/complete/ya.make @@ -6,9 +6,6 @@ SRCS( PEERDIR( yql/essentials/sql/v1/lexer - # FIXME(YQL-19747): unwanted dependency on a lexer implementation - yql/essentials/sql/v1/lexer/antlr4_pure - yql/essentials/sql/v1/lexer/antlr4_pure_ansi yql/essentials/sql/v1/complete/antlr4 yql/essentials/sql/v1/complete/name yql/essentials/sql/v1/complete/name/static -- cgit v1.3