Remove unused re-exports of database types and related dead code (#6490)
This commit is contained in:
parent
f80a5b8c34
commit
75d68edfe7
|
@ -37,13 +37,12 @@ use solana_sdk::clock::Slot;
|
||||||
mod db;
|
mod db;
|
||||||
mod meta;
|
mod meta;
|
||||||
|
|
||||||
pub use db::columns;
|
|
||||||
use db::{columns as cf, Column, IteratorDirection, IteratorMode};
|
use db::{columns as cf, Column, IteratorDirection, IteratorMode};
|
||||||
use rocksdb::DBRawIterator;
|
use rocksdb::DBRawIterator;
|
||||||
|
|
||||||
pub type Database = db::Database;
|
type Database = db::Database;
|
||||||
pub type LedgerColumn<C> = db::LedgerColumn<C>;
|
type LedgerColumn<C> = db::LedgerColumn<C>;
|
||||||
pub type WriteBatch = db::WriteBatch;
|
type WriteBatch = db::WriteBatch;
|
||||||
type BatchProcessor = db::BatchProcessor;
|
type BatchProcessor = db::BatchProcessor;
|
||||||
|
|
||||||
pub const BLOCKTREE_DIRECTORY: &str = "rocksdb";
|
pub const BLOCKTREE_DIRECTORY: &str = "rocksdb";
|
||||||
|
|
|
@ -31,6 +31,7 @@ pub enum IteratorMode<Index> {
|
||||||
From(Index, IteratorDirection),
|
From(Index, IteratorDirection),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[allow(dead_code)]
|
||||||
pub enum IteratorDirection {
|
pub enum IteratorDirection {
|
||||||
Forward,
|
Forward,
|
||||||
Reverse,
|
Reverse,
|
||||||
|
@ -158,11 +159,6 @@ impl Rocks {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn delete_cf(&self, cf: ColumnFamily, key: &[u8]) -> Result<()> {
|
|
||||||
self.0.delete_cf(cf, key)?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn iterator_cf(
|
fn iterator_cf(
|
||||||
&self,
|
&self,
|
||||||
cf: ColumnFamily,
|
cf: ColumnFamily,
|
||||||
|
@ -467,30 +463,6 @@ impl Database {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn get_bytes<C>(&self, key: C::Index) -> Result<Option<Vec<u8>>>
|
|
||||||
where
|
|
||||||
C: Column,
|
|
||||||
{
|
|
||||||
self.backend
|
|
||||||
.get_cf(self.cf_handle::<C>(), C::key(key).borrow())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn put_bytes<C>(&self, key: C::Index, data: &[u8]) -> Result<()>
|
|
||||||
where
|
|
||||||
C: Column,
|
|
||||||
{
|
|
||||||
self.backend
|
|
||||||
.put_cf(self.cf_handle::<C>(), C::key(key).borrow(), data)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn delete<C>(&self, key: C::Index) -> Result<()>
|
|
||||||
where
|
|
||||||
C: Column,
|
|
||||||
{
|
|
||||||
self.backend
|
|
||||||
.delete_cf(self.cf_handle::<C>(), C::key(key).borrow())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn get<C>(&self, key: C::Index) -> Result<Option<C::Type>>
|
pub fn get<C>(&self, key: C::Index) -> Result<Option<C::Type>>
|
||||||
where
|
where
|
||||||
C: TypedColumn,
|
C: TypedColumn,
|
||||||
|
@ -507,19 +479,6 @@ impl Database {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn put<C>(&self, key: C::Index, value: &C::Type) -> Result<()>
|
|
||||||
where
|
|
||||||
C: TypedColumn,
|
|
||||||
{
|
|
||||||
let serialized_value = serialize(value)?;
|
|
||||||
|
|
||||||
self.backend.put_cf(
|
|
||||||
self.cf_handle::<C>(),
|
|
||||||
C::key(key).borrow(),
|
|
||||||
&serialized_value,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn iter<C>(
|
pub fn iter<C>(
|
||||||
&self,
|
&self,
|
||||||
iterator_mode: IteratorMode<C::Index>,
|
iterator_mode: IteratorMode<C::Index>,
|
||||||
|
@ -673,6 +632,7 @@ where
|
||||||
self.backend.cf_handle(C::NAME)
|
self.backend.cf_handle(C::NAME)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
pub fn is_empty(&self) -> Result<bool> {
|
pub fn is_empty(&self) -> Result<bool> {
|
||||||
let mut iter = self.backend.raw_iterator_cf(self.handle())?;
|
let mut iter = self.backend.raw_iterator_cf(self.handle())?;
|
||||||
iter.seek_to_first();
|
iter.seek_to_first();
|
||||||
|
@ -683,10 +643,6 @@ where
|
||||||
self.backend
|
self.backend
|
||||||
.put_cf(self.handle(), C::key(key).borrow(), value)
|
.put_cf(self.handle(), C::key(key).borrow(), value)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn delete(&self, key: C::Index) -> Result<()> {
|
|
||||||
self.backend.delete_cf(self.handle(), C::key(key).borrow())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<C> LedgerColumn<C>
|
impl<C> LedgerColumn<C>
|
||||||
|
|
Loading…
Reference in New Issue