Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

fixed bug in nano::rocksdb::store::clear() #4304

Merged
merged 2 commits into from
Oct 1, 2023
Merged

fixed bug in nano::rocksdb::store::clear() #4304

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8d30238
fixed bug in store::clear() - builds batch of delete operations to be…
brandon-bb Sep 6, 2023
f32261d
fixed bug in store::clear()
brandon-bb Sep 6, 2023
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
22 changes: 11 additions & 11 deletions nano/store/rocksdb/rocksdb.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,19 +697,19 @@ int nano::store::rocksdb::component::drop (store::write_transaction const & tran

int nano::store::rocksdb::component::clear (::rocksdb::ColumnFamilyHandle * column_family)
{
// Dropping completely removes the column
auto name = column_family->GetName ();
auto status = db->DropColumnFamily (column_family);
release_assert (status.ok ());
::rocksdb::ReadOptions read_options;
::rocksdb::WriteOptions write_options;
::rocksdb::WriteBatch write_batch;
std::unique_ptr<::rocksdb::Iterator> it (db->NewIterator (read_options, column_family));

// Need to add it back as we just want to clear the contents
auto handle_it = std::find_if (handles.begin (), handles.end (), [column_family] (auto & handle) {
return handle.get () == column_family;
});
debug_assert (handle_it != handles.cend ());
status = db->CreateColumnFamily (get_cf_options (name), name, &column_family);
for (it->SeekToFirst (); it->Valid (); it->Next ())
{
write_batch.Delete (column_family, it->key ());
}

::rocksdb::Status status = db->Write (write_options, &write_batch);
release_assert (status.ok ());
handle_it->reset (column_family);

return status.code ();
}

Expand Down
Loading