Skip to content

use same on memory limit handler everywhere #6641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gridnevvvit merged 1 commit into from
Jul 13, 2024
Merged

use same on memory limit handler everywhere #6641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions ydb/core/kqp/compute_actor/kqp_pure_compute_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,7 @@ STFUNC(TKqpComputeActor::StateFunc) {
BaseStateFuncBody(ev);
}
} catch (const TMemoryLimitExceededException& e) {
InternalError(TIssuesIds::KIKIMR_PRECONDITION_FAILED, TStringBuilder()
<< "Mkql memory limit exceeded, limit: " << GetMkqlMemoryLimit()
<< ", host: " << HostName()
<< ", canAllocateExtraMemory: " << CanAllocateExtraMemory);
TBase::OnMemoryLimitExceptionHandler();
} catch (const NMiniKQL::TKqpEnsureFail& e) {
InternalError((TIssuesIds::EIssueCode) e.GetCode(), e.GetMessage());
} catch (const yexception& e) {
Expand Down
5 changes: 1 addition & 4 deletions ydb/core/kqp/compute_actor/kqp_scan_compute_actor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,7 @@ class TKqpScanComputeActor: public NYql::NDq::TDqSyncComputeActorBase<TKqpScanCo
BaseStateFuncBody(ev);
}
} catch (const TMemoryLimitExceededException& e) {
const TString sInfo = TStringBuilder() << "Mkql memory limit exceeded, limit: " << GetMkqlMemoryLimit()
<< ", host: " << HostName() << ", canAllocateExtraMemory: " << CanAllocateExtraMemory;
CA_LOG_E("ERROR:" + sInfo);
InternalError(NYql::NDqProto::StatusIds::PRECONDITION_FAILED, NYql::TIssuesIds::KIKIMR_PRECONDITION_FAILED, sInfo);
TBase::OnMemoryLimitExceptionHandler();
} catch (const yexception& e) {
InternalError(NYql::NDqProto::StatusIds::INTERNAL_ERROR, NYql::TIssuesIds::DEFAULT_ERROR, e.what());
}
Expand Down