Skip to content

Commit c4fd913

Browse files
committed
Merge remote-tracking branch 'origin/develop' into ngates/array-vtables-view2
2 parents 05fc936 + 6fdd0b3 commit c4fd913

3 files changed

Lines changed: 4 additions & 7 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -746,7 +746,7 @@ jobs:
746746
tool: cargo-codspeed
747747
- name: Build benchmarks
748748
env:
749-
RUSTFLAGS: "-C target-feature=+avx2 -C debug-assertions=yes"
749+
RUSTFLAGS: "-C target-feature=+avx2"
750750
run: cargo codspeed build ${{ matrix.features }} $(printf -- '-p %s ' ${{ matrix.packages }}) --profile bench
751751
- name: Run benchmarks
752752
uses: CodSpeedHQ/action@d872884a306dd4853acf0f584f4b706cf0cc72a2

vortex-array/src/arrays/fixed_size_list/tests/take.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ use super::common::create_nullable_fsl;
1111
use super::common::create_single_element_fsl;
1212
use crate::ArrayRef;
1313
use crate::IntoArray;
14-
use crate::ToCanonical;
1514
use crate::arrays::FixedSizeListArray;
1615
use crate::arrays::PrimitiveArray;
1716
use crate::assert_arrays_eq;
@@ -160,8 +159,8 @@ fn test_element_index_overflow(
160159
#[case] indices: ArrayRef,
161160
#[case] expected: FixedSizeListArray,
162161
) {
163-
let result = fsl.take(indices).unwrap().to_fixed_size_list();
164-
assert_arrays_eq!(expected, result);
162+
let result = fsl.take(indices).unwrap();
163+
assert_arrays_eq!(result, expected);
165164
}
166165

167166
// Parameterized test for nullable array scenarios that are specific to FSL's implementation.

vortex-layout/src/layouts/buffered.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,7 @@ impl LayoutStrategy for BufferedStrategy {
7171
if stream.as_mut().peek().await.is_none() {
7272
let mut sequence_ptr = sequence_id.descend();
7373
while let Some(chunk) = chunks.pop_front() {
74-
let chunk_size = chunk.nbytes();
75-
nbytes -= chunk_size;
76-
buffered_bytes_counter.fetch_sub(chunk_size, Ordering::Relaxed);
74+
buffered_bytes_counter.fetch_sub(chunk.nbytes(), Ordering::Relaxed);
7775
yield (sequence_ptr.advance(), chunk)
7876
}
7977
break;

0 commit comments

Comments
 (0)