Skip to content

feat: Leaf index requests to the native world state can now be performed as a batch query #10649

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
PhilWindle merged 13 commits into from
Dec 13, 2024
Merged

feat: Leaf index requests to the native world state can now be performed as a batch query #10649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
eeebb87
Batched index requests
PhilWindle Dec 11, 2024
c0c37a6
Tests passing
PhilWindle Dec 11, 2024
0bd75fb
Constraining tree sizes properly in the store
PhilWindle Dec 11, 2024
af86639
TS Changes
PhilWindle Dec 11, 2024
64b3bc1
Fixes
PhilWindle Dec 12, 2024
8776e33
Fixes
PhilWindle Dec 12, 2024
00b4fcb
Added test
PhilWindle Dec 12, 2024
89455a6
Fix
PhilWindle Dec 12, 2024
47dcdf9
Merge remote-tracking branch 'origin/master' into pw/batch-index-requ…
PhilWindle Dec 12, 2024
02de3b0
Review fix
PhilWindle Dec 12, 2024
cf239af
Bug fix
PhilWindle Dec 12, 2024
f8be12a
Test fix
PhilWindle Dec 12, 2024
1902cd4
Test fix
PhilWindle Dec 12, 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
108 changes: 51 additions & 57 deletions ...c/barretenberg/crypto/merkle_tree/append_only_tree/content_addressed_append_only_tree.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,32 +159,34 @@ template <typename Store, typename HashingPolicy> class ContentAddressedAppendOn
/**
* @brief Returns the index of the provided leaf in the tree
*/
void find_leaf_index(const fr& leaf, bool includeUncommitted, const FindLeafCallback& on_completion) const;
void find_leaf_indices(const std::vector<typename Store::LeafType>& leaves,
bool includeUncommitted,
const FindLeafCallback& on_completion) const;

/**
* @brief Returns the index of the provided leaf in the tree
*/
void find_leaf_index(const fr& leaf,
const block_number_t& blockNumber,
bool includeUncommitted,
const FindLeafCallback& on_completion) const;
void find_leaf_indices(const std::vector<typename Store::LeafType>& leaves,
const block_number_t& blockNumber,
bool includeUncommitted,
const FindLeafCallback& on_completion) const;

/**
* @brief Returns the index of the provided leaf in the tree only if it exists after the index value provided
*/
void find_leaf_index_from(const fr& leaf,
const index_t& start_index,
bool includeUncommitted,
const FindLeafCallback& on_completion) const;
void find_leaf_indices_from(const std::vector<typename Store::LeafType>& leaves,
const index_t& start_index,
bool includeUncommitted,
const FindLeafCallback& on_completion) const;

/**
* @brief Returns the index of the provided leaf in the tree only if it exists after the index value provided
*/
void find_leaf_index_from(const fr& leaf,
const index_t& start_index,
const block_number_t& blockNumber,
bool includeUncommitted,
const FindLeafCallback& on_completion) const;
void find_leaf_indices_from(const std::vector<typename Store::LeafType>& leaves,
const index_t& start_index,
const block_number_t& blockNumber,
bool includeUncommitted,
const FindLeafCallback& on_completion) const;

