Skip to content

Commit b8d3ff2

Browse files
AdamGSAdamGS
authored
chore: random refactoring/renaming (#1669)
1 parent c03faad commit b8d3ff2

File tree

9 files changed

+95
-120
lines changed

9 files changed

+95
-120
lines changed

‎vortex-file/src/read/builder/mod.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,10 @@ impl<R: VortexReadAt + Unpin> VortexReadBuilder<R> {
142142
let message_cache = Arc::new(RwLock::new(LayoutMessageCache::default()));
143143
let layout_reader = self.layout_serde.read_layout(
144144
initial_read.fb_layout(),
145-
Scan::new(match self.projection {
146-
Projection::All => None,
147-
Projection::Flat(p) => Some(Arc::new(Select::include(p))),
148-
}),
145+
match self.projection {
146+
Projection::All => Scan::empty(),
147+
Projection::Flat(p) => Scan::new(Arc::new(Select::include(p))),
148+
},
149149
RelativeLayoutCache::new(message_cache.clone(), lazy_dtype.clone()),
150150
)?;
151151

@@ -154,7 +154,7 @@ impl<R: VortexReadAt + Unpin> VortexReadBuilder<R> {
154154
.map(|row_filter| {
155155
self.layout_serde.read_layout(
156156
initial_read.fb_layout(),
157-
Scan::new(Some(Arc::new(row_filter))),
157+
Scan::new(Arc::new(row_filter)),
158158
RelativeLayoutCache::new(message_cache.clone(), lazy_dtype),
159159
)
160160
})

‎vortex-file/src/read/layouts/chunked.rs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,9 @@ impl ChunkedLayoutBuilder<'_> {
8686
};
8787
Some(self.layout_builder.read_layout(
8888
metadata_fb,
89-
Scan::new(Some(Arc::new(Select::include(
89+
Scan::new(Arc::new(Select::include(
9090
s.names().iter().map(|s| Field::Name(s.clone())).collect(),
91-
)))),
91+
))),
9292
self.message_cache.relative(
9393
METADATA_LAYOUT_PART_ID,
9494
Arc::new(LazyDType::from_dtype(stats_dtype)),
@@ -289,7 +289,7 @@ impl ChunkedLayoutReader {
289289
impl LayoutReader for ChunkedLayoutReader {
290290
fn add_splits(&self, row_offset: usize, splits: &mut BTreeSet<usize>) -> VortexResult<()> {
291291
for RangedLayoutReader((begin, _), child) in &self.layouts {
292-
child.add_splits(row_offset + begin, splits)?
292+
child.add_splits(row_offset + begin, splits)?;
293293
}
294294
Ok(())
295295
}
@@ -474,7 +474,7 @@ mod tests {
474474
.unwrap(),
475475
ChunkedLayoutBuilder {
476476
layout,
477-
scan: Scan::new(None),
477+
scan: Scan::empty(),
478478
layout_builder,
479479
message_cache: RelativeLayoutCache::new(cache, dtype),
480480
}
@@ -491,11 +491,11 @@ mod tests {
491491
let cache = Arc::new(RwLock::new(LayoutMessageCache::default()));
492492
let (mut filter_layout, mut projection_layout, buf, length) = layout_and_bytes(
493493
cache.clone(),
494-
Scan::new(Some(RowFilter::new_expr(BinaryExpr::new_expr(
494+
Scan::new(RowFilter::new_expr(BinaryExpr::new_expr(
495495
Arc::new(Identity),
496496
Operator::Gt,
497497
Literal::new_expr(10.into()),
498-
)))),
498+
))),
499499
)
500500
.await;
501501

@@ -527,7 +527,7 @@ mod tests {
527527
async fn read_range_no_filter() {
528528
let cache = Arc::new(RwLock::new(LayoutMessageCache::default()));
529529
let (_, mut projection_layout, buf, length) =
530-
layout_and_bytes(cache.clone(), Scan::new(None)).await;
530+
layout_and_bytes(cache.clone(), Scan::empty()).await;
531531
let arr = read_layout(&mut projection_layout, cache, &buf, length).pop_front();
532532

533533
assert!(arr.is_some());
@@ -543,7 +543,7 @@ mod tests {
543543
async fn read_no_range() {
544544
let cache = Arc::new(RwLock::new(LayoutMessageCache::default()));
545545
let (_, mut projection_layout, buf, _) =
546-
layout_and_bytes(cache.clone(), Scan::new(None)).await;
546+
layout_and_bytes(cache.clone(), Scan::empty()).await;
547547
let arr = read_layout_data(
548548
&mut projection_layout,
549549
cache,
@@ -564,7 +564,7 @@ mod tests {
564564
async fn read_multiple_selectors() {
565565
let cache = Arc::new(RwLock::new(LayoutMessageCache::default()));
566566
let (_, mut projection_layout, buf, _) =
567-
layout_and_bytes(cache.clone(), Scan::new(None)).await;
567+
layout_and_bytes(cache.clone(), Scan::empty()).await;
568568

569569
let mut first_range = BooleanBufferBuilder::new(200);
570570
first_range.append_n(150, true);

‎vortex-file/src/read/layouts/columnar.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ impl ColumnarLayoutBuilder<'_> {
8080

8181
let child = self.layout_serde.read_layout(
8282
child_layout,
83-
Scan::new(projected_expr),
83+
Scan::from(projected_expr),
8484
self.message_cache
8585
.relative(resolved_child as u16, child_field),
8686
)?;
@@ -223,7 +223,7 @@ impl ColumnarLayoutReader {
223223
impl LayoutReader for ColumnarLayoutReader {
224224
fn add_splits(&self, row_offset: usize, splits: &mut BTreeSet<usize>) -> VortexResult<()> {
225225
for child in &self.children {
226-
child.add_splits(row_offset, splits)?
226+
child.add_splits(row_offset, splits)?;
227227
}
228228
Ok(())
229229
}
@@ -470,7 +470,7 @@ mod tests {
470470
layout_serde
471471
.read_layout(
472472
initial_read.fb_layout(),
473-
Scan::new(None),
473+
Scan::empty(),
474474
RelativeLayoutCache::new(cache.clone(), dtype),
475475
)
476476
.unwrap(),
@@ -485,11 +485,11 @@ mod tests {
485485
let cache = Arc::new(RwLock::new(LayoutMessageCache::default()));
486486
let (mut filter_layout, mut project_layout, buf, length) = layout_and_bytes(
487487
cache.clone(),
488-
Scan::new(Some(RowFilter::new_expr(BinaryExpr::new_expr(
488+
Scan::new(RowFilter::new_expr(BinaryExpr::new_expr(
489489
Column::new_expr(Field::from("ints")),
490490
Operator::Gt,
491491
Literal::new_expr(10.into()),
492-
)))),
492+
))),
493493
)
494494
.await;
495495
let arr = filter_read_layout(
@@ -540,7 +540,7 @@ mod tests {
540540
async fn read_range_no_filter() {
541541
let cache = Arc::new(RwLock::new(LayoutMessageCache::default()));
542542
let (_, mut project_layout, buf, length) =
543-
layout_and_bytes(cache.clone(), Scan::new(None)).await;
543+
layout_and_bytes(cache.clone(), Scan::empty()).await;
544544
let arr = read_layout(project_layout.as_mut(), cache, &buf, length).pop_front();
545545

546546
assert!(arr.is_some());
@@ -583,7 +583,7 @@ mod tests {
583583
let cache = Arc::new(RwLock::new(LayoutMessageCache::default()));
584584
let (mut filter_layout, mut project_layout, buf, length) = layout_and_bytes(
585585
cache.clone(),
586-
Scan::new(Some(RowFilter::new_expr(BinaryExpr::new_expr(
586+
Scan::new(RowFilter::new_expr(BinaryExpr::new_expr(
587587
BinaryExpr::new_expr(
588588
Column::new_expr(Field::from("strs")),
589589
Operator::Eq,
@@ -595,7 +595,7 @@ mod tests {
595595
Operator::Lt,
596596
Literal::new_expr(150.into()),
597597
),
598-
)))),
598+
))),
599599
)
600600
.await;
601601
let arr = filter_read_layout(

‎vortex-file/src/read/layouts/flat.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ mod tests {
139139
writer.write_batch(array).await.unwrap();
140140
let written = writer.into_inner();
141141

142-
let projection_scan = Scan::new(None);
142+
let projection_scan = Scan::empty();
143143
let dtype = Arc::new(LazyDType::from_dtype(PType::I32.into()));
144144

145145
(
@@ -180,11 +180,11 @@ mod tests {
180180
let cache = Arc::new(RwLock::new(LayoutMessageCache::default()));
181181
let (mut filter_layout, mut projection_layout, buf, length) = layout_and_bytes(
182182
cache.clone(),
183-
Scan::new(Some(RowFilter::new_expr(BinaryExpr::new_expr(
183+
Scan::new(RowFilter::new_expr(BinaryExpr::new_expr(
184184
Arc::new(Identity),
185185
Operator::Gt,
186186
Literal::new_expr(10.into()),
187-
)))),
187+
))),
188188
)
189189
.await;
190190
let arr = filter_read_layout(
@@ -225,11 +225,11 @@ mod tests {
225225
let cache = Arc::new(RwLock::new(LayoutMessageCache::default()));
226226
let (mut filter_layout, mut projection_layout, buf, length) = layout_and_bytes(
227227
cache.clone(),
228-
Scan::new(Some(RowFilter::new_expr(BinaryExpr::new_expr(
228+
Scan::new(RowFilter::new_expr(BinaryExpr::new_expr(
229229
Arc::new(Identity),
230230
Operator::Gt,
231231
Literal::new_expr(101.into()),
232-
)))),
232+
))),
233233
)
234234
.await;
235235
let arr = filter_read_layout(

‎vortex-file/src/read/layouts/test_read.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,20 @@ use vortex_array::ArrayData;
66
use vortex_error::VortexUnwrap;
77

88
use crate::read::mask::RowMask;
9-
use crate::read::splits::FixedSplitIterator;
9+
use crate::read::splits::SplitsAccumulator;
1010
use crate::{LayoutMessageCache, LayoutReader, MessageLocator, PollRead};
1111

1212
fn layout_splits(
1313
layouts: &[&mut dyn LayoutReader],
1414
length: usize,
1515
) -> impl Iterator<Item = RowMask> {
16-
let mut iter = FixedSplitIterator::new(length as u64, None);
16+
let mut iter = SplitsAccumulator::new(length as u64, None);
1717
let mut splits = BTreeSet::new();
1818
for layout in layouts {
1919
layout.add_splits(0, &mut splits).vortex_unwrap();
2020
}
21-
iter.additional_splits(&mut splits).vortex_unwrap();
22-
iter.map(|m| m.unwrap())
21+
iter.append_splits(&mut splits);
22+
iter.into_iter().map(|m| m.unwrap())
2323
}
2424

2525
pub fn read_layout_data(

‎vortex-file/src/read/mod.rs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,13 @@ impl Scan {
4848
Self { expr: None }
4949
}
5050

51-
pub fn new(expr: Option<ExprRef>) -> Self {
51+
pub fn new(expr: ExprRef) -> Self {
52+
Self { expr: Some(expr) }
53+
}
54+
}
55+
56+
impl From<Option<ExprRef>> for Scan {
57+
fn from(expr: Option<ExprRef>) -> Self {
5258
Self { expr }
5359
}
5460
}

0 commit comments

Comments
 (0)