Skip to content

Commit

Permalink
Remove unused StructOfChunks in favour of VortexLayoutStrategy (#2038)
Browse files Browse the repository at this point in the history
  • Loading branch information
robert3005 authored Jan 21, 2025
1 parent a091281 commit ade0747
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 51 deletions.
1 change: 0 additions & 1 deletion vortex-file/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ pub mod io;
mod open;
pub mod read;
pub mod segments;
mod strategy;
#[cfg(test)]
mod tests;
mod writer;
Expand Down
3 changes: 1 addition & 2 deletions vortex-file/src/writer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ use vortex_array::stream::ArrayStream;
use vortex_error::{vortex_bail, vortex_err, VortexExpect, VortexResult};
use vortex_flatbuffers::{FlatBuffer, FlatBufferRoot, WriteFlatBuffer, WriteFlatBufferExt};
use vortex_io::VortexWrite;
use vortex_layout::strategies::LayoutStrategy;
use vortex_layout::strategies::{LayoutStrategy, VortexLayoutStrategy};

use crate::footer::{FileLayout, Postscript, Segment};
use crate::segments::writer::BufferedSegmentWriter;
use crate::strategy::VortexLayoutStrategy;
use crate::{EOF_SIZE, MAGIC_BYTES, MAX_FOOTER_SIZE, VERSION};

pub struct VortexWriteOptions {
Expand Down
4 changes: 2 additions & 2 deletions vortex-layout/src/strategies/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
//! otherwise manipulate the chunks of data enabling experimentation with different strategies
//! all while remaining independent of the read code.
mod struct_of_chunks;
mod strategy;

pub use struct_of_chunks::*;
pub use strategy::*;
use vortex_array::ArrayData;
use vortex_dtype::DType;
use vortex_error::VortexResult;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
use vortex_dtype::DType;
use vortex_error::VortexResult;
use vortex_layout::layouts::chunked::writer::{ChunkedLayoutOptions, ChunkedLayoutWriter};
use vortex_layout::layouts::struct_::writer::StructLayoutWriter;
use vortex_layout::strategies::{LayoutStrategy, LayoutWriter, LayoutWriterExt};

use crate::layouts::chunked::writer::{ChunkedLayoutOptions, ChunkedLayoutWriter};
use crate::layouts::struct_::writer::StructLayoutWriter;
use crate::strategies::{LayoutStrategy, LayoutWriter, LayoutWriterExt};

/// The default Vortex file layout strategy.
///
Expand Down
43 changes: 0 additions & 43 deletions vortex-layout/src/strategies/struct_of_chunks.rs

This file was deleted.

0 comments on commit ade0747

Please sign in to comment.