Skip to content

Commit 4c28552

Browse files
vitstnblinkov
authored andcommitted
YQL-19594 drop antlr3 from purecalc & facade
commit_hash:9507c975a69906db30cdb47326c818df387b109f
1 parent ef6b70f commit 4c28552

File tree

4 files changed

+1
-33
lines changed

4 files changed

+1
-33
lines changed

yql/essentials/core/facade/ya.make

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,6 @@ PEERDIR(
2626
yql/essentials/sql/v1/lexer/antlr4_ansi
2727
yql/essentials/sql/v1/proto_parser/antlr4
2828
yql/essentials/sql/v1/proto_parser/antlr4_ansi
29-
#FIXME {
30-
yql/essentials/sql/v1/lexer/antlr3
31-
yql/essentials/sql/v1/lexer/antlr3_ansi
32-
yql/essentials/sql/v1/proto_parser/antlr3
33-
yql/essentials/sql/v1/proto_parser/antlr3_ansi
34-
#}
3529
yql/essentials/parser/pg_wrapper/interface
3630
yql/essentials/utils/log
3731
yql/essentials/core

yql/essentials/core/facade/yql_facade.cpp

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@
1212
#include <yql/essentials/core/services/yql_eval_params.h>
1313
#include <yql/essentials/sql/sql.h>
1414
#include <yql/essentials/sql/v1/sql.h>
15-
//FIXME {
16-
#include <yql/essentials/sql/v1/lexer/antlr3/lexer.h>
17-
#include <yql/essentials/sql/v1/lexer/antlr3_ansi/lexer.h>
18-
#include <yql/essentials/sql/v1/proto_parser/antlr3/proto_parser.h>
19-
#include <yql/essentials/sql/v1/proto_parser/antlr3_ansi/proto_parser.h>
20-
//}
2115
#include <yql/essentials/sql/v1/lexer/antlr4/lexer.h>
2216
#include <yql/essentials/sql/v1/lexer/antlr4_ansi/lexer.h>
2317
#include <yql/essentials/sql/v1/proto_parser/antlr4/proto_parser.h>
@@ -742,13 +736,9 @@ bool TProgram::ParseSql(const NSQLTranslation::TTranslationSettings& settings)
742736

743737
currentSettings->EmitReadsForExists = true;
744738
NSQLTranslationV1::TLexers lexers;
745-
lexers.Antlr3 = NSQLTranslationV1::MakeAntlr3LexerFactory();
746-
lexers.Antlr3Ansi = NSQLTranslationV1::MakeAntlr3AnsiLexerFactory();
747739
lexers.Antlr4 = NSQLTranslationV1::MakeAntlr4LexerFactory();
748740
lexers.Antlr4Ansi = NSQLTranslationV1::MakeAntlr4AnsiLexerFactory();
749741
NSQLTranslationV1::TParsers parsers;
750-
parsers.Antlr3 = NSQLTranslationV1::MakeAntlr3ParserFactory();
751-
parsers.Antlr3Ansi = NSQLTranslationV1::MakeAntlr3AnsiParserFactory();
752742
parsers.Antlr4 = NSQLTranslationV1::MakeAntlr4ParserFactory();
753743
parsers.Antlr4Ansi = NSQLTranslationV1::MakeAntlr4AnsiParserFactory();
754744

yql/essentials/public/purecalc/common/worker_factory.cpp

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,6 @@
77
#include <yql/essentials/sql/sql.h>
88
#include <yql/essentials/sql/v1/sql.h>
99

10-
//FIXME {
11-
#include <yql/essentials/sql/v1/lexer/antlr3/lexer.h>
12-
#include <yql/essentials/sql/v1/lexer/antlr3_ansi/lexer.h>
13-
#include <yql/essentials/sql/v1/proto_parser/antlr3/proto_parser.h>
14-
#include <yql/essentials/sql/v1/proto_parser/antlr3_ansi/proto_parser.h>
15-
//}
16-
1710
#include <yql/essentials/sql/v1/lexer/antlr4/lexer.h>
1811
#include <yql/essentials/sql/v1/lexer/antlr4_ansi/lexer.h>
1912
#include <yql/essentials/sql/v1/proto_parser/antlr4/proto_parser.h>
@@ -152,6 +145,7 @@ TExprNode::TPtr TWorkerFactory<TBase>::Compile(
152145
bool useAntlr4,
153146
EProcessorMode processorMode
154147
) {
148+
Y_ENSURE(useAntlr4, "Antlr3 support is dropped");
155149
if (mode == ETranslationMode::PG && processorMode != EProcessorMode::PullList) {
156150
ythrow TCompileError("", "") << "only PullList mode is compatible to PostgreSQL syntax";
157151
}
@@ -221,13 +215,9 @@ TExprNode::TPtr TWorkerFactory<TBase>::Compile(
221215
}
222216

223217
NSQLTranslationV1::TLexers lexers;
224-
lexers.Antlr3 = NSQLTranslationV1::MakeAntlr3LexerFactory();
225-
lexers.Antlr3Ansi = NSQLTranslationV1::MakeAntlr3AnsiLexerFactory();
226218
lexers.Antlr4 = NSQLTranslationV1::MakeAntlr4LexerFactory();
227219
lexers.Antlr4Ansi = NSQLTranslationV1::MakeAntlr4AnsiLexerFactory();
228220
NSQLTranslationV1::TParsers parsers;
229-
parsers.Antlr3 = NSQLTranslationV1::MakeAntlr3ParserFactory();
230-
parsers.Antlr3Ansi = NSQLTranslationV1::MakeAntlr3AnsiParserFactory();
231221
parsers.Antlr4 = NSQLTranslationV1::MakeAntlr4ParserFactory();
232222
parsers.Antlr4Ansi = NSQLTranslationV1::MakeAntlr4AnsiParserFactory();
233223

yql/essentials/public/purecalc/common/ya.make.inc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,6 @@ PEERDIR(
4343
yql/essentials/sql/v1/lexer/antlr4_ansi
4444
yql/essentials/sql/v1/proto_parser/antlr4
4545
yql/essentials/sql/v1/proto_parser/antlr4_ansi
46-
#{ FIXME
47-
yql/essentials/sql/v1/lexer/antlr3
48-
yql/essentials/sql/v1/lexer/antlr3_ansi
49-
yql/essentials/sql/v1/proto_parser/antlr3
50-
yql/essentials/sql/v1/proto_parser/antlr3_ansi
51-
#}
5246
yql/essentials/parser/pg_wrapper/interface
5347
yql/essentials/providers/common/codec
5448
yql/essentials/providers/common/comp_nodes

0 commit comments

Comments
 (0)