Skip to content

speed up column ids checkers and finder #8906

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 3 commits into from
Sep 9, 2024
Merged

speed up column ids checkers and finder #8906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
48c1553
speed up column ids checkers and finder
ivanmorozov333 Sep 8, 2024
1d287bb
fix
ivanmorozov333 Sep 8, 2024
0a5d9e9
fix build
ivanmorozov333 Sep 8, 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
23 changes: 15 additions & 8 deletions ydb/core/tx/columnshard/engines/portions/portion_info.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,22 +338,29 @@ class TPortionInfo {
}

const TColumnRecord* GetRecordPointer(const TChunkAddress& address) const {
for (auto&& i : Records) {
if (i.GetAddress() == address) {
return &i;
}
auto it = std::lower_bound(Records.begin(), Records.end(), address, [](const TColumnRecord& item, const TChunkAddress& address) {
return item.GetAddress() < address;
});
if (it != Records.end() && it->GetAddress() == address) {
return &*it;
}
return nullptr;
}

bool HasEntityAddress(const TChunkAddress& address) const {
for (auto&& c : GetRecords()) {
if (c.GetAddress() == address) {
{
auto it = std::lower_bound(Records.begin(), Records.end(), address, [](const TColumnRecord& item, const TChunkAddress& address) {
return item.GetAddress() < address;
});
if (it != Records.end() && it->GetAddress() == address) {
return true;
}
}
for (auto&& c : GetIndexes()) {
if (c.GetAddress() == address) {
{
auto it = std::lower_bound(Indexes.begin(), Indexes.end(), address, [](const TIndexChunk& item, const TChunkAddress& address) {
return item.GetAddress() < address;
});
if (it != Indexes.end() && it->GetAddress() == address) {
return true;
}
}
Expand Down
8 changes: 4 additions & 4 deletions ydb/core/tx/columnshard/engines/scheme/versions/filtered_scheme.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ TFilteredSnapshotSchema::TFilteredSnapshotSchema(const ISnapshotSchema::TPtr& or
}

TColumnSaver TFilteredSnapshotSchema::GetColumnSaver(const ui32 columnId) const {
AFL_VERIFY(std::find(ColumnIds.begin(), ColumnIds.end(), columnId) != ColumnIds.end());
AFL_VERIFY(IdIntoIndex.contains(columnId));
return OriginalSnapshot->GetColumnSaver(columnId);
}

std::shared_ptr<TColumnLoader> TFilteredSnapshotSchema::GetColumnLoaderOptional(const ui32 columnId) const {
AFL_VERIFY(std::find(ColumnIds.begin(), ColumnIds.end(), columnId) != ColumnIds.end());
AFL_VERIFY(IdIntoIndex.contains(columnId));
return OriginalSnapshot->GetColumnLoaderOptional(columnId);
}

Expand All @@ -35,15 +35,15 @@ std::optional<ui32> TFilteredSnapshotSchema::GetColumnIdOptional(const std::stri
if (!result) {
return result;
}
if (std::find(ColumnIds.begin(), ColumnIds.end(), *result) == ColumnIds.end()) {
if (!IdIntoIndex.contains(*result)) {
return std::nullopt;
}
return result;
}

ui32 TFilteredSnapshotSchema::GetColumnIdVerified(const std::string& columnName) const {
auto result = OriginalSnapshot->GetColumnIdVerified(columnName);
AFL_VERIFY(std::find(ColumnIds.begin(), ColumnIds.end(), result) != ColumnIds.end());
AFL_VERIFY(IdIntoIndex.contains(result));
return result;
}

Expand Down
Loading