Skip to content

Use aliasing shared pointers instead of extra lifetime object #2690

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

Open
RobinTF wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Use aliasing shared pointers instead of extra lifetime object #2690

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dee3cc2
Use aliasing shared pointers instead of extra lifetime object
RobinTF Feb 2, 2026
ce2a6b5
Polish code a little bit more
RobinTF Feb 3, 2026
3ed553e
Perform a micro-optimization
RobinTF Feb 3, 2026
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
40 changes: 22 additions & 18 deletions src/engine/CartesianProductJoin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,51 +369,55 @@ Result::LazyResult CartesianProductJoin::createLazyConsumer(
std::vector<std::shared_ptr<const Result>> subresults,
std::shared_ptr<const Result> lazyResult) const {
AD_CONTRACT_CHECK(lazyResult);
std::vector<std::reference_wrapper<const IdTable>> idTables;
std::vector<std::shared_ptr<const IdTable>> idTables;
idTables.reserve(subresults.size() + 1);
for (const auto& result : subresults) {
idTables.emplace_back(result->idTable());
for (auto& result : subresults) {
auto* idTable = &result->idTable();
idTables.emplace_back(std::move(result), idTable);
}
// Placeholder, will be replaced with the current `IdTable` from the lazy
// result.
idTables.emplace_back(nullptr);

auto generatedTables = lazyResult->idTables();

auto get = [self = this, staticMergedVocab = std::move(staticMergedVocab),
limit = getLimitOffset().limitOrDefault(),
offset = getLimitOffset()._offset, idTables = std::move(idTables),
subresults = std::move(subresults), lastTableOffset = size_t{0},
producedTableSize = size_t{0},
idTableOpt = std::optional<Result::IdTableVocabPair>{}](
auto& idTableVocabPair) mutable {
lastTableOffset = size_t{0}, producedTableSize = size_t{0},
lazyResult =
std::move(lazyResult)](auto& idTableVocabPair) mutable {
Comment on lines +388 to +389
Copy link
Collaborator Author

@RobinTF RobinTF Feb 2, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added the lazyResult, because otherwise this result would also go out of scope. Not sure what the consequences would be but just to be safe.

// These things have to be done after handling a single input, so we do them
// at the beginning of each but the last iteration.
if (idTableOpt.has_value()) {
idTables.pop_back();
lastTableOffset += idTableOpt->idTable_.size();
if (idTables.back() != nullptr) {
lastTableOffset += idTables.back()->size();
limit -= producedTableSize;
offset += producedTableSize;
producedTableSize = 0;
}

idTableOpt = std::move(idTableVocabPair);
auto& [idTable, localVocab] = idTableOpt.value();
if (idTable.empty()) {
auto& [idTable, localVocab] = idTableVocabPair;
idTables.pop_back();
idTables.push_back(std::make_shared<const IdTable>(std::move(idTable)));
if (idTables.back()->empty()) {
return Result::IdTableLoopControl::makeContinue();
}

idTables.emplace_back(idTable);
localVocab.mergeWith(staticMergedVocab);

return Result::IdTableLoopControl::yieldAll(
ad_utility::InputRangeTypeErased{
ad_utility::OwningView{self->produceTablesLazily(
std::move(localVocab),
ql::views::transform(idTables,
ad_utility::staticCast<const IdTable&>),
offset, limit, lastTableOffset)} |
ql::views::transform(idTables, ad_utility::dereference), offset,
limit, lastTableOffset)} |
ql::views::transform([&producedTableSize](auto& tableAndVocab) {
producedTableSize += tableAndVocab.idTable_.size();
return std::move(tableAndVocab);
})});
};
return Result::LazyResult(ad_utility::CachingContinuableTransformInputRange(
lazyResult->idTables(), std::move(get)));
std::move(generatedTables), std::move(get)));
}

// _____________________________________________________________________________
Expand Down
Loading