Skip to content

Commit f92aa20

Browse files
committed
Revert "added debug log + spilling"
This reverts commit 8bdca99.
1 parent 8bdca99 commit f92aa20

File tree

3 files changed

+4
-17
lines changed

3 files changed

+4
-17
lines changed

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11

22
#pragma once
33

4-
#include <format>
54
#include <util/system/mem_info.h>
65
#include <ydb/library/services/services.pb.h>
76
#include <ydb/library/yql/dq/actors/compute/dq_compute_actor.h>
@@ -61,17 +60,15 @@ namespace NYql::NDq {
6160
// Most likely this callback will be removed after KIKIMR-21481.
6261
void TrySetIncreaseMemoryLimitCallbackWithRSSControl(NKikimr::NMiniKQL::TScopedAlloc* alloc) {
6362
if (!CanAllocateExtraMemory) return;
64-
const ui64 limitRSS = 3_GB;
63+
const ui64 limitRSS = std::numeric_limits<ui64>::max();
6564
const ui64 criticalRSSValue = limitRSS / 100 * 80;
6665

6766
alloc->Ref().SetIncreaseMemoryLimitCallback([this, alloc](ui64 limit, ui64 required) {
6867
RequestExtraMemory(required - limit, alloc);
6968

7069
ui64 currentRSS = NMemInfo::GetMemInfo().RSS;
71-
std::cerr << std::format("[MISHA]: limit: {}MB required: {}MB, RSS: {}MB\n", limit / 1024 / 1024, required / 1024 / 1024, currentRSS / 1024 / 1024);
7270
if (currentRSS > criticalRSSValue) {
7371
alloc->SetMaximumLimitValueReached(true);
74-
std::cerr << std::format("[MISHA]: MAximum limit set up\n");
7572
}
7673
});
7774
}

ydb/library/yql/minikql/comp_nodes/mkql_wide_combine.cpp

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#include "mkql_wide_combine.h"
22
#include "mkql_rh_hash.h"
33

4-
#include <format>
54
#include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h> // Y_IGNORE
65
#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h> // Y_IGNORE
76
#include <ydb/library/yql/minikql/computation/mkql_computation_node.h>
@@ -367,13 +366,7 @@ class TSpillingSupportState : public TComputationValue<TSpillingSupportState> {
367366
~TSpillingSupportState() {
368367
}
369368

370-
bool WasLog = false;
371-
372369
EFetchResult DoCalculate(TComputationContext& ctx, NUdf::TUnboxedValue*const* output) {
373-
if (!WasLog) {
374-
std::cerr << "[MISHA] WIDE COMBINE\n";
375-
WasLog = true;
376-
}
377370
while (true) {
378371
switch(GetMode()) {
379372
case EOperatingMode::InMemory: {
@@ -521,10 +514,8 @@ class TSpillingSupportState : public TComputationValue<TSpillingSupportState> {
521514

522515
if (!HasMemoryForProcessing()) {
523516
bool isWaitingForReduce = TryToReduceMemory();
524-
std::cerr << std::format("[MISHA] PROCESSING. is waiting: {}\n", isWaitingForReduce);
525517
if (isWaitingForReduce) return;
526518
}
527-
std::cerr << "[MISHA] PROCESSING\n";
528519

529520
if (BufferForUsedInputItems.size()) {
530521
auto& bucket = SpilledBuckets[BufferForUsedInputItemsBucketId];
@@ -689,7 +680,6 @@ class TSpillingSupportState : public TComputationValue<TSpillingSupportState> {
689680
break;
690681
}
691682
case EOperatingMode::Spilling: {
692-
std::cerr << "[MISHA] spilling enabled\n";
693683
MKQL_ENSURE(EOperatingMode::InMemory == Mode, "Internal logic error");
694684
SpilledBuckets.resize(SpilledBucketCount);
695685
auto spiller = ctx.SpillerFactory->CreateSpiller();
@@ -716,9 +706,9 @@ class TSpillingSupportState : public TComputationValue<TSpillingSupportState> {
716706
}
717707

718708
bool IsSwitchToSpillingModeCondition() const {
719-
// return false;
709+
return false;
720710
// TODO: YQL-18033
721-
return !HasMemoryForProcessing();
711+
// return !HasMemoryForProcessing();
722712
}
723713

724714
private:

ydb/library/yql/providers/dq/worker_manager/local_worker_manager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ namespace NYql::NDqs {
3030
NDq::NTaskRunnerActor::ITaskRunnerActorFactory::TPtr TaskRunnerActorFactory;
3131
THashMap<TString, TString> ClusterNamesMapping;
3232

33-
ui64 MkqlInitialMemoryLimit = 300_MB;
33+
ui64 MkqlInitialMemoryLimit = 8_GB;
3434
ui64 MkqlTotalMemoryLimit = 0;
3535
ui64 MkqlMinAllocSize = 30_MB;
3636
ui64 MkqlProgramHardMemoryLimit = 0;

0 commit comments

Comments
 (0)