Skip to content

YQL-18516 reduce grace join with spilling memory consumption #5087

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
merged 4 commits into from
Jun 5, 2024
Merged

YQL-18516 reduce grace join with spilling memory consumption #5087

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5302382
YQL-18516 reduce grace join with spilling memory consumption
lll-phill-lll May 31, 2024
9529742
use shrink
lll-phill-lll Jun 4, 2024
ba289f7
removed debug prints
lll-phill-lll Jun 4, 2024
c8913b7
fixup
lll-phill-lll Jun 4, 2024
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
2 changes: 2 additions & 0 deletions ydb/library/yql/minikql/comp_nodes/mkql_grace_join.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,9 +887,11 @@ EFetchResult ProcessSpilledData(TComputationContext&, NUdf::TUnboxedValue*const*

LeftPacker->TuplesBatchPacked = 0;
LeftPacker->TablePtr->ClearBucket(NextBucketToJoin); // Clear content of returned bucket
LeftPacker->TablePtr->ShrinkBucket(NextBucketToJoin);

RightPacker->TuplesBatchPacked = 0;
RightPacker->TablePtr->ClearBucket(NextBucketToJoin); // Clear content of returned bucket
RightPacker->TablePtr->ShrinkBucket(NextBucketToJoin);

JoinedTablePtr->Clear();
JoinedTablePtr->ResetIterator();
Expand Down
12 changes: 12 additions & 0 deletions ydb/library/yql/minikql/comp_nodes/mkql_grace_join_imp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1128,6 +1128,18 @@ void TTable::ClearBucket(ui64 bucket) {
tbs.StringValuesTotalSize = 0;
}

void TTable::ShrinkBucket(ui64 bucket) {
TTableBucket & tb = TableBuckets[bucket];
tb.KeyIntVals.shrink_to_fit();
tb.DataIntVals.shrink_to_fit();
tb.StringsOffsets.shrink_to_fit();
tb.StringsValues.shrink_to_fit();
tb.InterfaceValues.shrink_to_fit();
tb.InterfaceOffsets.shrink_to_fit();
tb.JoinIds.shrink_to_fit();
tb.RightIds.shrink_to_fit();
}

void TTable::InitializeBucketSpillers(ISpiller::TPtr spiller) {
for (size_t i = 0; i < NumberOfBuckets; ++i) {
TableBucketsSpillers.emplace_back(spiller, 5_MB);
Expand Down
3 changes: 3 additions & 0 deletions ydb/library/yql/minikql/comp_nodes/mkql_grace_join_imp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,9 @@ class TTable {
// Clears all the data related to a single bucket
void ClearBucket(ui64 bucket);

// Forces bucket to release the space used for underlying containers.
void ShrinkBucket(ui64 bucket);

// Clears table content
void Clear();

Expand Down