Skip to content

Commit e21e733

Browse files
committed
fix engine_host
1 parent b6be2cb commit e21e733

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

ydb/core/kqp/runtime/kqp_tasks_runner.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class TKqpTasksRunner : public TSimpleRefCount<TKqpTasksRunner>, private TNonCop
7373

7474

7575
TIntrusivePtr<TKqpTasksRunner> CreateKqpTasksRunner(google::protobuf::RepeatedPtrField<NYql::NDqProto::TDqTask>&& tasks,
76-
NKikimr::NMiniKQL::TScopedAlloc& alloc,
76+
std::shared_ptr<NKikimr::NMiniKQL::TScopedAlloc> alloc,
7777
const NYql::NDq::TDqTaskRunnerContext& execCtx, const NYql::NDq::TDqTaskRunnerSettings& settings,
7878
const NYql::NDq::TLogFunc& logFunc);
7979

ydb/core/tx/datashard/datashard__engine_host.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ TEngineBay::TEngineBay(TDataShard* self, TTransactionContext& txc, const TActorC
527527
ComputeCtx = MakeHolder<TKqpDatashardComputeContext>(self, GetUserDb(), EngineHost->GetSettings().DisableByKeyFilter);
528528
ComputeCtx->Database = &txc.DB;
529529

530-
KqpAlloc = MakeHolder<TScopedAlloc>(__LOCATION__, TAlignedPagePoolCounters(), AppData(ctx)->FunctionRegistry->SupportsSizedAllocators());
530+
KqpAlloc = std::make_shared<TScopedAlloc>(__LOCATION__, TAlignedPagePoolCounters(), AppData(ctx)->FunctionRegistry->SupportsSizedAllocators());
531531
KqpTypeEnv = MakeHolder<TTypeEnvironment>(*KqpAlloc);
532532
KqpAlloc->Release();
533533

@@ -725,7 +725,7 @@ NKqp::TKqpTasksRunner& TEngineBay::GetKqpTasksRunner(NKikimrTxDataShard::TKqpTra
725725
settings.TerminateOnError = false;
726726
Y_ABORT_UNLESS(KqpAlloc);
727727
KqpAlloc->SetLimit(10_MB);
728-
KqpTasksRunner = NKqp::CreateKqpTasksRunner(std::move(*tx.MutableTasks()), *KqpAlloc.Get(), KqpExecCtx, settings, KqpLogFunc);
728+
KqpTasksRunner = NKqp::CreateKqpTasksRunner(std::move(*tx.MutableTasks()), KqpAlloc, KqpExecCtx, settings, KqpLogFunc);
729729
}
730730

731731
return *KqpTasksRunner;

ydb/core/tx/datashard/datashard__engine_host.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ class TEngineBay : TNonCopyable {
8383
auto guard = TGuard(*KqpAlloc);
8484
KqpTypeEnv.Reset();
8585
}
86-
KqpAlloc.Reset();
86+
KqpAlloc.reset();
8787
}
8888
KqpExecCtx = {};
8989

@@ -128,7 +128,7 @@ class TEngineBay : TNonCopyable {
128128
NYql::NDq::TLogFunc KqpLogFunc;
129129
THolder<NUdf::IApplyContext> KqpApplyCtx;
130130
THolder<NMiniKQL::TKqpDatashardComputeContext> ComputeCtx;
131-
THolder<NMiniKQL::TScopedAlloc> KqpAlloc;
131+
std::shared_ptr<NMiniKQL::TScopedAlloc> KqpAlloc;
132132
THolder<NMiniKQL::TTypeEnvironment> KqpTypeEnv;
133133
NYql::NDq::TDqTaskRunnerContext KqpExecCtx;
134134
TIntrusivePtr<NKqp::TKqpTasksRunner> KqpTasksRunner;

0 commit comments

Comments
 (0)