Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Allow Blockstore to open unknown columns #34174

Merged
steviez merged 7 commits into from
Nov 30, 2023
Merged

Allow Blockstore to open unknown columns #34174

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cac474e
Allow Blockstore to auto-detect and open unknown columns
Nov 20, 2023
a88e165
Add unit test
Nov 20, 2023
da319ec
Avoid creating descriptor for default column
Nov 20, 2023
3dd1aa3
Typo fixes
Nov 27, 2023
5dd20cd
Only detect missing columns when access type is Primary
Nov 27, 2023
022d497
Remove superfluous Result<_>
Nov 28, 2023
b5e3797
Replace .unwrap_or_default() with explicit match statement
Nov 28, 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
Prev Previous commit
Next Next commit
Typo fixes
  • Loading branch information
Steven Czabaniuk committed Nov 27, 2023
commit 3dd1aa3a1d40006740a4f0866010a0e99011a309
6 changes: 3 additions & 3 deletions ledger/src/blockstore_db.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ impl Rocks {
let column_options = options.column_options.clone();
let detected_cfs = DB::list_cf(&Options::default(), path)
.map_err(|err| {
warn!("Unable to detect Rocks colums: {err:?}");
warn!("Unable to detect Rocks columns: {err:?}");
})
.unwrap_or_default();
let cf_descriptors = Self::cf_descriptors(&options, &oldest_slot, &detected_cfs);
Expand Down Expand Up @@ -513,8 +513,8 @@ impl Rocks {
if known_cfs.get(cf_name.as_str()).is_none() {
info!("Detected unknown column {cf_name}, opening column with basic options");
// This version of the software was unaware of the column, so
// it fair to assume that we will not attempt to read or write
// the column. So, set some bare bones settings to avoid
// it is fair to assume that we will not attempt to read or
// write the column. So, set some bare bones settings to avoid
// using extra resources on this unknown column.
let mut options = Options::default();
// Lower the default to avoid unnecessary allocations
Expand Down