Refactor: remvoe Copy bound from NodeId
#1255
Conversation
drmingdrmer
force-pushed
the
159-nid-no-copy
branch
3 times, most recently
from
c1e5faf
to
740010d
Compare
The `NodeId` type is currently defined as:
```rust
type NodeId: .. + Copy + .. + 'static;
```
This commit removes the `Copy` bound from `NodeId`.
This modification will allow the use of non-`Copy` types as `NodeId`,
providing greater flexibility for applications that prefer
variable-length strings or other non-`Copy` types for node
identification.
This change maintain compatibility by updating derived `Copy`
implementations with manual implementations:
```rust
// Before
#[derive(Copy...)]
pub struct LogId<NID: NodeId> {}
// After
impl<NID: Copy> Copy for LogId<NID> {}
```
- Fix: databendlabs#1250
drmingdrmer
force-pushed
the
159-nid-no-copy
branch
from
740010d
to
ed3b446
Compare
There was a problem hiding this comment.
Sorry for reviewing this PR on GitHub, reviewable does not show line numbers, which makes me impossible to locate the code and do a check in my IDE, left some comments.
BTW, there are multiple "unused" warnings reported by GitHub Actions on the review page, are they false-positive? If not, perhaps we can do a clean-up:)
| let cmd = sm::Command::apply(first, last); | ||
| self.sm_handle.send(cmd).map_err(|e| StorageError::apply(last, AnyError::error(e)))?; | ||
| let cmd = sm::Command::apply(first, last.clone()); | ||
| self.sm_handle.send(cmd).map_err(|e| StorageError::apply(last.clone(), AnyError::error(e)))?; |
There was a problem hiding this comment.
This clone can be avoided:
| self.sm_handle.send(cmd).map_err(|e| StorageError::apply(last.clone(), AnyError::error(e)))?; | |
| self.sm_handle.send(cmd).map_err(|e| StorageError::apply(last, AnyError::error(e)))?; |
| if Some(accepted.clone()) > curr_accepted { | ||
| self.io_state.io_progress.accept(accepted.clone()); |
There was a problem hiding this comment.
Let's do this:
| if Some(accepted.clone()) > curr_accepted { | |
| self.io_state.io_progress.accept(accepted.clone()); | |
| if Some(&accepted) > curr_accepted.as_ref() { | |
| self.io_state.io_progress.accept(accepted); |
| (vec![], r) | ||
| } else { | ||
| // limited_get_log_entries will return logs smaller than the range [start, end). | ||
| let logs = self.log_reader.limited_get_log_entries(start, end).await?; | ||
|
|
||
| let first = *logs.first().map(|x| x.get_log_id()).unwrap(); | ||
| let last = *logs.last().map(|x| x.get_log_id()).unwrap(); | ||
| let first = logs.first().map(|x| x.get_log_id().clone()).unwrap(); |
There was a problem hiding this comment.
Can be avoided:
| let first = logs.first().map(|x| x.get_log_id().clone()).unwrap(); | |
| let first = logs.first().map(|x| x.get_log_id()).unwrap(); |
| @@ -496,7 +496,7 @@ where | |||
| })) | |||
| } | |||
| AppendEntriesResponse::Conflict => { | |||
| let conflict = sending_range.prev; | |||
| let conflict = sending_range.prev.clone(); | |||
There was a problem hiding this comment.
Looks like we can move sending_range.prev here
There was a problem hiding this comment.
@SteveLauC (no review from my side, just a tip)
reviewable does not show line numbers, which makes me impossible to locate the code and do a check in my IDE, left some comments
Actually, it does. It is just a bit cumbersome, since you have to set it up, see here. Similarly, for locating the code in the IDE, you can directly jump into the IDE from Reviewable from any comment (also from a new draft). It is documented here. With that, you don't even strictly need line numbers (BTW, those are shown in the draft of the new comment as well), but I personally did configure them for myself :-).
Reviewable status: 0 of 57 files reviewed, 4 unresolved discussions (waiting on @drmingdrmer and @SteveLauC)
Amazing! TIL! Will set them up. 😄 |
I hereby agree to the terms of the CLA available at: https://docs.databend.com/dev/policies/cla/
Summary
Refactor: remvoe
Copybound fromNodeIdThe
NodeIdtype is currently defined as:This commit removes the
Copybound fromNodeId.This modification will allow the use of non-
Copytypes asNodeId,providing greater flexibility for applications that prefer
variable-length strings or other non-
Copytypes for nodeidentification.
This change maintain compatibility by updating derived
Copyimplementations with manual implementations:
CopyBound fromNodeId#1250This change is