blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove dummy entries in Blockstore special columns (#33511) 

These entries were found to improve compaction performance when
LedgerCleanupService was performing direct compactions on each primary
index. Cleaning by primary index has been deprecated for a while, and
as such, these dummy entries are no longer needed and can be removed.
This commit is contained in:
steviez 2023-10-03 22:53:55 +02:00 committed by GitHub
parent 3008cd8ac1
commit 9761e6f251
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ledger/src/blockstore.rs
View File

@ -2127,14 +2127,29 @@ impl Blockstore {
.put(0, &TransactionStatusIndexMeta::default())?;
self.transaction_status_index_cf
.put(1, &TransactionStatusIndexMeta::default())?;
// This dummy status improves compaction performance
let default_status = TransactionStatusMeta::default().into();
self.transaction_status_cf
.put_protobuf(cf::TransactionStatus::as_index(2), &default_status)?;
self.address_signatures_cf.put(
cf::AddressSignatures::as_index(2),
&AddressSignatureMeta::default(),
)
// If present, delete dummy entries inserted by old software
// https://github.com/solana-labs/solana/blob/bc2b372/ledger/src/blockstore.rs#L2130-L2137
let transaction_status_dummy_key = cf::TransactionStatus::as_index(2);
if self
.transaction_status_cf
.get_protobuf_or_bincode::<StoredTransactionStatusMeta>(transaction_status_dummy_key)?
.is_some()
{
self.transaction_status_cf
.delete(transaction_status_dummy_key)?;
};
let address_signatures_dummy_key = cf::AddressSignatures::as_index(2);
if self
.address_signatures_cf
.get(address_signatures_dummy_key)?
.is_some()
{
self.address_signatures_cf
.delete(address_signatures_dummy_key)?;
};
Ok(())
}
/// Toggles the active primary index between `0` and `1`, and clears the
@ -7669,8 +7684,6 @@ pub mod tests {
fn test_get_transaction_status() {
let ledger_path = get_tmp_ledger_path_auto_delete!();
let blockstore = Blockstore::open(ledger_path.path()).unwrap();
// TransactionStatus column opens initialized with one entry at index 2
let transaction_status_cf = &blockstore.transaction_status_cf;
let pre_balances_vec = vec![1, 2, 3];
@ -7849,13 +7862,13 @@ pub mod tests {
.get_transaction_status_with_counter(signature7, &[].into())
.unwrap();
assert_eq!(status, None);
assert_eq!(counter, 2);
assert_eq!(counter, 1);
let (status, counter) = blockstore
.get_transaction_status_with_counter(signature7, &[3].into())
.unwrap();
assert_eq!(status, None);
assert_eq!(counter, 2);
assert_eq!(counter, 1);
}
fn do_test_lowest_cleanup_slot_and_special_cfs(simulate_ledger_cleanup_service: bool) {
@ -7863,8 +7876,6 @@ pub mod tests {
let ledger_path = get_tmp_ledger_path_auto_delete!();
let blockstore = Blockstore::open(ledger_path.path()).unwrap();
// TransactionStatus column opens initialized with one entry at index 2
let transaction_status_cf = &blockstore.transaction_status_cf;
let pre_balances_vec = vec![1, 2, 3];

13
ledger/src/blockstore/blockstore_purge.rs
View File

@ -649,9 +649,6 @@ pub mod tests {
IteratorDirection::Forward,
))
.unwrap();
let padding_entry = status_entry_iterator.next().unwrap().0;
assert_eq!(padding_entry.0, 2);
assert_eq!(padding_entry.2, 0);
assert!(status_entry_iterator.next().is_none());
let mut address_transactions_iterator = blockstore
.db
@ -660,10 +657,8 @@ pub mod tests {
IteratorDirection::Forward,
))
.unwrap();
let padding_entry = address_transactions_iterator.next().unwrap().0;
assert_eq!(padding_entry.0, 2);
assert_eq!(padding_entry.2, 0);
assert!(address_transactions_iterator.next().is_none());
assert_eq!(
transaction_status_index_cf.get(0).unwrap().unwrap(),
TransactionStatusIndexMeta {
@ -1095,8 +1090,6 @@ pub mod tests {
frozen: false,
}
);
let entry = status_entry_iterator.next().unwrap().0;
assert_eq!(entry.0, 2); // Buffer entry, no index 1 entries remaining
drop(status_entry_iterator);
// Purge up to but not including index0_max_slot
@ -1135,6 +1128,8 @@ pub mod tests {
IteratorDirection::Forward,
))
.unwrap();
assert!(status_entry_iterator.next().is_none());
assert_eq!(
blockstore
.transaction_status_index_cf
@ -1157,8 +1152,6 @@ pub mod tests {
frozen: false,
}
);
let entry = status_entry_iterator.next().unwrap().0;
assert_eq!(entry.0, 2); // Buffer entry, no index 0 or index 1 entries remaining
}
#[test]