Skip to content

Commit 9e8f43e

Browse files
a10ya10y
authored
chore: layout cleanups (#3455)
1 parent f33c2f8 commit 9e8f43e

File tree

20 files changed

+99
-100
lines changed

20 files changed

+99
-100
lines changed

‎Cargo.toml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,8 @@ arrow-ord = "55"
6767
arrow-schema = "55"
6868
arrow-select = "55"
6969
arrow-string = "55"
70-
async-once-cell = "0.5.4"
7170
async-stream = "0.3.6"
7271
async-trait = "0.1.88"
73-
backtrace = "0.3.74"
7472
bindgen = "0.71.1"
7573
bit-vec = "0.8.0"
7674
bitvec = "1.0.1"
@@ -86,10 +84,6 @@ crossterm = "0.28"
8684
dashmap = "6.1.0"
8785
datafusion = { version = "47", default-features = false }
8886
datafusion-common = { version = "47" }
89-
datafusion-datasource = { version = "47" }
90-
datafusion-execution = { version = "47" }
91-
datafusion-expr = { version = "47" }
92-
datafusion-physical-expr = { version = "47" }
9387
datafusion-physical-plan = { version = "47" }
9488
divan = { package = "codspeed-divan-compat", version = "2.8.0" }
9589
duckdb = { path = "duckdb-vortex/duckdb-rs/crates/duckdb", features = [
@@ -105,9 +99,7 @@ flume = "0.11"
10599
fsst-rs = "0.5.2"
106100
futures = { version = "0.3.31", default-features = false }
107101
futures-util = "0.3.31"
108-
getrandom = "0.3"
109102
goldenfile = "1"
110-
governor = "0.10"
111103
half = { version = "2.5", features = ["std", "num-traits"] }
112104
hashbrown = "0.15.1"
113105
homedir = "0.3.3"

‎vortex-file/src/file.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ impl VortexFile {
7676
self.footer
7777
.layout()
7878
// TODO(ngates): we may want to allow the user pass in a name here?
79-
.new_reader(&"".into(), &segment_source, self.footer().ctx())
79+
.new_reader("".into(), segment_source, self.footer().ctx().clone())
8080
}
8181

8282
/// Initiate a scan of the file, returning a builder for configuring the scan.

‎vortex-file/src/open.rs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ pub struct VortexOpenOptions<F: FileType> {
3535
}
3636

3737
impl<F: FileType> VortexOpenOptions<F> {
38+
/// Create a new [`VortexOpenOptions`] with the expected options for the file source.
39+
///
40+
/// This should not be used directly, instead public API clients are expected to
41+
/// access either `VortexOpenOptions::file()` or `VortexOpenOptions::memory()`
3842
pub(crate) fn new(options: F::Options) -> Self {
3943
Self {
4044
options,

‎vortex-layout/src/layout.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ pub trait Layout: 'static + Send + Sync + Debug + private::Sealed {
4949

5050
fn new_reader(
5151
&self,
52-
name: &Arc<str>,
53-
segment_source: &Arc<dyn SegmentSource>,
54-
ctx: &ArrayContext,
52+
name: Arc<str>,
53+
segment_source: Arc<dyn SegmentSource>,
54+
ctx: ArrayContext,
5555
) -> VortexResult<LayoutReaderRef>;
5656
}
5757

@@ -243,9 +243,9 @@ impl<V: VTable> Layout for LayoutAdapter<V> {
243243

244244
fn new_reader(
245245
&self,
246-
name: &Arc<str>,
247-
segment_source: &Arc<dyn SegmentSource>,
248-
ctx: &ArrayContext,
246+
name: Arc<str>,
247+
segment_source: Arc<dyn SegmentSource>,
248+
ctx: ArrayContext,
249249
) -> VortexResult<LayoutReaderRef> {
250250
V::new_reader(&self.0, name, segment_source, ctx)
251251
}

‎vortex-layout/src/layouts/chunked/mod.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ impl VTable for ChunkedVTable {
5959

6060
fn new_reader(
6161
layout: &Self::Layout,
62-
name: &Arc<str>,
63-
segment_source: &Arc<dyn SegmentSource>,
64-
ctx: &ArrayContext,
62+
name: Arc<str>,
63+
segment_source: Arc<dyn SegmentSource>,
64+
ctx: ArrayContext,
6565
) -> VortexResult<LayoutReaderRef> {
6666
Ok(Arc::new(ChunkedReader::new(
6767
layout.clone(),
68-
name.clone(),
69-
segment_source.clone(),
70-
ctx.clone(),
68+
name,
69+
segment_source,
70+
ctx,
7171
)))
7272
}
7373

‎vortex-layout/src/layouts/chunked/reader.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ mod test {
384384
) {
385385
block_on(async {
386386
let result = layout
387-
.new_reader(&"".into(), &segments, &ctx)
387+
.new_reader("".into(), segments, ctx)
388388
.unwrap()
389389
.projection_evaluation(&(0..layout.row_count()), &root())
390390
.unwrap()

‎vortex-layout/src/layouts/dict/mod.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,13 +69,13 @@ impl VTable for DictVTable {
6969

7070
fn new_reader(
7171
layout: &Self::Layout,
72-
name: &Arc<str>,
73-
segment_source: &Arc<dyn SegmentSource>,
74-
ctx: &ArrayContext,
72+
name: Arc<str>,
73+
segment_source: Arc<dyn SegmentSource>,
74+
ctx: ArrayContext,
7575
) -> VortexResult<LayoutReaderRef> {
7676
Ok(Arc::new(DictReader::try_new(
7777
layout.clone(),
78-
name.clone(),
78+
name,
7979
segment_source,
8080
ctx,
8181
)?))

‎vortex-layout/src/layouts/dict/reader.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,18 +43,18 @@ impl DictReader {
4343
pub(super) fn try_new(
4444
layout: DictLayout,
4545
name: Arc<str>,
46-
segment_source: &Arc<dyn SegmentSource>,
47-
ctx: &ArrayContext,
46+
segment_source: Arc<dyn SegmentSource>,
47+
ctx: ArrayContext,
4848
) -> VortexResult<Self> {
4949
let values_len = usize::try_from(layout.values.row_count())?;
50-
let values =
51-
layout
52-
.values
53-
.new_reader(&format!("{name}.values").into(), segment_source, ctx)?;
54-
let codes =
55-
layout
56-
.codes
57-
.new_reader(&format!("{name}.codes").into(), segment_source, ctx)?;
50+
let values = layout.values.new_reader(
51+
format!("{name}.values").into(),
52+
segment_source.clone(),
53+
ctx.clone(),
54+
)?;
55+
let codes = layout
56+
.codes
57+
.new_reader(format!("{name}.codes").into(), segment_source, ctx)?;
5858

5959
Ok(Self {
6060
layout,

‎vortex-layout/src/layouts/flat/mod.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,15 +59,15 @@ impl VTable for FlatVTable {
5959

6060
fn new_reader(
6161
layout: &Self::Layout,
62-
name: &Arc<str>,
63-
segment_source: &Arc<dyn SegmentSource>,
64-
ctx: &ArrayContext,
62+
name: Arc<str>,
63+
segment_source: Arc<dyn SegmentSource>,
64+
ctx: ArrayContext,
6565
) -> VortexResult<LayoutReaderRef> {
6666
Ok(Arc::new(FlatReader::new(
6767
layout.clone(),
68-
name.clone(),
69-
segment_source.clone(),
70-
ctx.clone(),
68+
name,
69+
segment_source,
70+
ctx,
7171
)))
7272
}
7373

‎vortex-layout/src/layouts/flat/reader.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ mod test {
278278
let segments: Arc<dyn SegmentSource> = Arc::new(segments);
279279

280280
let result = layout
281-
.new_reader(&"".into(), &segments, &ctx)
281+
.new_reader("".into(), segments, ctx)
282282
.unwrap()
283283
.projection_evaluation(&(0..layout.row_count()), &root())
284284
.unwrap()
@@ -319,7 +319,7 @@ mod test {
319319

320320
let expr = gt(root(), lit(3i32));
321321
let result = layout
322-
.new_reader(&"".into(), &segments, &ctx)
322+
.new_reader("".into(), segments, ctx)
323323
.unwrap()
324324
.projection_evaluation(&(0..layout.row_count()), &expr)
325325
.unwrap()
@@ -359,7 +359,7 @@ mod test {
359359
let segments: Arc<dyn SegmentSource> = Arc::new(segments);
360360

361361
let result = layout
362-
.new_reader(&"".into(), &segments, &ctx)
362+
.new_reader("".into(), segments, ctx)
363363
.unwrap()
364364
.projection_evaluation(&(2..4), &root())
365365
.unwrap()

0 commit comments

Comments
 (0)