Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use redb::TableDefinition #143

Merged
merged 1 commit into from
Feb 19, 2022
Merged

Use redb::TableDefinition #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions src/index.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ pub(crate) struct Index {
}

impl Index {
const OUTPOINT_TO_ORDINAL_RANGES: &'static str = "OUTPOINT_TO_ORDINAL_RANGES";
const OUTPOINT_TO_ORDINAL_RANGES: TableDefinition<'static, [u8], [u8]> =
TableDefinition::new("OUTPOINT_TO_ORDINAL_RANGES");

pub(crate) fn new(options: Options) -> Result<Self> {
let client = Client::new(
Expand Down Expand Up @@ -66,8 +67,7 @@ impl Index {
log::info!("Indexing block at height {height}…");

let wtx = self.database.begin_write()?;
let mut outpoint_to_ordinal_ranges: Table<[u8], [u8]> =
wtx.open_table(Self::OUTPOINT_TO_ORDINAL_RANGES)?;
let mut outpoint_to_ordinal_ranges = wtx.open_table(&Self::OUTPOINT_TO_ORDINAL_RANGES)?;

let mut coinbase_inputs = VecDeque::new();

Expand Down Expand Up @@ -191,8 +191,7 @@ impl Index {

pub(crate) fn list(&self, outpoint: OutPoint) -> Result<Vec<(u64, u64)>> {
let rtx = self.database.begin_read()?;
let outpoint_to_ordinal_ranges: ReadOnlyTable<[u8], [u8]> =
rtx.open_table(Self::OUTPOINT_TO_ORDINAL_RANGES)?;
let outpoint_to_ordinal_ranges = rtx.open_table(&Self::OUTPOINT_TO_ORDINAL_RANGES)?;

let mut key = Vec::new();
outpoint.consensus_encode(&mut key)?;
Expand Down
2 changes: 1 addition & 1 deletion src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use {
derive_more::{Display, FromStr},
integer_cbrt::IntegerCubeRoot,
integer_sqrt::IntegerSquareRoot,
redb::{Database, ReadOnlyTable, ReadableTable, Table},
redb::{Database, ReadableTable, TableDefinition},
std::{
cell::Cell,
cmp::Ordering,
Expand Down