diff --git a/Cargo.toml b/Cargo.toml index 944c6bf1..fd031d83 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ tokio = ["dep:tokio"] arrow = "52" async-lock = "3" crossbeam-skiplist = "0.1" -flume = { version = "0.11.0", features = ["async"] } +flume = { version = "0.11", features = ["async"] } futures-core = "0.3" futures-io = "0.3" futures-util = "0.3" diff --git a/src/fs/mod.rs b/src/fs/mod.rs index 7a8c635f..5b06c725 100644 --- a/src/fs/mod.rs +++ b/src/fs/mod.rs @@ -13,7 +13,7 @@ use ulid::Ulid; pub(crate) type FileId = Ulid; -pub enum FileType { +pub(crate) enum FileType { WAL, PARQUET, LOG, diff --git a/src/ondisk/scan.rs b/src/ondisk/scan.rs index 0705c232..9a4b4d37 100644 --- a/src/ondisk/scan.rs +++ b/src/ondisk/scan.rs @@ -4,6 +4,7 @@ use std::{ }; use futures_core::{ready, Stream}; +use futures_io::{AsyncRead, AsyncSeek, AsyncWrite}; use parquet::arrow::async_reader::ParquetRecordBatchStream; use pin_project_lite::pin_project; use tokio_util::compat::Compat; @@ -19,13 +20,17 @@ pin_project! { pub struct SsTableScan { #[pin] - stream: ParquetRecordBatchStream>>, + stream: ParquetRecordBatchStream>>, iter: Option>, } } impl SsTableScan { - pub fn new(stream: ParquetRecordBatchStream>>) -> Self { + pub fn new( + stream: ParquetRecordBatchStream< + Compat>, + >, + ) -> Self { SsTableScan { stream, iter: None } } } diff --git a/src/scope.rs b/src/scope.rs index 081f1e54..0f1baf02 100644 --- a/src/scope.rs +++ b/src/scope.rs @@ -7,7 +7,7 @@ use crate::{ }; #[derive(Debug, Eq, PartialEq)] -pub struct Scope { +pub(crate) struct Scope { pub(crate) min: K, pub(crate) max: K, pub(crate) gen: FileId,