Skip to content
This repository has been archived by the owner on Aug 2, 2022. It is now read-only.

cache key values in iterator store in db_context_rocksdb #10093

Merged
merged 2 commits into from
Mar 18, 2021
Merged

cache key values in iterator store in db_context_rocksdb #10093

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
6c37902
cache key values in iterator store in db_context_rocksdb
linhuang-blockone Feb 25, 2021
3511519
Fix temporary shared_bytes and use value from iterator directly
linhuang-blockone Mar 18, 2021
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
62 changes: 33 additions & 29 deletions libraries/chain/backing_store/db_context_rocksdb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,16 +200,16 @@ namespace eosio { namespace chain { namespace backing_store {

const unique_table t { receiver, scope_name, table_name };
const auto table_ei = primary_iter_store.cache_table(t);
return primary_iter_store.add(primary_key_iter(table_ei, id, payer));
const auto store_itr = primary_iter_store.add(primary_key_iter(table_ei, id, payer));
primary_iter_store.set_value(store_itr, pp.value, pp.value_size);
return store_itr;
}

void db_context_rocksdb::db_update_i64(int32_t itr, account_name payer, const char* value , size_t value_size) {
const auto& key_store = primary_iter_store.get(itr);
const auto& table_store = primary_iter_store.get_table(key_store);
EOS_ASSERT( table_store.contract == receiver, table_access_violation, "db access violation" );
const auto old_key_value = get_primary_key_value(receiver, table_store.scope, table_store.table, key_store.primary);

EOS_ASSERT( old_key_value.value, db_rocksdb_invalid_operation_exception,
EOS_ASSERT( key_store.value, db_rocksdb_invalid_operation_exception,
"invariant failure in db_update_i64, iter store found to update but nothing in database");

// copy locally, since below the key_store memory will be changed
Expand All @@ -218,11 +218,11 @@ namespace eosio { namespace chain { namespace backing_store {
payer = old_payer;
}

const payer_payload old_pp{*old_key_value.value};
const auto old_value_actual_size = old_pp.value_size;
const auto old_value_actual_size = key_store.value->size();

const payer_payload pp{payer, value, value_size};
set_value(old_key_value.full_key, pp);
prefix_bundle old_key = get_primary_slice_in_primaries(table_store.contract, table_store.scope,table_store.table, key_store.primary);
Copy link
Contributor

Choose a reason for hiding this comment

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

get_primary_slice_in_primaries creates an extra key that we don't use, so we could create a new method that just creates the key_bundle instead of a prefix_bundle.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks for your suggestion. Will create a new method in a future PR in the performance activity.

set_value(old_key.full_key, pp);

std::string event_id;
auto dm_logger = context.control.get_deep_mind_logger();
Expand Down Expand Up @@ -250,17 +250,17 @@ namespace eosio { namespace chain { namespace backing_store {
if (dm_logger != nullptr) {
db_context::log_row_update(*dm_logger, context.get_action_id(), table_store.contract, table_store.scope,
table_store.table, old_payer, payer, name(key_store.primary),
old_key_value.value->data(), old_key_value.value->size(), value, value_size);
key_store.value->data(), old_value_actual_size, value, value_size);
}

primary_iter_store.set_value(itr, value, value_size);
}

void db_context_rocksdb::db_remove_i64(int32_t itr) {
const auto& key_store = primary_iter_store.get(itr);
const auto& table_store = primary_iter_store.get_table(key_store);
EOS_ASSERT( table_store.contract == receiver, table_access_violation, "db access violation" );
const auto old_key_value = get_primary_key_value(receiver, table_store.scope, table_store.table, key_store.primary);

EOS_ASSERT( old_key_value.value, db_rocksdb_invalid_operation_exception,
EOS_ASSERT( key_store.value, db_rocksdb_invalid_operation_exception,
"invariant failure in db_remove_i64, iter store found to update but nothing in database");

const auto old_payer = key_store.payer;
Expand All @@ -271,36 +271,31 @@ namespace eosio { namespace chain { namespace backing_store {
event_id = db_context::table_event(table_store.contract, table_store.scope, table_store.table, name(key_store.primary));
}

payer_payload pp(*old_key_value.value);
update_db_usage( old_payer, -(pp.value_size + db_key_value_any_lookup::overhead), db_context::row_rem_trace(context.get_action_id(), std::move(event_id)) );
update_db_usage( old_payer, -(key_store.value->size() + db_key_value_any_lookup::overhead), db_context::row_rem_trace(context.get_action_id(), std::move(event_id)) );

if (dm_logger != nullptr) {
db_context::log_row_remove(*dm_logger, context.get_action_id(), table_store.contract, table_store.scope,
table_store.table, old_payer, name(key_store.primary), pp.value,
pp.value_size);
table_store.table, old_payer, name(key_store.primary), key_store.value->data(),
key_store.value->size());
}

current_session.erase(old_key_value.full_key);
primary_lookup.remove_table_if_empty(old_key_value.full_key);
prefix_bundle old_key = get_primary_slice_in_primaries(table_store.contract, table_store.scope,table_store.table, key_store.primary);
Copy link
Contributor

Choose a reason for hiding this comment

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

other comment applies here as well

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Will do it in a future PR.

current_session.erase(old_key.full_key);
primary_lookup.remove_table_if_empty(old_key.full_key);

primary_iter_store.remove(itr); // don't use key_store anymore
}

int32_t db_context_rocksdb::db_get_i64(int32_t itr, char* value , size_t value_size) {
const auto& key_store = primary_iter_store.get(itr);
const auto& table_store = primary_iter_store.get_table(key_store);
const auto old_key_value = get_primary_key_value(table_store.contract, table_store.scope, table_store.table, key_store.primary);

EOS_ASSERT( old_key_value.value, db_rocksdb_invalid_operation_exception,
EOS_ASSERT( key_store.value, db_rocksdb_invalid_operation_exception,
"invariant failure in db_get_i64, iter store found to update but nothing in database");
payer_payload pp {*old_key_value.value};
const char* const actual_value = pp.value;
const size_t actual_size = pp.value_size;
const size_t actual_size = key_store.value->size();
if (value_size == 0) {
return actual_size;
}
const size_t copy_size = std::min<size_t>(value_size, actual_size);
memcpy( value, actual_value, copy_size );
memcpy( value, key_store.value->data(), copy_size );
return copy_size;
}

Expand Down Expand Up @@ -394,6 +389,7 @@ namespace eosio { namespace chain { namespace backing_store {
const account_name found_payer = pp.payer;

const auto store_itr = primary_iter_store.add(primary_key_iter(table_ei, id, found_payer));
primary_iter_store.set_value(store_itr, pp.value, pp.value_size);
return store_itr;
}

Expand Down Expand Up @@ -707,9 +703,13 @@ namespace eosio { namespace chain { namespace backing_store {
"invariant failure in ${func}, iter store found to update but no primary keys in database",
("func", calling_func));

const account_name found_payer = payer_payload(*(*session_iter).second).payer;
auto value = *(*session_iter).second; // copy the value out so it remains persistent
payer_payload pp(value);
const account_name found_payer = pp.payer;
const auto store_itr = primary_iter_store.add(primary_key_iter(table_ei, found_key, found_payer));
brianjohnson5972 marked this conversation as resolved.
Show resolved Hide resolved
primary_iter_store.set_value(store_itr, pp.value, pp.value_size);

return primary_iter_store.add(primary_key_iter(table_ei, found_key, found_payer));
return store_itr;
}

// returns the exact iterator and the bounding key (type)
Expand Down Expand Up @@ -763,16 +763,20 @@ namespace eosio { namespace chain { namespace backing_store {
primary_key = id;
}

const account_name found_payer = payer_payload(*(*session_iter).second).payer;
auto value = *(*session_iter).second; // copy the value out so it remains persistent
payer_payload pp(value);
const account_name found_payer = pp.payer;
if (!primary_key) {
uint64_t key = 0;
const auto valid = db_key_value_format::get_primary_key((*session_iter).first, desired_type_prefix, key);
EOS_ASSERT( valid, db_rocksdb_invalid_operation_exception,
"invariant failure in find_i64, primary key already verified but method indicates it is not a primary key");
primary_key = key;
}
const auto store_itr = primary_iter_store.add(primary_key_iter(table_ei, *primary_key, found_payer));
primary_iter_store.set_value(store_itr, pp.value, pp.value_size);

return primary_iter_store.add(primary_key_iter(table_ei, *primary_key, found_payer));
return store_itr;
}

std::unique_ptr<db_context> create_db_rocksdb_context(apply_context& context, name receiver,
Expand Down
14 changes: 14 additions & 0 deletions libraries/chain/include/eosio/chain/backing_store/db_key_value_iter_store.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ struct secondary_key {
T secondary;
uint64_t primary;
account_name payer;
std::optional<bytes> value;
};

inline bool operator<(const unique_table& lhs, const unique_table& rhs) {
Expand Down Expand Up @@ -138,6 +139,19 @@ class db_key_value_iter_store {
return _iterator_to_object.size() - 1;
}

void set_value(int iterator, const char* data, std::size_t size) {
validate_object_iterator(iterator, "dereference of end iterator");
// grab a const ref, to ensure that we are returning a reference to the actual object in the vector
auto& result = _iterator_to_object[iterator];
EOS_ASSERT( result, table_operation_not_permitted, "dereference of deleted object" );
if (!result->value) {
result->value = bytes(size);
} else {
result->value->resize(size);
}
std::memcpy(result->value->data(), data, size);
}

private:
void validate_object_iterator(int iterator, const char* explanation_for_no_end_iterators) const {
EOS_ASSERT( iterator != invalid_iterator(), invalid_table_iterator, "invalid iterator" );
Expand Down