refactor(state_table): Cow for get row, minor refactors #3241
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
Signed-off-by: Alex Chi <iskyzh@gmail.com>
skyzh
force-pushed
the
skyzh/refactor-table
branch
from
7c87190
to
95bb85b
Compare
skyzh
changed the title
skyzh
requested review from
BugenZhao,
wcy-fdu and
BowenXiao1999
and removed request for
BugenZhao and
wcy-fdu
Codecov Report
@@ Coverage Diff @@
## main #3241 +/- ##
=======================================
Coverage 73.22% 73.22%
=======================================
Files 747 747
Lines 101882 101892 +10
=======================================
+ Hits 74602 74610 +8
- Misses 27280 27282 +2
Flags with carried forward coverage won't be shown. Click here to find out more.
📣 Codecov can now indicate which changes are the most critical in Pull Requests. Learn more |
BugenZhao
reviewed
Jun 15, 2022
src/storage/src/table/state_table.rs
Outdated
| pub async fn get_row(&self, pk: &Row, epoch: u64) -> StorageResult<Option<Row>> { | ||
| /// Get a single row from state table. This function will return a Cow. If the value is from | ||
| /// memtable, it will be a [`Cow::Borrowed`]. If is from cell based table, it will be an owned | ||
| /// value. To convert `Option<Cow<Row>>` to `Option<Row>`, just call `to_owned`. |
There was a problem hiding this comment.
Suggested change
| /// value. To convert `Option<Cow<Row>>` to `Option<Row>`, just call `to_owned`. | |
| /// value. To convert `Option<Cow<Row>>` to `Option<Row>`, just call `into_owned`. |
| @@ -57,8 +57,7 @@ pub struct CellBasedTable<S: StateStore> { | |||
| column_descs: Vec<ColumnDesc>, | |||
|
|
|||
| /// Mapping from column id to column index | |||
| /// TODO: all CellBasedTable users should have a pk serializer, we should remove this option. | |||
| pub pk_serializer: Option<OrderedRowSerializer>, | |||
There was a problem hiding this comment.
Can we remove the Option now?
src/storage/src/table/state_table.rs
Outdated
| @@ -167,7 +188,7 @@ impl<S: StateStore> StateTable<S> { | |||
| self.iter_with_pk_bounds::<_, Row>(.., epoch).await | |||
| } | |||
|
|
|||
| /// This function scans rows from the relational table with specific `pk_bounds`. | |||
| /// This function scans rows from the relational table with specific `pk_prefix`. | |||
There was a problem hiding this comment.
Suggested change
| /// This function scans rows from the relational table with specific `pk_prefix`. | |
| /// This function scans rows from the relational table with specific `pk_bounds`. |
src/storage/src/table/state_table.rs
Outdated
| @@ -239,76 +260,71 @@ where | |||
| let cell_based_table_iter = self.cell_based_table_iter.peekable(); | |||
There was a problem hiding this comment.
Also fuse this stream?
Suggested change
| let cell_based_table_iter = self.cell_based_table_iter.peekable(); | |
| let cell_based_table_iter = self.cell_based_table_iter.fuse().peekable(); |
Signed-off-by: Alex Chi <iskyzh@gmail.com>
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.
Signed-off-by: Alex Chi iskyzh@gmail.com
What's changed and what's your intention?
TopN test doesn't pass, guess there's something wrong with it. Will fix later.Checklist
./risedev check(or alias,./risedev c)Refer to a related PR or issue link (optional)