feat(db): cursor insert (#310)

This commit is contained in:
Roman Krasiuk
2022-12-02 05:31:32 +02:00
committed by GitHub
parent bc3702ec42
commit c7ec4512c8
4 changed files with 48 additions and 2 deletions

View File

@ -128,6 +128,12 @@ impl<'tx, T: Table> DbCursorRW<'tx, T> for Cursor<'tx, RW, T> {
.map_err(|e| Error::Write(e.into()))
}
fn insert(&mut self, key: T::Key, value: T::Value) -> Result<(), Error> {
self.inner
.put(key.encode().as_ref(), value.compress().as_ref(), WriteFlags::NO_OVERWRITE)
.map_err(|e| Error::Write(e.into()))
}
/// Appends the data to the end of the table. Consequently, the append operation
/// will fail if the inserted key is less than the last table key
fn append(&mut self, key: T::Key, value: T::Value) -> Result<(), Error> {

View File

@ -237,6 +237,34 @@ mod tests {
assert_eq!(cursor.prev(), Ok(Some((missing_key - 2, H256::zero()))));
}
#[test]
fn db_cursor_insert() {
let db: Arc<Env<WriteMap>> = test_utils::create_test_db(EnvKind::RW);
// PUT
let tx = db.tx_mut().expect(ERROR_INIT_TX);
vec![0, 1, 3, 4, 5]
.into_iter()
.try_for_each(|key| tx.put::<CanonicalHeaders>(key, H256::zero()))
.expect(ERROR_PUT);
tx.commit().expect(ERROR_COMMIT);
let db: Arc<Env<WriteMap>> = test_utils::create_test_db(EnvKind::RW);
let key_to_insert = 2;
let tx = db.tx_mut().expect(ERROR_INIT_TX);
let mut cursor = tx.cursor_mut::<CanonicalHeaders>().unwrap();
// INSERT
cursor.seek_exact(1).unwrap();
assert_eq!(cursor.insert(key_to_insert, H256::zero()), Ok(()));
assert_eq!(cursor.current(), Ok(Some((key_to_insert, H256::zero()))));
// INSERT (failure)
assert_eq!(cursor.insert(key_to_insert, H256::zero()), Err(db::Error::Write(4294936497)));
assert_eq!(cursor.current(), Ok(Some((key_to_insert, H256::zero()))));
}
#[test]
fn db_cursor_append_failure() {
let db: Arc<Env<WriteMap>> = test_utils::create_test_db(EnvKind::RW);
@ -250,11 +278,11 @@ mod tests {
tx.commit().expect(ERROR_COMMIT);
// APPEND
let key_to_insert = 2;
let key_to_append = 2;
let tx = db.tx_mut().expect(ERROR_INIT_TX);
let mut cursor = tx.cursor_mut::<CanonicalHeaders>().unwrap();
cursor.seek_exact(1).unwrap();
assert_eq!(cursor.append(key_to_insert, H256::zero()), Err(db::Error::Write(4294936878)));
assert_eq!(cursor.append(key_to_append, H256::zero()), Err(db::Error::Write(4294936878)));
assert_eq!(cursor.current(), Ok(Some((5, H256::zero())))); // the end of table
}

View File

@ -176,6 +176,14 @@ impl<'tx, T: Table> DbCursorRW<'tx, T> for CursorMock {
todo!()
}
fn insert(
&mut self,
_key: <T as Table>::Key,
_value: <T as Table>::Value,
) -> Result<(), super::Error> {
todo!()
}
fn append(
&mut self,
_key: <T as Table>::Key,

View File

@ -190,6 +190,10 @@ pub trait DbCursorRW<'tx, T: Table> {
/// exists in a table, and insert a new row if the specified value doesn't already exist
fn upsert(&mut self, key: T::Key, value: T::Value) -> Result<(), Error>;
/// Database operation that will insert a row at a given key. If the key is already
/// present, the operation will result in an error.
fn insert(&mut self, key: T::Key, value: T::Value) -> Result<(), Error>;
/// Append value to next cursor item.
///
/// This is efficient for pre-sorted data. If the data is not pre-sorted, use [`insert`].