noth/surrealpatch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert breaking change on key clash and introduce new error (#2823)

Browse source
This commit is contained in:
Przemyslaw Hugh Kaznowski 2023-10-26 14:17:31 +01:00 committed by GitHub
parent 05907db1ea
commit 7d5d6c4325
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/src/err/mod.rs
View file

@ -79,8 +79,9 @@ pub enum Error {
TxConditionNotMet,
/// The key being inserted in the transaction already exists
#[error("The key being inserted already exists: {0}")]
TxKeyAlreadyExists(KeyCategory),
#[error("The key being inserted already exists")]
#[deprecated(note = "Use TxKeyAlreadyExistsCategory")]
TxKeyAlreadyExists,
/// The key exceeds a limit set by the KV store
#[error("Record id or key is too large")]
@ -713,6 +714,10 @@ pub enum Error {
/// Auth was expected to be set but was unknown
#[error("Auth was expected to be set but was unknown")]
UnknownAuth,
/// The key being inserted in the transaction already exists
#[error("The key being inserted already exists: {0}")]
TxKeyAlreadyExistsCategory(KeyCategory),
}
impl From<Error> for String {
@ -738,7 +743,7 @@ impl From<echodb::err::Error> for Error {
fn from(e: echodb::err::Error) -> Error {
match e {
echodb::err::Error::KeyAlreadyExists => {
Error::TxKeyAlreadyExists(crate::key::error::KeyCategory::Unknown)
Error::TxKeyAlreadyExistsCategory(crate::key::error::KeyCategory::Unknown)
}
echodb::err::Error::ValNotExpectedValue => Error::TxConditionNotMet,
_ => Error::Tx(e.to_string()),
@ -751,7 +756,7 @@ impl From<indxdb::err::Error> for Error {
fn from(e: indxdb::err::Error) -> Error {
match e {
indxdb::err::Error::KeyAlreadyExists => {
Error::TxKeyAlreadyExists(crate::key::error::KeyCategory::Unknown)
Error::TxKeyAlreadyExistsCategory(crate::key::error::KeyCategory::Unknown)
}
indxdb::err::Error::ValNotExpectedValue => Error::TxConditionNotMet,
_ => Error::Tx(e.to_string()),
@ -764,7 +769,7 @@ impl From<tikv::Error> for Error {
fn from(e: tikv::Error) -> Error {
match e {
tikv::Error::DuplicateKeyInsertion => {
Error::TxKeyAlreadyExists(crate::key::error::KeyCategory::Unknown)
Error::TxKeyAlreadyExistsCategory(crate::key::error::KeyCategory::Unknown)
}
tikv::Error::KeyError(ke) if ke.abort.contains("KeyTooLarge") => Error::TxKeyTooLarge,
tikv::Error::RegionError(re) if re.raft_entry_too_large.is_some() => Error::TxTooLarge,

2
lib/src/kvs/fdb/mod.rs
View file

@ -320,7 +320,7 @@ impl Transaction {
}
let key: Vec<u8> = key.into();
if self.exi(key.clone().as_slice()).await? {
return Err(Error::TxKeyAlreadyExists(category));
return Err(Error::TxKeyAlreadyExistsCategory(category));
}
// Set the key
let key: &[u8] = &key[..];

2
lib/src/kvs/rocksdb/mod.rs
View file

@ -293,7 +293,7 @@ impl Transaction {
// Set the key if empty
match inner.get_opt(&key, &self.ro)? {
None => inner.put(key, val)?,
_ => return Err(Error::TxKeyAlreadyExists(category)),
_ => return Err(Error::TxKeyAlreadyExistsCategory(category)),
};
// Return result
Ok(())

2
lib/src/kvs/speedb/mod.rs
View file

@ -293,7 +293,7 @@ impl Transaction {
// Set the key if empty
match inner.get_opt(&key, &self.ro)? {
None => inner.put(key, val)?,
_ => return Err(Error::TxKeyAlreadyExists(category)),
_ => return Err(Error::TxKeyAlreadyExistsCategory(category)),
};
// Return result
Ok(())

2
lib/src/kvs/tikv/mod.rs
View file

@ -292,7 +292,7 @@ impl Transaction {
// Set the key if empty
match self.inner.key_exists(key.clone()).await? {
false => self.inner.put(key, val).await?,
_ => return Err(Error::TxKeyAlreadyExists(category)),
_ => return Err(Error::TxKeyAlreadyExistsCategory(category)),
};
// Return result
Ok(())