Skip to content

Commit f30a0dd

Browse files
committed
Fix initialization
1 parent 3fa61ff commit f30a0dd

File tree

4 files changed

+7
-5
lines changed

4 files changed

+7
-5
lines changed

ydb/core/kqp/compute_actor/kqp_compute_actor_factory.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,9 @@ class TKqpCaFactory : public IKqpNodeComputeActorFactory {
124124
memoryLimits.MinMemAllocSize = MinMemAllocSize.load();
125125
memoryLimits.MinMemFreeSize = MinMemFreeSize.load();
126126
memoryLimits.ArrayBufferMinFillPercentage = args.Task->GetArrayBufferMinFillPercentage();
127-
memoryLimits.BufferPageAllocSize = args.Task->GetBufferPageAllocSize();
127+
if (args.Task->HasBufferPageAllocSize()) {
128+
memoryLimits.BufferPageAllocSize = args.Task->GetBufferPageAllocSize();
129+
}
128130

129131
auto estimation = ResourceManager_->EstimateTaskResources(*args.Task, args.NumberOfTasks);
130132
NRm::TKqpResourcesRequest resourcesRequest;

ydb/core/kqp/executer_actor/kqp_executer_impl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ class TKqpExecuterBase : public TActor<TDerived> {
169169
ArrayBufferMinFillPercentage = executerConfig.TableServiceConfig.GetArrayBufferMinFillPercentage();
170170
}
171171

172-
if (tableServiceConfig.HasBufferPageAllocSize()) {
173-
BufferPageAllocSize = tableServiceConfig.GetBufferPageAllocSize();
172+
if (executerConfig.TableServiceConfig.HasBufferPageAllocSize()) {
173+
BufferPageAllocSize = executerConfig.TableServiceConfig.GetBufferPageAllocSize();
174174
}
175175

176176
EnableReadsMerge = *MergeDatashardReadsControl() == 1;

ydb/library/yql/dq/actors/compute/dq_compute_actor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ struct TComputeMemoryLimits {
380380
ui64 OutputChunkMaxSize = GetDqExecutionSettings().FlowControl.MaxOutputChunkSize;
381381
ui64 ChunkSizeLimit = 48_MB;
382382
TMaybe<ui8> ArrayBufferMinFillPercentage; // Used by DqOutputHashPartitionConsumer and DqOutputChannel
383-
TMaybe<ui8> BufferPageAllocSize;
383+
TMaybe<size_t> BufferPageAllocSize;
384384

385385
IMemoryQuotaManager::TPtr MemoryQuotaManager;
386386
};

ydb/library/yql/dq/runtime/dq_tasks_runner.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ struct TDqTaskRunnerMemoryLimits {
220220
ui32 OutputChunkMaxSize = 0;
221221
ui32 ChunkSizeLimit = 48_MB;
222222
TMaybe<ui8> ArrayBufferMinFillPercentage;
223-
TMaybe<ui8> BufferPageAllocSize;
223+
TMaybe<size_t> BufferPageAllocSize;
224224
};
225225

226226
NUdf::TUnboxedValue DqBuildInputValue(const NDqProto::TTaskInput& inputDesc, const NKikimr::NMiniKQL::TType* type,

0 commit comments

Comments
 (0)