Skip to content

Commit c5a7f78

Browse files
buhtrIgor Sliusarenko
andauthored
Set to use antlr4 (#15005)
Co-authored-by: Igor Sliusarenko <s2m1@localhost.localdomain>
1 parent 297dee3 commit c5a7f78

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

ydb/core/fq/libs/actors/run_actor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1993,7 +1993,7 @@ class TRunActor : public NActors::TActorBootstrapped<TRunActor> {
19931993
NSQLTranslation::TTranslationSettings sqlSettings;
19941994
sqlSettings.ClusterMapping = clusters;
19951995
sqlSettings.SyntaxVersion = 1;
1996-
sqlSettings.Antlr4Parser = false;
1996+
sqlSettings.Antlr4Parser = true;
19971997
sqlSettings.PgParser = (Params.QuerySyntax == FederatedQuery::QueryContent::PG);
19981998
sqlSettings.V0Behavior = NSQLTranslation::EV0Behavior::Disable;
19991999
sqlSettings.Flags.insert({ "DqEngineEnable", "DqEngineForce", "DisableAnsiOptionalAs", "FlexibleTypes", "AnsiInForEmptyOrNullableItemsCollections" });

ydb/core/fq/libs/row_dispatcher/format_handler/ut/topic_filter_ut.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@ Y_UNIT_TEST_SUITE(TestPurecalcFilter) {
352352
}
353353

354354
Y_UNIT_TEST_F(CompilationValidation, TFiterFixture) {
355-
CompileError = {EStatusId::INTERNAL_ERROR, "Failed to compile purecalc program subissue: { <main>: Error: Compile issues: generated.sql:2:36: Error: Unexpected token '.' : cannot match to any predicted input... } subissue: { <main>: Error: Final yql:"};
355+
CompileError = {EStatusId::INTERNAL_ERROR, "Error: mismatched input '.'"};
356356
MakeFilter(
357357
{{"a1", "[DataType; String]"}},
358358
"where a2 ... 50",
@@ -422,7 +422,8 @@ Y_UNIT_TEST_SUITE(TestFilterSet) {
422422
}
423423

424424
Y_UNIT_TEST_F(CompilationValidation, TFilterSetFixture) {
425-
CompileError = {EStatusId::INTERNAL_ERROR, "Failed to compile client filter subissue: { <main>: Error: Failed to compile purecalc program subissue: { <main>: Error: Compile issues: generated.sql:2:36: Error: Unexpected token '.' : cannot match to any predicted input... } subissue: { <main>: Error: Final yql:"};
425+
CompileError = {EStatusId::INTERNAL_ERROR, "Error: mismatched input '.'"};
426+
426427
MakeFilter(
427428
{{"a1", "[DataType; String]"}},
428429
"where a2 ... 50",

ydb/core/fq/libs/row_dispatcher/purecalc_compilation/compile_service.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ class TPurecalcCompileService : public NActors::TActor<TPurecalcCompileService>
188188
}
189189
auto options = NYql::NPureCalc::TProgramFactoryOptions();
190190
options.SetLLVMSettings(settings.EnabledLLVM ? "ON" : "OFF");
191-
options.UseAntlr4 = false;
191+
options.UseAntlr4 = true;
192192
return ProgramFactories.emplace(settings, NYql::NPureCalc::MakeProgramFactory(options)).first->second;
193193
}
194194

0 commit comments

Comments
 (0)