From 93fb61dc8f07541c59a486361e2e1189360d6fa9 Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Thu, 20 Dec 2018 10:05:07 -0800 Subject: [PATCH] Re-export rocksdb::DBRawIterator until it can be encapsulated --- src/db_ledger.rs | 5 ++++- src/db_window.rs | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/db_ledger.rs b/src/db_ledger.rs index cc4062b8db..9455c50bfa 100644 --- a/src/db_ledger.rs +++ b/src/db_ledger.rs @@ -7,7 +7,7 @@ use crate::packet::{Blob, SharedBlob, BLOB_HEADER_SIZE}; use crate::result::{Error, Result}; use bincode::{deserialize, serialize}; use byteorder::{BigEndian, ByteOrder, ReadBytesExt}; -use rocksdb::{ColumnFamily, ColumnFamilyDescriptor, DBRawIterator, Options, WriteBatch, DB}; +use rocksdb::{ColumnFamily, ColumnFamilyDescriptor, Options, WriteBatch, DB}; use serde::de::DeserializeOwned; use serde::Serialize; use solana_sdk::signature::{Keypair, KeypairUtil}; @@ -16,6 +16,9 @@ use std::cmp::max; use std::io; use std::path::Path; +// Re-export rocksdb::DBRawIterator until it can be encapsulated +pub use rocksdb::DBRawIterator; + pub const DB_LEDGER_DIRECTORY: &str = "rocksdb"; // A good value for this is the number of cores on the machine pub const TOTAL_THREADS: i32 = 8; diff --git a/src/db_window.rs b/src/db_window.rs index d58363329b..4c026ad0f1 100644 --- a/src/db_window.rs +++ b/src/db_window.rs @@ -10,7 +10,6 @@ use crate::packet::{SharedBlob, BLOB_HEADER_SIZE}; use crate::result::Result; use crate::streamer::BlobSender; use log::Level; -use rocksdb::DBRawIterator; use solana_metrics::{influxdb, submit}; use solana_sdk::pubkey::Pubkey; use std::cmp;