Skip to content

Commit 6067ac2

Browse files
committed
YQL-19845 pass langver to purecalc's compute
commit_hash:cb5d5094d0c0d7c7e07bed78fed7c15e9a0c1a29
1 parent 5c723f3 commit 6067ac2

File tree

4 files changed

+20
-9
lines changed

4 files changed

+20
-9
lines changed

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ TWorkerGraph::TWorkerGraph(
4444
const TString& LLVMSettings,
4545
NKikimr::NUdf::ICountersProvider* countersProvider,
4646
ui64 nativeYtTypeFlags,
47-
TMaybe<ui64> deterministicTimeProviderSeed
47+
TMaybe<ui64> deterministicTimeProviderSeed,
48+
TLangVersion langver
4849
)
4950
: ScopedAlloc_(__LOCATION__, NKikimr::TAlignedPagePoolCounters(), funcRegistry.SupportsSizedAllocators())
5051
, Env_(ScopedAlloc_)
@@ -77,7 +78,7 @@ TWorkerGraph::TWorkerGraph(
7778

7879
// Setup struct types
7980

80-
NKikimr::NMiniKQL::TProgramBuilder pgmBuilder(Env_, FuncRegistry_);
81+
NKikimr::NMiniKQL::TProgramBuilder pgmBuilder(Env_, FuncRegistry_, false, langver);
8182
for (ui32 i = 0; i < inputsCount; ++i) {
8283
const auto* type = static_cast<NKikimr::NMiniKQL::TStructType*>(NCommon::BuildType(TPositionHandle(), *inputTypes[i], pgmBuilder, typeMemoization));
8384
const auto* originalType = type;
@@ -157,7 +158,10 @@ TWorkerGraph::TWorkerGraph(
157158
LLVMSettings,
158159
NKikimr::NMiniKQL::EGraphPerProcess::Multi,
159160
nullptr,
160-
countersProvider);
161+
countersProvider,
162+
nullptr,
163+
nullptr,
164+
langver);
161165

162166
ComputationPattern_ = NKikimr::NMiniKQL::MakeComputationPattern(
163167
explorer,
@@ -196,12 +200,13 @@ TWorker<TBase>::TWorker(
196200
const TString& LLVMSettings,
197201
NKikimr::NUdf::ICountersProvider* countersProvider,
198202
ui64 nativeYtTypeFlags,
199-
TMaybe<ui64> deterministicTimeProviderSeed
203+
TMaybe<ui64> deterministicTimeProviderSeed,
204+
TLangVersion langver
200205
)
201206
: WorkerFactory_(std::move(factory))
202207
, Graph_(exprRoot, exprCtx, serializedProgram, funcRegistry, userData,
203208
inputTypes, originalInputTypes, rawInputTypes, outputType, rawOutputType,
204-
LLVMSettings, countersProvider, nativeYtTypeFlags, deterministicTimeProviderSeed)
209+
LLVMSettings, countersProvider, nativeYtTypeFlags, deterministicTimeProviderSeed, langver)
205210
{
206211
}
207212

yql/essentials/public/purecalc/common/worker.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ namespace NYql {
3030
const TString& LLVMSettings,
3131
NKikimr::NUdf::ICountersProvider* countersProvider,
3232
ui64 nativeYtTypeFlags,
33-
TMaybe<ui64> deterministicTimeProviderSeed
33+
TMaybe<ui64> deterministicTimeProviderSeed,
34+
TLangVersion langver
3435
);
3536

3637
~TWorkerGraph();
@@ -80,7 +81,8 @@ namespace NYql {
8081
const TString& LLVMSettings,
8182
NKikimr::NUdf::ICountersProvider* countersProvider,
8283
ui64 nativeYtTypeFlags,
83-
TMaybe<ui64> deterministicTimeProviderSeed
84+
TMaybe<ui64> deterministicTimeProviderSeed,
85+
TLangVersion langver
8486
);
8587

8688
public:

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ TWorkerFactory<TBase>::TWorkerFactory(TWorkerFactoryOptions options, EProcessorM
5656
, DeterministicTimeProviderSeed_(options.DeterministicTimeProviderSeed_)
5757
, UseSystemColumns_(options.UseSystemColumns)
5858
, UseWorkerPool_(options.UseWorkerPool)
59+
, LangVer_(options.LangVer_)
5960
{
6061
// Prepare input struct types and extract all column names from inputs
6162

@@ -300,7 +301,8 @@ TExprNode::TPtr TWorkerFactory<TBase>::Compile(
300301
LLVMSettings_,
301302
CountersProvider_,
302303
NativeYtTypeFlags_,
303-
DeterministicTimeProviderSeed_
304+
DeterministicTimeProviderSeed_,
305+
langver
304306
);
305307

306308
with_lock (graph.ScopedAlloc_) {
@@ -551,7 +553,8 @@ void TWorkerFactory<TBase>::ReturnWorker(IWorker* worker) {
551553
LLVMSettings_, \
552554
CountersProvider_, \
553555
NativeYtTypeFlags_, \
554-
DeterministicTimeProviderSeed_ \
556+
DeterministicTimeProviderSeed_, \
557+
LangVer_ \
555558
)); \
556559
}
557560

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ namespace NYql {
107107
TMaybe<ui64> DeterministicTimeProviderSeed_;
108108
bool UseSystemColumns_;
109109
bool UseWorkerPool_;
110+
TLangVersion LangVer_;
110111
TVector<THolder<IWorker>> WorkerPool_;
111112

112113
public:

0 commit comments

Comments
 (0)