Eliminate the DatabaseConsistencyError.
#2557
Merged
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
MathieuDutSik
changed the title
DatabseConsistencyError.DatabaseConsistencyError.
MathieuDutSik
force-pushed
the
database_consistency_error
branch
2 times, most recently
from
4c7a3f0
to
bff8379
Compare
MathieuDutSik
force-pushed
the
database_consistency_error
branch
from
0f58a84
to
420523b
Compare
* Separate the code for the store into a store.rs file. * Move the MIN_TAG_VIEW to the views. * Eliminate the DatabaseConsistencyError. * Avoid the abstraction leakage.
MathieuDutSik
force-pushed
the
database_consistency_error
branch
from
420523b
to
124ac79
Compare
ma2bd
reviewed
Oct 3, 2024
linera-storage/src/db_storage.rs
Outdated
| @@ -729,8 +727,7 @@ where | |||
| impl<Store> DbStorage<Store, WallClock> | |||
| where | |||
| Store: KeyValueStore + Clone + Send + Sync + 'static, | |||
| Store::Error: | |||
| From<bcs::Error> + From<DatabaseConsistencyError> + Send + Sync + serde::ser::StdError, | |||
| Store::Error: Send + Sync + serde::ser::StdError, | |||
There was a problem hiding this comment.
Not from this PR but why are we using serde::ser::StdError? (an alias std::error::Error)
There was a problem hiding this comment.
I know. I addressed this is in another branch (not yet PR) on the dual store. The answer is that it is not needed.
Let me do this cleanup in this PR.
ma2bd
reviewed
Oct 3, 2024
ma2bd
reviewed
Oct 3, 2024
| @@ -221,7 +235,7 @@ where | |||
| impl<K> WritableKeyValueStore for ValueSplittingStore<K> | |||
| where | |||
| K: RestrictedKeyValueStore + Send + Sync, | |||
| K::Error: From<bcs::Error> + From<DatabaseConsistencyError>, | |||
| K::Error: 'static, | |||
There was a problem hiding this comment.
Is this 'static needed? (also below)
ma2bd
approved these changes
Oct 3, 2024
| let len = key.len(); | ||
| if len < 4 { | ||
| return Err(DatabaseConsistencyError::TooShortKey.into()); | ||
| return Err(ValueSplittingError::<K::Error>::TooShortKey); |
There was a problem hiding this comment.
ValueSplittingError::TooShortKey should be enough
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.
Motivation
The
DatabaseConsistencyErroris a type that if objectively a leaky abstraction. This addresses #2536Proposal
Several changes are made:
common.rsis moved to a newly createdstore.rs.DatabaseConsistencyErroris eliminated.ValueSplittingErroris introduced.Test Plan
As it is purely a refactoring, only the CI should be affected. Performance should remain strictly
identical.
Release Plan
Not relevant.
Links
None