Skip to content
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

blockstore: Cleanup redundant constants #4672

Merged
merged 21 commits into from
Jan 28, 2025
Merged

blockstore: Cleanup redundant constants #4672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
85021f4
meta
steviez Jan 28, 2025
b76c868
dead_slots
steviez Jan 28, 2025
08d7365
duplicate_slots
steviez Jan 28, 2025
9c877a6
erasure_meta
steviez Jan 28, 2025
264eb98
orphans
steviez Jan 28, 2025
f654f64
bank_hashes
steviez Jan 28, 2025
91d02bb
root
steviez Jan 28, 2025
4a94426
merkle_root_meta
steviez Jan 28, 2025
d9b6acf
optimistic_slots
steviez Jan 28, 2025
ea05529
index
steviez Jan 28, 2025
07725d1
data_shred
steviez Jan 28, 2025
563d636
code_shred
steviez Jan 28, 2025
2bdc653
program_costs
steviez Jan 28, 2025
60f3853
block_height
steviez Jan 28, 2025
1d608ed
perf_samples
steviez Jan 28, 2025
379c03f
block_time
steviez Jan 28, 2025
1f05a69
rewards
steviez Jan 28, 2025
6ece879
transaction_status_index
steviez Jan 28, 2025
57e3ee1
transaction_memos
steviez Jan 28, 2025
fa97f9b
address_signatures
steviez Jan 28, 2025
c3372f7
transaction_status
steviez Jan 28, 2025
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
6 changes: 2 additions & 4 deletions ledger/src/blockstore_cleanup_service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use {
crate::{
blockstore::{Blockstore, PurgeType},
blockstore_db::{Result as BlockstoreResult, DATA_SHRED_CF},
blockstore_db::{columns, ColumnName, Result as BlockstoreResult},
},
solana_measure::measure::Measure,
solana_sdk::clock::{Slot, DEFAULT_MS_PER_SLOT},
Expand Down Expand Up @@ -105,14 +105,12 @@ impl BlockstoreCleanupService {
root: Slot,
max_ledger_shreds: u64,
) -> (bool, Slot, u64) {
let data_shred_cf_name = DATA_SHRED_CF.to_string();

let live_files = blockstore
.live_files_metadata()
.expect("Blockstore::live_files_metadata()");
let num_shreds = live_files
.iter()
.filter(|live_file| live_file.column_family_name == data_shred_cf_name)
.filter(|live_file| live_file.column_family_name == columns::ShredData::NAME)
.map(|file_meta| file_meta.num_entries)
.sum();

Expand Down
88 changes: 21 additions & 67 deletions ledger/src/blockstore_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,52 +56,6 @@ const MAX_WRITE_BUFFER_SIZE: u64 = 256 * 1024 * 1024; // 256MB
// include/rocksdb/advanced_options.h#L908C30-L908C30
const PERIODIC_COMPACTION_SECONDS: u64 = 60 * 60 * 24;

// Column family for metadata about a leader slot
const META_CF: &str = "meta";
// Column family for slots that have been marked as dead
const DEAD_SLOTS_CF: &str = "dead_slots";
// Column family for storing proof that there were multiple
// versions of a slot
const DUPLICATE_SLOTS_CF: &str = "duplicate_slots";
// Column family storing erasure metadata for a slot
const ERASURE_META_CF: &str = "erasure_meta";
// Column family for orphans data
const ORPHANS_CF: &str = "orphans";
/// Column family for bank hashes
const BANK_HASH_CF: &str = "bank_hashes";
// Column family for root data
const ROOT_CF: &str = "root";
/// Column family for indexes
const INDEX_CF: &str = "index";
/// Column family for Data Shreds
pub const DATA_SHRED_CF: &str = "data_shred";
/// Column family for Code Shreds
const CODE_SHRED_CF: &str = "code_shred";
/// Column family for Transaction Status
const TRANSACTION_STATUS_CF: &str = "transaction_status";
/// Column family for Address Signatures
const ADDRESS_SIGNATURES_CF: &str = "address_signatures";
/// Column family for TransactionMemos
const TRANSACTION_MEMOS_CF: &str = "transaction_memos";
/// Column family for the Transaction Status Index.
/// This column family is used for tracking the active primary index for columns that for
/// query performance reasons should not be indexed by Slot.
const TRANSACTION_STATUS_INDEX_CF: &str = "transaction_status_index";
/// Column family for Rewards
const REWARDS_CF: &str = "rewards";
/// Column family for Blocktime
const BLOCKTIME_CF: &str = "blocktime";
/// Column family for Performance Samples
const PERF_SAMPLES_CF: &str = "perf_samples";
/// Column family for BlockHeight
const BLOCK_HEIGHT_CF: &str = "block_height";
/// Column family for ProgramCosts
const PROGRAM_COSTS_CF: &str = "program_costs";
/// Column family for optimistic slots
const OPTIMISTIC_SLOTS_CF: &str = "optimistic_slots";
/// Column family for merkle roots
const MERKLE_ROOT_META_CF: &str = "merkle_root_meta";

macro_rules! convert_column_index_to_key_bytes {
($key:ident, $($range:expr => $bytes:expr),* $(,)?) => {{
let mut key = [0u8; std::mem::size_of::<Self::$key>()];
Expand Down Expand Up @@ -922,7 +876,7 @@ impl Column for columns::TransactionStatus {
}
}
impl ColumnName for columns::TransactionStatus {
const NAME: &'static str = TRANSACTION_STATUS_CF;
const NAME: &'static str = "transaction_status";
}
impl ProtobufColumn for columns::TransactionStatus {
type Type = generated::TransactionStatusMeta;
Expand Down Expand Up @@ -1000,7 +954,7 @@ impl Column for columns::AddressSignatures {
}
}
impl ColumnName for columns::AddressSignatures {
const NAME: &'static str = ADDRESS_SIGNATURES_CF;
const NAME: &'static str = "address_signatures";
}

impl ColumnIndexDeprecation for columns::AddressSignatures {
Expand Down Expand Up @@ -1074,7 +1028,7 @@ impl Column for columns::TransactionMemos {
}
}
impl ColumnName for columns::TransactionMemos {
const NAME: &'static str = TRANSACTION_MEMOS_CF;
const NAME: &'static str = "transaction_memos";
}

impl ColumnIndexDeprecation for columns::TransactionMemos {
Expand Down Expand Up @@ -1127,40 +1081,40 @@ impl Column for columns::TransactionStatusIndex {
}
}
impl ColumnName for columns::TransactionStatusIndex {
const NAME: &'static str = TRANSACTION_STATUS_INDEX_CF;
const NAME: &'static str = "transaction_status_index";
}

impl SlotColumn for columns::Rewards {}
impl ColumnName for columns::Rewards {
const NAME: &'static str = REWARDS_CF;
const NAME: &'static str = "rewards";
}
impl ProtobufColumn for columns::Rewards {
type Type = generated::Rewards;
}

impl SlotColumn for columns::Blocktime {}
impl ColumnName for columns::Blocktime {
const NAME: &'static str = BLOCKTIME_CF;
const NAME: &'static str = "blocktime";
}
impl TypedColumn for columns::Blocktime {
type Type = UnixTimestamp;
}

impl SlotColumn for columns::PerfSamples {}
impl ColumnName for columns::PerfSamples {
const NAME: &'static str = PERF_SAMPLES_CF;
const NAME: &'static str = "perf_samples";
}

impl SlotColumn for columns::BlockHeight {}
impl ColumnName for columns::BlockHeight {
const NAME: &'static str = BLOCK_HEIGHT_CF;
const NAME: &'static str = "block_height";
}
impl TypedColumn for columns::BlockHeight {
type Type = u64;
}

impl ColumnName for columns::ProgramCosts {
const NAME: &'static str = PROGRAM_COSTS_CF;
const NAME: &'static str = "program_costs";
}
impl TypedColumn for columns::ProgramCosts {
type Type = blockstore_meta::ProgramCost;
Expand Down Expand Up @@ -1210,7 +1164,7 @@ impl Column for columns::ShredCode {
}
}
impl ColumnName for columns::ShredCode {
const NAME: &'static str = CODE_SHRED_CF;
const NAME: &'static str = "code_shred";
}

impl Column for columns::ShredData {
Expand Down Expand Up @@ -1241,12 +1195,12 @@ impl Column for columns::ShredData {
}
}
impl ColumnName for columns::ShredData {
const NAME: &'static str = DATA_SHRED_CF;
const NAME: &'static str = "data_shred";
}

impl SlotColumn for columns::Index {}
impl ColumnName for columns::Index {
const NAME: &'static str = INDEX_CF;
const NAME: &'static str = "index";
}
impl TypedColumn for columns::Index {
type Type = blockstore_meta::Index;
Expand Down Expand Up @@ -1276,47 +1230,47 @@ impl TypedColumn for columns::Index {

impl SlotColumn for columns::DeadSlots {}
impl ColumnName for columns::DeadSlots {
const NAME: &'static str = DEAD_SLOTS_CF;
const NAME: &'static str = "dead_slots";
}
impl TypedColumn for columns::DeadSlots {
type Type = bool;
}

impl SlotColumn for columns::DuplicateSlots {}
impl ColumnName for columns::DuplicateSlots {
const NAME: &'static str = DUPLICATE_SLOTS_CF;
const NAME: &'static str = "duplicate_slots";
}
impl TypedColumn for columns::DuplicateSlots {
type Type = blockstore_meta::DuplicateSlotProof;
}

impl SlotColumn for columns::Orphans {}
impl ColumnName for columns::Orphans {
const NAME: &'static str = ORPHANS_CF;
const NAME: &'static str = "orphans";
}
impl TypedColumn for columns::Orphans {
type Type = bool;
}

impl SlotColumn for columns::BankHash {}
impl ColumnName for columns::BankHash {
const NAME: &'static str = BANK_HASH_CF;
const NAME: &'static str = "bank_hashes";
}
impl TypedColumn for columns::BankHash {
type Type = blockstore_meta::FrozenHashVersioned;
}

impl SlotColumn for columns::Root {}
impl ColumnName for columns::Root {
const NAME: &'static str = ROOT_CF;
const NAME: &'static str = "root";
}
impl TypedColumn for columns::Root {
type Type = bool;
}

impl SlotColumn for columns::SlotMeta {}
impl ColumnName for columns::SlotMeta {
const NAME: &'static str = META_CF;
const NAME: &'static str = "meta";
}
impl TypedColumn for columns::SlotMeta {
type Type = blockstore_meta::SlotMeta;
Expand Down Expand Up @@ -1350,15 +1304,15 @@ impl Column for columns::ErasureMeta {
}
}
impl ColumnName for columns::ErasureMeta {
const NAME: &'static str = ERASURE_META_CF;
const NAME: &'static str = "erasure_meta";
}
impl TypedColumn for columns::ErasureMeta {
type Type = blockstore_meta::ErasureMeta;
}

impl SlotColumn for columns::OptimisticSlots {}
impl ColumnName for columns::OptimisticSlots {
const NAME: &'static str = OPTIMISTIC_SLOTS_CF;
const NAME: &'static str = "optimistic_slots";
}
impl TypedColumn for columns::OptimisticSlots {
type Type = blockstore_meta::OptimisticSlotMetaVersioned;
Expand Down Expand Up @@ -1393,7 +1347,7 @@ impl Column for columns::MerkleRootMeta {
}

impl ColumnName for columns::MerkleRootMeta {
const NAME: &'static str = MERKLE_ROOT_META_CF;
const NAME: &'static str = "merkle_root_meta";
}
impl TypedColumn for columns::MerkleRootMeta {
type Type = MerkleRootMeta;
Expand Down
Loading