Skip to content

Commit 9c210b1

Browse files
committed
rebase fixes; file size changes for new test
1 parent 4629711 commit 9c210b1

4 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎vortex-array/src/aggregate_fn/fns/bounded_max/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ mod tests {
699699
&VarBinViewArray::from_iter_str(["a"]).into_array(),
700700
&mut ctx,
701701
)?;
702-
acc.combine_partials(source.partial_scalar()?)?;
702+
acc.combine_partials(&source.partial_scalar()?)?;
703703
assert_eq!(
704704
acc.can_satisfy(&requested),
705705
AggregateFnSatisfaction::Approximate

‎vortex-array/src/aggregate_fn/fns/bounded_min/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ mod tests {
531531
&VarBinViewArray::from_iter_str(["c"]).into_array(),
532532
&mut ctx,
533533
)?;
534-
acc.combine_partials(source.partial_scalar()?)?;
534+
acc.combine_partials(&source.partial_scalar()?)?;
535535
assert_eq!(
536536
acc.can_satisfy(&requested),
537537
AggregateFnSatisfaction::Approximate

‎vortex-file/src/tests.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,13 +168,13 @@ async fn test_eof_values() {
168168
#[rstest]
169169
#[case::default(
170170
BtrBlocksCompressorBuilder::from_session(&SESSION),
171-
if cfg!(feature = "zstd") { 70_036 } else { 69_972 }
171+
if cfg!(feature = "zstd") { 70_252 } else { 70_188 }
172172
)]
173173
#[cfg_attr(
174174
feature = "zstd",
175175
case::compact(
176176
BtrBlocksCompressorBuilder::from_session(&SESSION).with_compact(),
177-
55_112
177+
55_328
178178
)
179179
)]
180180
#[tokio::test]

‎vortex-layout/src/layouts/file_stats.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ impl AggregateStat {
105105
dtype: &DType,
106106
) -> VortexResult<Self> {
107107
let mut accumulator = aggregate_fn.accumulator(dtype)?;
108-
accumulator.combine_partials(partial.clone())?;
108+
accumulator.combine_partials(&partial)?;
109109
let value = Precision::exact(accumulator.final_scalar()?);
110110
Ok(Self {
111111
aggregate_fn,

0 commit comments

Comments
 (0)