Skip to content

Commit 60c4deb

Browse files
authored
split lexers & parsers even more (#15069)
1 parent e7c7137 commit 60c4deb

File tree

3 files changed

+40
-2
lines changed

3 files changed

+40
-2
lines changed

ydb/core/kqp/host/kqp_translate.cpp

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -301,9 +301,20 @@ NYql::TAstParseResult ParseQuery(const TString& queryText, bool isSql, TMaybe<ui
301301
settings.AutoParamBuilderFactory = &autoParamBuilderFactory;
302302
NYql::TStmtParseInfo stmtParseInfo;
303303

304+
NSQLTranslationV1::TLexers lexers;
305+
lexers.Antlr3 = NSQLTranslationV1::MakeAntlr3LexerFactory();
306+
lexers.Antlr3Ansi = NSQLTranslationV1::MakeAntlr3AnsiLexerFactory();
307+
lexers.Antlr4 = NSQLTranslationV1::MakeAntlr4LexerFactory();
308+
lexers.Antlr4Ansi = NSQLTranslationV1::MakeAntlr4AnsiLexerFactory();
309+
NSQLTranslationV1::TParsers parsers;
310+
parsers.Antlr3 = NSQLTranslationV1::MakeAntlr3ParserFactory();
311+
parsers.Antlr3Ansi = NSQLTranslationV1::MakeAntlr3AnsiParserFactory();
312+
parsers.Antlr4 = NSQLTranslationV1::MakeAntlr4ParserFactory();
313+
parsers.Antlr4Ansi = NSQLTranslationV1::MakeAntlr4AnsiParserFactory();
314+
304315
NSQLTranslation::TTranslators translators(
305316
NSQLTranslationV0::MakeTranslator(),
306-
NSQLTranslationV1::MakeTranslator(),
317+
NSQLTranslationV1::MakeTranslator(lexers, parsers),
307318
NSQLTranslationPG::MakeTranslator()
308319
);
309320

ydb/core/kqp/ut/view/view_ut.cpp

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,14 @@
11
#include <ydb/core/kqp/ut/common/kqp_ut_common.h>
22
#include <yql/essentials/sql/sql.h>
33
#include <yql/essentials/sql/v1/sql.h>
4+
#include <yql/essentials/sql/v1/lexer/antlr3/lexer.h>
5+
#include <yql/essentials/sql/v1/lexer/antlr3_ansi/lexer.h>
6+
#include <yql/essentials/sql/v1/proto_parser/antlr3/proto_parser.h>
7+
#include <yql/essentials/sql/v1/proto_parser/antlr3_ansi/proto_parser.h>
8+
#include <yql/essentials/sql/v1/lexer/antlr4/lexer.h>
9+
#include <yql/essentials/sql/v1/lexer/antlr4_ansi/lexer.h>
10+
#include <yql/essentials/sql/v1/proto_parser/antlr4/proto_parser.h>
11+
#include <yql/essentials/sql/v1/proto_parser/antlr4_ansi/proto_parser.h>
412
#include <yql/essentials/utils/log/log.h>
513
#include <ydb-cpp-sdk/client/proto/accessor.h>
614

@@ -199,9 +207,20 @@ Y_UNIT_TEST_SUITE(TCreateAndDropViewTest) {
199207
SELECT "foo" / "bar"
200208
)";
201209

210+
NSQLTranslationV1::TLexers lexers;
211+
lexers.Antlr3 = NSQLTranslationV1::MakeAntlr3LexerFactory();
212+
lexers.Antlr3Ansi = NSQLTranslationV1::MakeAntlr3AnsiLexerFactory();
213+
lexers.Antlr4 = NSQLTranslationV1::MakeAntlr4LexerFactory();
214+
lexers.Antlr4Ansi = NSQLTranslationV1::MakeAntlr4AnsiLexerFactory();
215+
NSQLTranslationV1::TParsers parsers;
216+
parsers.Antlr3 = NSQLTranslationV1::MakeAntlr3ParserFactory();
217+
parsers.Antlr3Ansi = NSQLTranslationV1::MakeAntlr3AnsiParserFactory();
218+
parsers.Antlr4 = NSQLTranslationV1::MakeAntlr4ParserFactory();
219+
parsers.Antlr4Ansi = NSQLTranslationV1::MakeAntlr4AnsiParserFactory();
220+
202221
NSQLTranslation::TTranslators translators(
203222
nullptr,
204-
NSQLTranslationV1::MakeTranslator(),
223+
NSQLTranslationV1::MakeTranslator(lexers, parsers),
205224
nullptr
206225
);
207226

ydb/core/kqp/ut/view/ya.make

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ PEERDIR(
1010
ydb/core/kqp/ut/common
1111
yql/essentials/sql
1212
yql/essentials/sql/v1
13+
yql/essentials/sql/v1/lexer/antlr4
14+
yql/essentials/sql/v1/lexer/antlr4_ansi
15+
yql/essentials/sql/v1/proto_parser/antlr4
16+
yql/essentials/sql/v1/proto_parser/antlr4_ansi
17+
yql/essentials/sql/v1/lexer/antlr3
18+
yql/essentials/sql/v1/lexer/antlr3_ansi
19+
yql/essentials/sql/v1/proto_parser/antlr3
20+
yql/essentials/sql/v1/proto_parser/antlr3_ansi
1321
yql/essentials/utils/log
1422

1523
ydb/core/testlib/basics/default

0 commit comments

Comments
 (0)