From f1fc25f6f3e29fcf24794e5c4422fb93bd4f3e19 Mon Sep 17 00:00:00 2001 From: Niels Drost Date: Thu, 14 Nov 2024 22:21:18 +0100 Subject: [PATCH] merge main --- crates/polars-row/src/encode.rs | 2 +- crates/polars-row/src/fixed.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/polars-row/src/encode.rs b/crates/polars-row/src/encode.rs index d92d9dce9449..275699cc909a 100644 --- a/crates/polars-row/src/encode.rs +++ b/crates/polars-row/src/encode.rs @@ -378,7 +378,7 @@ fn allocate_rows_buf( } } else { for (opt_val, row_length) in iter.zip(lengths.iter_mut()) { - *row_length += crate::variable::encoded_len(opt_val, &field) + *row_length += crate::variable::encoded_len(opt_val, &field) as u64; } } processed_count += 1; diff --git a/crates/polars-row/src/fixed.rs b/crates/polars-row/src/fixed.rs index ed4c48946445..bec427b0e86f 100644 --- a/crates/polars-row/src/fixed.rs +++ b/crates/polars-row/src/fixed.rs @@ -200,13 +200,13 @@ pub(crate) unsafe fn encode_iter>, T: FixedLengthEn } else { let usize_offset = *offset as usize; unsafe { - *values.get_unchecked_mut(*usize_offset) = MaybeUninit::new(get_null_sentinel(field)) + *values.get_unchecked_mut(usize_offset) = MaybeUninit::new(get_null_sentinel(field)) }; let end_offset = usize_offset + T::ENCODED_LEN; // initialize remaining bytes - let remainder = values.get_unchecked_mut(*usize_offset + 1..end_offset); + let remainder = values.get_unchecked_mut(usize_offset + 1..end_offset); remainder.fill(MaybeUninit::new(0)); *offset = end_offset as u64;