refactor: cleanup unused methods in Bufferer trait (#25012)

pull/24992/head
Trevor Hilton 2024-05-16 09:34:08 -04:00 committed by GitHub
parent adeb1a16e3
commit 4901982c45
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 30 deletions

View File

@ -14,7 +14,6 @@ pub mod persister;
pub mod wal; pub mod wal;
pub mod write_buffer; pub mod write_buffer;
use crate::catalog::Catalog;
use crate::paths::{ParquetFilePath, SegmentWalFilePath}; use crate::paths::{ParquetFilePath, SegmentWalFilePath};
use async_trait::async_trait; use async_trait::async_trait;
use bytes::Bytes; use bytes::Bytes;
@ -85,19 +84,6 @@ pub trait Bufferer: Debug + Send + Sync + 'static {
precision: Precision, precision: Precision,
) -> write_buffer::Result<BufferedWriteRequest>; ) -> write_buffer::Result<BufferedWriteRequest>;
/// Closes the open segment and returns it so that it can be persisted or thrown away. A new segment will be opened
/// with the catalog rolling over.
async fn close_open_segment(&self) -> Result<Arc<dyn BufferSegment>>;
/// Once a process opens segments with the Persister, they'll know the last segment that was persisted.
/// This can be used with a `Bufferer` to pass into this method, which will look for any WAL segments with an
/// ID greater than the one passed in.
async fn load_segments_after(
&self,
segment_id: SegmentId,
catalog: Catalog,
) -> Result<Vec<Arc<dyn BufferSegment>>>;
/// Returns the configured WAL, if there is one. /// Returns the configured WAL, if there is one.
fn wal(&self) -> Option<Arc<impl Wal>>; fn wal(&self) -> Option<Arc<impl Wal>>;

View File

@ -660,7 +660,7 @@ fn segment_id_from_file_name(name: &str) -> Result<SegmentId> {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::*; use super::*;
use crate::Catalog; use crate::catalog::Catalog;
use crate::LpWriteOp; use crate::LpWriteOp;
use crate::Precision; use crate::Precision;

View File

@ -14,8 +14,8 @@ use crate::write_buffer::flusher::WriteBufferFlusher;
use crate::write_buffer::loader::load_starting_state; use crate::write_buffer::loader::load_starting_state;
use crate::write_buffer::segment_state::{run_buffer_segment_persist_and_cleanup, SegmentState}; use crate::write_buffer::segment_state::{run_buffer_segment_persist_and_cleanup, SegmentState};
use crate::{ use crate::{
BufferSegment, BufferedWriteRequest, Bufferer, ChunkContainer, LpWriteOp, Persister, Precision, BufferedWriteRequest, Bufferer, ChunkContainer, LpWriteOp, Persister, Precision,
SegmentDuration, SegmentId, SequenceNumber, Wal, WalOp, WriteBuffer, WriteLineError, SegmentDuration, SequenceNumber, Wal, WalOp, WriteBuffer, WriteLineError,
}; };
use async_trait::async_trait; use async_trait::async_trait;
use data_types::{ use data_types::{
@ -394,18 +394,6 @@ impl<W: Wal, T: TimeProvider> Bufferer for WriteBufferImpl<W, T> {
.await .await
} }
async fn close_open_segment(&self) -> crate::Result<Arc<dyn BufferSegment>> {
todo!()
}
async fn load_segments_after(
&self,
_segment_id: SegmentId,
_catalog: Catalog,
) -> crate::Result<Vec<Arc<dyn BufferSegment>>> {
todo!()
}
fn wal(&self) -> Option<Arc<impl Wal>> { fn wal(&self) -> Option<Arc<impl Wal>> {
self.wal.clone() self.wal.clone()
} }
@ -843,7 +831,7 @@ mod tests {
use super::*; use super::*;
use crate::persister::PersisterImpl; use crate::persister::PersisterImpl;
use crate::wal::WalImpl; use crate::wal::WalImpl;
use crate::{SequenceNumber, WalOpBatch}; use crate::{SegmentId, SequenceNumber, WalOpBatch};
use arrow::record_batch::RecordBatch; use arrow::record_batch::RecordBatch;
use arrow_util::assert_batches_eq; use arrow_util::assert_batches_eq;
use datafusion_util::config::register_iox_object_store; use datafusion_util::config::register_iox_object_store;