-
Notifications
You must be signed in to change notification settings - Fork 219
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat!: add deleted height to unique_id index (#3506)
* feat: add deleted height to unique_id index - adds the spend/deleted height to the asset id index when a unique id UTXO is spent - head unique_id (ie. <asset_pk, unique_id> in current UTXO set) has "special" key in unique_id_index - handle reorg code to update unique_id_index - replace hex string keys with byte keys in kernel and input dbs - add test for fetch_utxo_by_unique_id with deleted height param * fix lil clippy * fix more clippy
- Loading branch information
Showing
18 changed files
with
648 additions
and
267 deletions.
There are no files selected for viewing
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
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
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| // Copyright 2021, The Tari Project | ||
| // | ||
| // Redistribution and use in source and binary forms, with or without modification, are permitted provided that the | ||
| // following conditions are met: | ||
| // | ||
| // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following | ||
| // disclaimer. | ||
| // | ||
| // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the | ||
| // following disclaimer in the documentation and/or other materials provided with the distribution. | ||
| // | ||
| // 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote | ||
| // products derived from this software without specific prior written permission. | ||
| // | ||
| // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | ||
| // INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| // DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
| // SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | ||
| // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE | ||
| // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
| use crate::chain_storage::ChainStorageError; | ||
| use lmdb_zero::error; | ||
| use log::*; | ||
| use serde::{de::DeserializeOwned, Serialize}; | ||
|
|
||
| pub const LOG_TARGET: &str = "c::cs::lmdb_db::lmdb"; | ||
|
|
||
| pub fn serialize<T>(data: &T) -> Result<Vec<u8>, ChainStorageError> | ||
| where T: Serialize { | ||
| let size = bincode::serialized_size(&data).map_err(|e| ChainStorageError::AccessError(e.to_string()))?; | ||
| let mut buf = Vec::with_capacity(size as usize); | ||
| bincode::serialize_into(&mut buf, data).map_err(|e| { | ||
| error!(target: LOG_TARGET, "Could not serialize lmdb: {:?}", e); | ||
| ChainStorageError::AccessError(e.to_string()) | ||
| })?; | ||
| Ok(buf) | ||
| } | ||
|
|
||
| pub fn deserialize<T>(buf_bytes: &[u8]) -> Result<T, error::Error> | ||
| where T: DeserializeOwned { | ||
| bincode::deserialize(buf_bytes) | ||
| .map_err(|e| { | ||
| error!(target: LOG_TARGET, "Could not deserialize lmdb: {:?}", e); | ||
| e | ||
| }) | ||
| .map_err(|e| error::Error::ValRejected(e.to_string())) | ||
| } |
104 changes: 104 additions & 0 deletions
104
base_layer/core/src/chain_storage/lmdb_db/key_prefix_cursor.rs
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,104 @@ | ||
| // Copyright 2021, The Tari Project | ||
| // | ||
| // Redistribution and use in source and binary forms, with or without modification, are permitted provided that the | ||
| // following conditions are met: | ||
| // | ||
| // 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following | ||
| // disclaimer. | ||
| // | ||
| // 2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the | ||
| // following disclaimer in the documentation and/or other materials provided with the distribution. | ||
| // | ||
| // 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote | ||
| // products derived from this software without specific prior written permission. | ||
| // | ||
| // THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, | ||
| // INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
| // DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
| // SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR | ||
| // SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | ||
| // WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE | ||
| // USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
|
||
| use crate::chain_storage::{lmdb_db::helpers::deserialize, ChainStorageError}; | ||
| use lmdb_zero::{ConstAccessor, Cursor, LmdbResultExt}; | ||
| use serde::de::DeserializeOwned; | ||
| use std::marker::PhantomData; | ||
|
|
||
| pub struct KeyPrefixCursor<'a, V> { | ||
| cursor: Cursor<'a, 'a>, | ||
| value_type: PhantomData<V>, | ||
| prefix_key: &'a [u8], | ||
| access: ConstAccessor<'a>, | ||
| has_seeked: bool, | ||
| } | ||
|
|
||
| impl<'a, V> KeyPrefixCursor<'a, V> | ||
| where V: DeserializeOwned | ||
| { | ||
| pub(super) fn new(cursor: Cursor<'a, 'a>, access: ConstAccessor<'a>, prefix_key: &'a [u8]) -> Self { | ||
| Self { | ||
| cursor, | ||
| access, | ||
| prefix_key, | ||
| value_type: PhantomData, | ||
| has_seeked: false, | ||
| } | ||
| } | ||
|
|
||
| /// Returns the item on or after the key prefix, progressing forwards until the key prefix no longer matches | ||
| pub fn next(&mut self) -> Result<Option<(Vec<u8>, V)>, ChainStorageError> { | ||
| if !self.has_seeked { | ||
| if let Some((k, val)) = self.seek_gte(self.prefix_key)? { | ||
| return Ok(Some((k, val))); | ||
| } | ||
| } | ||
|
|
||
| match self.cursor.next(&self.access).to_opt()? { | ||
| Some((k, v)) => Self::deserialize_if_matches(self.prefix_key, k, v), | ||
| None => Ok(None), | ||
| } | ||
| } | ||
|
|
||
| /// Returns the item on or before the given seek key, progressing backwards until the key prefix no longer matches | ||
| pub fn prev(&mut self) -> Result<Option<(Vec<u8>, V)>, ChainStorageError> { | ||
| if !self.has_seeked { | ||
| let prefix_key = self.prefix_key; | ||
| if let Some((k, val)) = self.seek_gte(prefix_key)? { | ||
| // seek_range_k returns the greater key, so we only want to return the current value that was seeked to | ||
| // if it exactly matches the prefix_key | ||
| if k == prefix_key { | ||
| return Ok(Some((k, val))); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| match self.cursor.prev(&self.access).to_opt()? { | ||
| Some((k, v)) => Self::deserialize_if_matches(self.prefix_key, k, v), | ||
| None => Ok(None), | ||
| } | ||
| } | ||
|
|
||
| pub fn seek_gte(&mut self, key: &[u8]) -> Result<Option<(Vec<u8>, V)>, ChainStorageError> { | ||
| self.has_seeked = true; | ||
| let seek_result = self.cursor.seek_range_k(&self.access, key).to_opt()?; | ||
| let (k, v) = match seek_result { | ||
| Some(r) => r, | ||
| None => return Ok(None), | ||
| }; | ||
| Self::deserialize_if_matches(key, k, v) | ||
| } | ||
|
|
||
| fn deserialize_if_matches( | ||
| key_prefix: &[u8], | ||
| k: &[u8], | ||
| v: &[u8], | ||
| ) -> Result<Option<(Vec<u8>, V)>, ChainStorageError> { | ||
| let prefix_len = key_prefix.len(); | ||
| if k.len() < prefix_len || k[..prefix_len] != *key_prefix { | ||
| return Ok(None); | ||
| } | ||
| let val = deserialize::<V>(v)?; | ||
| Ok(Some((k.to_vec(), val))) | ||
| } | ||
| } |
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
Oops, something went wrong.