Open unknown columns in the RocksDB for forward compatibility #2079
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
xgreenx
changed the title
rymnc
approved these changes
Aug 14, 2024
Comment on lines
+329
to
+339
| for column_name in existing_column_families { | ||
| if cf_descriptors_to_open.contains_key(&column_name) | ||
| || cf_descriptors_to_create.contains_key(&column_name) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| let unknown_column_name = column_name; | ||
| let unknown_column_options = Self::default_cf_opts(&block_opts); | ||
| cf_descriptors_to_open.insert(unknown_column_name, unknown_column_options); | ||
| } |
There was a problem hiding this comment.
how about this?
Suggested change
| for column_name in existing_column_families { | |
| if cf_descriptors_to_open.contains_key(&column_name) | |
| || cf_descriptors_to_create.contains_key(&column_name) | |
| { | |
| continue; | |
| } | |
| let unknown_column_name = column_name; | |
| let unknown_column_options = Self::default_cf_opts(&block_opts); | |
| cf_descriptors_to_open.insert(unknown_column_name, unknown_column_options); | |
| } | |
| existing_column_families | |
| .iter() | |
| .filter(|column_name| { | |
| !cf_descriptors_to_open.contains_key(*column_name) | |
| && !cf_descriptors_to_create.contains_key(*column_name) | |
| }) | |
| .for_each(|column_name| { | |
| let unknown_column_options = Self::default_cf_opts(&block_opts); | |
| cf_descriptors_to_open.insert(column_name.clone(), unknown_column_options); | |
| }); |
There was a problem hiding this comment.
While this PR is merged without applying this suggestion, I also generally prefer using iterators to populate collections over using for loops and .insert. In this scenario I would also have advised to use .map instead of .for_each, to avoid having to call .insert from within the for_each closure.
Something along the lines of:
cf_descriptors_to_open.extend(existing_column_families.iter().filter(...).map(...))
| @@ -428,12 +441,18 @@ where | |||
| format!("col-{}", column) | |||
| } | |||
|
|
|||
| fn cf_opts(column: Description::Column, block_opts: &BlockBasedOptions) -> Options { | |||
| fn default_cf_opts(block_opts: &BlockBasedOptions) -> Options { | |||
There was a problem hiding this comment.
qq: where do we describe the column to use in default_cf_opts?
1 task
xgreenx
added a commit
that referenced
this pull request
Aug 15, 2024
Addressed comments in the unknown columns PR #2079. ### Before requesting review - [x] I have reviewed the code myself
Merged
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Rocksdb requires opening all columns mentioned in the Manifest file. This means that old versions of the
fuel-coreare unable to open columns created by a new version of thefuel-core. The change adds forward compatibility by opening unknown columns with default options.Checklist
Before requesting review