diff options
author | vvvv <[email protected]> | 2025-02-28 15:27:37 +0300 |
---|---|---|
committer | vvvv <[email protected]> | 2025-02-28 17:19:08 +0300 |
commit | 2efc6dfe86514865c42328c38be4be9190853cc5 (patch) | |
tree | a55d05c381616b657c07c77ee3b82d875d7ea485 | |
parent | 3669148c53e1722d854b603d8c546e8b942f4462 (diff) |
YQL-19594 drop antlr3 from purecalc & facade
commit_hash:9507c975a69906db30cdb47326c818df387b109f
-rw-r--r-- | yql/essentials/core/facade/ya.make | 6 | ||||
-rw-r--r-- | yql/essentials/core/facade/yql_facade.cpp | 10 | ||||
-rw-r--r-- | yql/essentials/public/purecalc/common/worker_factory.cpp | 12 | ||||
-rw-r--r-- | yql/essentials/public/purecalc/common/ya.make.inc | 6 |
4 files changed, 1 insertions, 33 deletions
diff --git a/yql/essentials/core/facade/ya.make b/yql/essentials/core/facade/ya.make index 756ed88de48..6164039fa8e 100644 --- a/yql/essentials/core/facade/ya.make +++ b/yql/essentials/core/facade/ya.make @@ -26,12 +26,6 @@ PEERDIR( yql/essentials/sql/v1/lexer/antlr4_ansi yql/essentials/sql/v1/proto_parser/antlr4 yql/essentials/sql/v1/proto_parser/antlr4_ansi - #FIXME { - yql/essentials/sql/v1/lexer/antlr3 - yql/essentials/sql/v1/lexer/antlr3_ansi - yql/essentials/sql/v1/proto_parser/antlr3 - yql/essentials/sql/v1/proto_parser/antlr3_ansi - #} yql/essentials/parser/pg_wrapper/interface yql/essentials/utils/log yql/essentials/core diff --git a/yql/essentials/core/facade/yql_facade.cpp b/yql/essentials/core/facade/yql_facade.cpp index 97a6f54d0ba..f8d9c28ba1c 100644 --- a/yql/essentials/core/facade/yql_facade.cpp +++ b/yql/essentials/core/facade/yql_facade.cpp @@ -12,12 +12,6 @@ #include <yql/essentials/core/services/yql_eval_params.h> #include <yql/essentials/sql/sql.h> #include <yql/essentials/sql/v1/sql.h> -//FIXME { -#include <yql/essentials/sql/v1/lexer/antlr3/lexer.h> -#include <yql/essentials/sql/v1/lexer/antlr3_ansi/lexer.h> -#include <yql/essentials/sql/v1/proto_parser/antlr3/proto_parser.h> -#include <yql/essentials/sql/v1/proto_parser/antlr3_ansi/proto_parser.h> -//} #include <yql/essentials/sql/v1/lexer/antlr4/lexer.h> #include <yql/essentials/sql/v1/lexer/antlr4_ansi/lexer.h> #include <yql/essentials/sql/v1/proto_parser/antlr4/proto_parser.h> @@ -742,13 +736,9 @@ bool TProgram::ParseSql(const NSQLTranslation::TTranslationSettings& settings) currentSettings->EmitReadsForExists = true; NSQLTranslationV1::TLexers lexers; - lexers.Antlr3 = NSQLTranslationV1::MakeAntlr3LexerFactory(); - lexers.Antlr3Ansi = NSQLTranslationV1::MakeAntlr3AnsiLexerFactory(); lexers.Antlr4 = NSQLTranslationV1::MakeAntlr4LexerFactory(); lexers.Antlr4Ansi = NSQLTranslationV1::MakeAntlr4AnsiLexerFactory(); NSQLTranslationV1::TParsers parsers; - parsers.Antlr3 = NSQLTranslationV1::MakeAntlr3ParserFactory(); - parsers.Antlr3Ansi = NSQLTranslationV1::MakeAntlr3AnsiParserFactory(); parsers.Antlr4 = NSQLTranslationV1::MakeAntlr4ParserFactory(); parsers.Antlr4Ansi = NSQLTranslationV1::MakeAntlr4AnsiParserFactory(); diff --git a/yql/essentials/public/purecalc/common/worker_factory.cpp b/yql/essentials/public/purecalc/common/worker_factory.cpp index 50b85ed05ae..7597c7fdd29 100644 --- a/yql/essentials/public/purecalc/common/worker_factory.cpp +++ b/yql/essentials/public/purecalc/common/worker_factory.cpp @@ -7,13 +7,6 @@ #include <yql/essentials/sql/sql.h> #include <yql/essentials/sql/v1/sql.h> -//FIXME { -#include <yql/essentials/sql/v1/lexer/antlr3/lexer.h> -#include <yql/essentials/sql/v1/lexer/antlr3_ansi/lexer.h> -#include <yql/essentials/sql/v1/proto_parser/antlr3/proto_parser.h> -#include <yql/essentials/sql/v1/proto_parser/antlr3_ansi/proto_parser.h> -//} - #include <yql/essentials/sql/v1/lexer/antlr4/lexer.h> #include <yql/essentials/sql/v1/lexer/antlr4_ansi/lexer.h> #include <yql/essentials/sql/v1/proto_parser/antlr4/proto_parser.h> @@ -152,6 +145,7 @@ TExprNode::TPtr TWorkerFactory<TBase>::Compile( bool useAntlr4, EProcessorMode processorMode ) { + Y_ENSURE(useAntlr4, "Antlr3 support is dropped"); if (mode == ETranslationMode::PG && processorMode != EProcessorMode::PullList) { ythrow TCompileError("", "") << "only PullList mode is compatible to PostgreSQL syntax"; } @@ -221,13 +215,9 @@ TExprNode::TPtr TWorkerFactory<TBase>::Compile( } NSQLTranslationV1::TLexers lexers; - lexers.Antlr3 = NSQLTranslationV1::MakeAntlr3LexerFactory(); - lexers.Antlr3Ansi = NSQLTranslationV1::MakeAntlr3AnsiLexerFactory(); lexers.Antlr4 = NSQLTranslationV1::MakeAntlr4LexerFactory(); lexers.Antlr4Ansi = NSQLTranslationV1::MakeAntlr4AnsiLexerFactory(); NSQLTranslationV1::TParsers parsers; - parsers.Antlr3 = NSQLTranslationV1::MakeAntlr3ParserFactory(); - parsers.Antlr3Ansi = NSQLTranslationV1::MakeAntlr3AnsiParserFactory(); parsers.Antlr4 = NSQLTranslationV1::MakeAntlr4ParserFactory(); parsers.Antlr4Ansi = NSQLTranslationV1::MakeAntlr4AnsiParserFactory(); diff --git a/yql/essentials/public/purecalc/common/ya.make.inc b/yql/essentials/public/purecalc/common/ya.make.inc index 4059a9e78d2..0f3e3d93702 100644 --- a/yql/essentials/public/purecalc/common/ya.make.inc +++ b/yql/essentials/public/purecalc/common/ya.make.inc @@ -43,12 +43,6 @@ PEERDIR( yql/essentials/sql/v1/lexer/antlr4_ansi yql/essentials/sql/v1/proto_parser/antlr4 yql/essentials/sql/v1/proto_parser/antlr4_ansi - #{ FIXME - yql/essentials/sql/v1/lexer/antlr3 - yql/essentials/sql/v1/lexer/antlr3_ansi - yql/essentials/sql/v1/proto_parser/antlr3 - yql/essentials/sql/v1/proto_parser/antlr3_ansi - #} yql/essentials/parser/pg_wrapper/interface yql/essentials/providers/common/codec yql/essentials/providers/common/comp_nodes |