/**
* @brief Returns the block numbers that correspond to the given indices values
Expand Down Expand Up @@ -415,14 +417,9 @@ void ContentAddressedAppendOnlyTree<Store, HashingPolicy>::find_block_numbers(
execute_and_report<BlockForIndexResponse>(
[=, this](TypedResponse<BlockForIndexResponse>& response) {
response.inner.blockNumbers.reserve(indices.size());
TreeMeta meta;
ReadTransactionPtr tx = store_->create_read_transaction();
store_->get_meta(meta, *tx, true);
index_t maxIndex = meta.committedSize;
for (index_t index : indices) {
bool outOfRange = index >= maxIndex;
std::optional<block_number_t> block =
outOfRange ? std::nullopt : store_->find_block_for_index(index, *tx);
std::optional<block_number_t> block = store_->find_block_for_index(index, *tx);
response.inner.blockNumbers.emplace_back(block);
}
},
Expand All @@ -441,16 +438,14 @@ void ContentAddressedAppendOnlyTree<Store, HashingPolicy>::find_block_numbers(
execute_and_report<BlockForIndexResponse>(
[=, this](TypedResponse<BlockForIndexResponse>& response) {
response.inner.blockNumbers.reserve(indices.size());
TreeMeta meta;
BlockPayload blockPayload;
ReadTransactionPtr tx = store_->create_read_transaction();
store_->get_meta(meta, *tx, true);
if (!store_->get_block_data(blockNumber, blockPayload, *tx)) {
throw std::runtime_error(format("Unable to find block numbers for indices for block ",
blockNumber,
", failed to get block data."));
}
index_t maxIndex = std::min(meta.committedSize, blockPayload.size);
index_t maxIndex = blockPayload.size;
for (index_t index : indices) {
bool outOfRange = index >= maxIndex;
std::optional<block_number_t> block =
Expand Down Expand Up @@ -718,43 +713,45 @@ void ContentAddressedAppendOnlyTree<Store, HashingPolicy>::get_leaf(const index_
}

template <typename Store, typename HashingPolicy>
void ContentAddressedAppendOnlyTree<Store, HashingPolicy>::find_leaf_index(const fr& leaf,
bool includeUncommitted,
const FindLeafCallback& on_completion) const
void ContentAddressedAppendOnlyTree<Store, HashingPolicy>::find_leaf_indices(
const std::vector<typename Store::LeafType>& leaves,
bool includeUncommitted,
const FindLeafCallback& on_completion) const
{
find_leaf_index_from(leaf, 0, includeUncommitted, on_completion);
find_leaf_indices_from(leaves, 0, includeUncommitted, on_completion);
}

template <typename Store, typename HashingPolicy>
void ContentAddressedAppendOnlyTree<Store, HashingPolicy>::find_leaf_index(const fr& leaf,
const block_number_t& blockNumber,
bool includeUncommitted,
const FindLeafCallback& on_completion) const
void ContentAddressedAppendOnlyTree<Store, HashingPolicy>::find_leaf_indices(
const std::vector<typename Store::LeafType>& leaves,
const block_number_t& blockNumber,
bool includeUncommitted,
const FindLeafCallback& on_completion) const
{
find_leaf_index_from(leaf, 0, blockNumber, includeUncommitted, on_completion);
find_leaf_indices_from(leaves, 0, blockNumber, includeUncommitted, on_completion);
}

template <typename Store, typename HashingPolicy>
void ContentAddressedAppendOnlyTree<Store, HashingPolicy>::find_leaf_index_from(
const fr& leaf, const index_t& start_index, bool includeUncommitted, const FindLeafCallback& on_completion) const
void ContentAddressedAppendOnlyTree<Store, HashingPolicy>::find_leaf_indices_from(
const std::vector<typename Store::LeafType>& leaves,
const index_t& start_index,
bool includeUncommitted,
const FindLeafCallback& on_completion) const
{
auto job = [=, this]() -> void {
execute_and_report<FindLeafIndexResponse>(
[=, this](TypedResponse<FindLeafIndexResponse>& response) {
if (leaf == fr::zero()) {
throw std::runtime_error("Requesting indices for zero leaves is prohibited");
}
response.inner.leaf_indices.reserve(leaves.size());
ReadTransactionPtr tx = store_->create_read_transaction();

RequestContext requestContext;
requestContext.includeUncommitted = includeUncommitted;
requestContext.root = store_->get_current_root(*tx, includeUncommitted);
std::optional<index_t> leaf_index =
store_->find_leaf_index_from(leaf, start_index, requestContext, *tx, includeUncommitted);
response.success = leaf_index.has_value();
if (response.success) {
response.inner.leaf_index = leaf_index.value();
} else {
response.message = format("Failed to find index from ", start_index, " for leaf ", leaf);

for (const auto& leaf : leaves) {
std::optional<index_t> leaf_index =
store_->find_leaf_index_from(leaf, start_index, requestContext, *tx);
response.inner.leaf_indices.emplace_back(leaf_index);
}
},
on_completion);
Expand All @@ -763,8 +760,8 @@ void ContentAddressedAppendOnlyTree<Store, HashingPolicy>::find_leaf_index_from(
}

template <typename Store, typename HashingPolicy>
void ContentAddressedAppendOnlyTree<Store, HashingPolicy>::find_leaf_index_from(
const fr& leaf,
void ContentAddressedAppendOnlyTree<Store, HashingPolicy>::find_leaf_indices_from(
const std::vector<typename Store::LeafType>& leaves,
const index_t& start_index,
const block_number_t& blockNumber,
bool includeUncommitted,
Expand All @@ -773,12 +770,10 @@ void ContentAddressedAppendOnlyTree<Store, HashingPolicy>::find_leaf_index_from(
auto job = [=, this]() -> void {
execute_and_report<FindLeafIndexResponse>(
[=, this](TypedResponse<FindLeafIndexResponse>& response) {
response.inner.leaf_indices.reserve(leaves.size());
if (blockNumber == 0) {
throw std::runtime_error("Unable to find leaf index for block number 0");
}
if (leaf == fr::zero()) {
throw std::runtime_error("Requesting indices for zero leaves is prohibited");
}
ReadTransactionPtr tx = store_->create_read_transaction();
BlockPayload blockData;
if (!store_->get_block_data(blockNumber, blockData, *tx)) {
Expand All @@ -788,18 +783,17 @@ void ContentAddressedAppendOnlyTree<Store, HashingPolicy>::find_leaf_index_from(
blockNumber,
", failed to get block data."));
}

RequestContext requestContext;
requestContext.blockNumber = blockNumber;
requestContext.includeUncommitted = includeUncommitted;
requestContext.root = blockData.root;
std::optional<index_t> leaf_index =
store_->find_leaf_index_from(leaf, start_index, requestContext, *tx, includeUncommitted);
response.success = leaf_index.has_value();
if (response.success) {
response.inner.leaf_index = leaf_index.value();
} else {
response.message = format(
"Failed to find index from ", start_index, " for leaf ", leaf, " at block ", blockNumber);
requestContext.maxIndex = blockData.size;

for (const auto& leaf : leaves) {
std::optional<index_t> leaf_index =
store_->find_leaf_index_from(leaf, start_index, requestContext, *tx);
response.inner.leaf_indices.emplace_back(leaf_index);
}
},
on_completion);
Expand Down
Loading