Skip to content

fix memory prediction calculator #1432

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
ivanmorozov333 merged 2 commits into from
Jan 31, 2024
Merged

fix memory prediction calculator #1432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b33dac
fix memory prediction calculator
ivanmorozov333 Jan 30, 2024
613172c
clean
ivanmorozov333 Jan 30, 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
26 changes: 26 additions & 0 deletions ydb/core/tx/columnshard/engines/changes/general_compaction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,4 +275,30 @@ std::shared_ptr<TGeneralCompactColumnEngineChanges::IMemoryPredictor> TGeneralCo
}
}

ui64 TGeneralCompactColumnEngineChanges::TMemoryPredictorChunkedPolicy::AddPortion(const TPortionInfo& portionInfo) {
SumMemoryFix += portionInfo.GetRecordsCount() * (2 * sizeof(ui64) + sizeof(ui32) + sizeof(ui16));
++PortionsCount;
THashMap<ui32, ui64> maxChunkSizeByColumn;
for (auto&& i : portionInfo.GetRecords()) {
SumMemoryFix += i.BlobRange.Size;
auto it = maxChunkSizeByColumn.find(i.GetColumnId());
if (it == maxChunkSizeByColumn.end()) {
maxChunkSizeByColumn.emplace(i.GetColumnId(), i.GetMeta().GetRawBytesVerified());
} else {
if (it->second < i.GetMeta().GetRawBytesVerified()) {
it->second = i.GetMeta().GetRawBytesVerified();
}
}
}

SumMemoryDelta = 0;
for (auto&& i : maxChunkSizeByColumn) {
MaxMemoryByColumnChunk[i.first] += i.second;
SumMemoryDelta = std::max(SumMemoryDelta, MaxMemoryByColumnChunk[i.first]);
}

AFL_DEBUG(NKikimrServices::TX_COLUMNSHARD)("memory_prediction_after", SumMemoryFix + SumMemoryDelta)("portion_info", portionInfo.DebugString());
return SumMemoryFix + SumMemoryDelta;
}

}
21 changes: 3 additions & 18 deletions ydb/core/tx/columnshard/engines/changes/general_compaction.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,27 +50,12 @@ class TGeneralCompactColumnEngineChanges: public TCompactColumnEngineChanges {

class TMemoryPredictorChunkedPolicy: public IMemoryPredictor {
private:
ui64 SumMemory = 0;
ui64 SumMemoryDelta = 0;
ui64 SumMemoryFix = 0;
ui32 PortionsCount = 0;
THashMap<ui32, ui64> MaxMemoryByColumnChunk;
public:
virtual ui64 AddPortion(const TPortionInfo& portionInfo) override {
SumMemory += portionInfo.GetRecordsCount() * (2 * sizeof(ui64) + sizeof(ui32) + sizeof(ui16));
for (auto&& i : portionInfo.GetRecords()) {
SumMemory += i.BlobRange.Size;
auto it = MaxMemoryByColumnChunk.find(i.GetColumnId());
++PortionsCount;
if (it == MaxMemoryByColumnChunk.end()) {
it = MaxMemoryByColumnChunk.emplace(i.GetColumnId(), i.GetMeta().GetRawBytesVerified()).first;
SumMemory += it->second * PortionsCount;
} else if (it->second < i.GetMeta().GetRawBytesVerified()) {
SumMemory -= it->second * (PortionsCount - 1);
it->second = i.GetMeta().GetRawBytesVerified();
SumMemory += it->second * PortionsCount;
}
}
return SumMemory;
}
virtual ui64 AddPortion(const TPortionInfo& portionInfo) override;
};

static std::shared_ptr<IMemoryPredictor> BuildMemoryPredictor();
Expand Down