Skip to content

Commit 2937655

Browse files
authored
Merge branch 'vortex-data:develop' into push_validity_into_children_for_struct_array
2 parents 90df26a + 052025a commit 2937655

File tree

90 files changed

+559
-733
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

90 files changed

+559
-733
lines changed

.github/workflows/bench.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,8 @@ jobs:
6666
shell: bash
6767
env:
6868
RUSTFLAGS: "-C target-cpu=native -C force-frame-pointers=yes"
69-
# The main difference between this and `bench-pr.yml` is that we add the `lance` feature.
7069
run: |
71-
cargo build --bin ${{ matrix.benchmark.id }} --package vortex-bench --profile release_debug --features lance
70+
cargo build --bin ${{ matrix.benchmark.id }} --package vortex-bench --profile release_debug
7271
7372
- name: Setup Polar Signals
7473
uses: polarsignals/gh-actions-ps-profiling@v0.6.0

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ jobs:
595595
RUSTFLAGS: "-C target-feature=+avx2 -C debug-assertions=yes"
596596
run: cargo codspeed build ${{ matrix.features }} $(printf -- '-p %s ' ${{ matrix.packages }}) --profile bench
597597
- name: Run benchmarks
598-
uses: CodSpeedHQ/action@346a2d8a8d9d38909abd0bc3d23f773110f076ad
598+
uses: CodSpeedHQ/action@972e3437949c89e1357ebd1a2dbc852fcbc57245
599599
with:
600600
run: cargo codspeed run
601601
token: ${{ secrets.CODSPEED_TOKEN }}

Cargo.lock

Lines changed: 23 additions & 35 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

STYLE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
- `vortex_panic!` for handling invariant violations
5555
- Add context to errors using `.with_context()`
5656
- Include backtraces for better debugging
57-
- Use `VortexExpect` and `VortexUnwrap` traits when unwrapping is appropriate
57+
- Use `VortexExpect` trait when unwrapping is appropriate with proper error context.
5858

5959
## Code Structure
6060

encodings/alp/src/alp_rd/mod.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ use vortex_dtype::DType;
3131
use vortex_dtype::NativePType;
3232
use vortex_dtype::match_each_integer_ptype;
3333
use vortex_error::VortexExpect;
34-
use vortex_error::VortexUnwrap;
3534
use vortex_error::vortex_panic;
3635
use vortex_utils::aliases::hash_map::HashMap;
3736

@@ -229,15 +228,15 @@ impl RDEncoder {
229228
// SAFETY: by construction, all values in left_parts can be packed to left_bit_width.
230229
let packed_left = unsafe {
231230
bitpack_encode_unchecked(primitive_left, left_bit_width as _)
232-
.vortex_unwrap()
231+
.vortex_expect("bitpack_encode_unchecked should succeed for left parts")
233232
.into_array()
234233
};
235234

236235
let primitive_right = PrimitiveArray::new(right_parts, Validity::NonNullable);
237236
// SAFETY: by construction, all values in right_parts are right_bit_width + leading zeros.
238237
let packed_right = unsafe {
239238
bitpack_encode_unchecked(primitive_right, self.right_bit_width as _)
240-
.vortex_unwrap()
239+
.vortex_expect("bitpack_encode_unchecked should succeed for right parts")
241240
.into_array()
242241
};
243242

@@ -252,7 +251,9 @@ impl RDEncoder {
252251
// SAFETY: We calculate bw such that it is wide enough to hold the largest position index.
253252
let packed_pos = unsafe {
254253
bitpack_encode_unchecked(exc_pos_array, bw)
255-
.vortex_unwrap()
254+
.vortex_expect(
255+
"bitpack_encode_unchecked should succeed for exception positions",
256+
)
256257
.into_array()
257258
};
258259

encodings/bytebool/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,5 @@ vortex-mask = { workspace = true }
2626
vortex-scalar = { workspace = true }
2727

2828
[dev-dependencies]
29-
itertools = { workspace = true }
3029
rstest = { workspace = true }
3130
vortex-array = { workspace = true, features = ["test-harness"] }

encodings/decimal-byte-parts/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,5 @@ vortex-mask = { workspace = true }
2727
vortex-scalar = { workspace = true }
2828

2929
[dev-dependencies]
30-
itertools = { workspace = true }
3130
rstest = { workspace = true }
3231
vortex-array = { path = "../../vortex-array", features = ["test-harness"] }

encodings/fastlanes/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ vortex-vector = { workspace = true }
3737
[dev-dependencies]
3838
divan = { workspace = true }
3939
itertools = { workspace = true }
40-
mimalloc = { workspace = true }
4140
rand = { workspace = true }
4241
rstest = { workspace = true }
4342
vortex-alp = { path = "../alp" }

encodings/fsst/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ test-harness = ["dep:rand", "vortex-array/test-harness"]
3434

3535
[dev-dependencies]
3636
divan = { workspace = true }
37-
itertools = { workspace = true }
3837
rand = { workspace = true }
3938
rstest = { workspace = true }
4039
vortex-array = { workspace = true, features = ["test-harness"] }

encodings/fsst/src/compress.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use vortex_buffer::Buffer;
1313
use vortex_buffer::BufferMut;
1414
use vortex_dtype::DType;
1515
use vortex_error::VortexExpect;
16-
use vortex_error::VortexUnwrap;
1716

1817
use crate::FSSTArray;
1918

@@ -74,7 +73,11 @@ where
7473
uncompressed_lengths.push(0);
7574
}
7675
Some(s) => {
77-
uncompressed_lengths.push(s.len().try_into().vortex_unwrap());
76+
uncompressed_lengths.push(
77+
s.len()
78+
.try_into()
79+
.vortex_expect("string length must fit in i32"),
80+
);
7881

7982
// SAFETY: buffer is large enough
8083
unsafe { compressor.compress_into(s, &mut buffer) };

0 commit comments

Comments
 (0)