Skip to content

Commit a6c5f95

Browse files
authored
Drop v0 from dqrun module resolver (#14616)
1 parent f6c191d commit a6c5f95

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

ydb/library/yql/tools/dqrun/dqrun.cpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@
7272
#include <yql/essentials/core/url_lister/url_lister_manager.h>
7373
#include <yql/essentials/core/yql_library_compiler.h>
7474
#include <yql/essentials/core/pg_ext/yql_pg_ext.h>
75+
#include <yql/essentials/sql/sql.h>
76+
#include <yql/essentials/sql/v1/sql.h>
7577
#include <yql/essentials/parser/pg_wrapper/interface/parser.h>
7678
#include <yql/essentials/utils/log/tls_backend.h>
7779
#include <yql/essentials/utils/log/log.h>
@@ -1124,6 +1126,12 @@ int RunMain(int argc, const char* argv[])
11241126
dataProvidersInit.push_back(GetDqDataProviderInitializer(&CreateDqExecTransformer, dqGateway, dqCompFactory, {}, storage));
11251127
}
11261128

1129+
NSQLTranslation::TTranslators translators(
1130+
nullptr,
1131+
NSQLTranslationV1::MakeTranslator(),
1132+
NSQLTranslationPG::MakeTranslator()
1133+
);
1134+
11271135
TExprContext ctx;
11281136
ctx.NextUniqueId = NYql::NPg::GetSqlLanguageParser()->GetContext().NextUniqueId;
11291137
IModuleResolver::TPtr moduleResolver;
@@ -1133,13 +1141,13 @@ int RunMain(int argc, const char* argv[])
11331141
Y_ABORT_UNLESS(NKikimr::ParsePBFromFile(mountConfig, &mount));
11341142
FillUserDataTableFromFileSystem(mount, dataTable);
11351143

1136-
if (!CompileLibraries(dataTable, ctx, modules)) {
1144+
if (!CompileLibraries(translators, dataTable, ctx, modules)) {
11371145
*runOptions.ErrStream << "Errors on compile libraries:" << Endl;
11381146
ctx.IssueManager.GetIssues().PrintTo(*runOptions.ErrStream);
11391147
return -1;
11401148
}
11411149

1142-
moduleResolver = std::make_shared<TModuleResolver>(std::move(modules), ctx.NextUniqueId, clusterMapping, sqlFlags, hasValidate);
1150+
moduleResolver = std::make_shared<TModuleResolver>(translators, std::move(modules), ctx.NextUniqueId, clusterMapping, sqlFlags, hasValidate);
11431151
} else {
11441152
if (GetYqlModuleResolver(ctx, moduleResolver, {}, clusters, sqlFlags).empty()) {
11451153
*runOptions.ErrStream << "Errors loading default YQL libraries:" << Endl;

ydb/library/yql/tools/dqrun/ya.make

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ ENDIF()
3939
yql/essentials/core/file_storage/http_download
4040
yql/essentials/core/services
4141
yql/essentials/core/services/mounts
42+
yql/essentials/sql
43+
yql/essentials/sql/v1
4244
ydb/library/yql/dq/actors/input_transforms
4345
ydb/library/yql/dq/comp_nodes
4446
ydb/library/yql/dq/opt

0 commit comments

Comments
 (0)