Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into pyo3-0.23
Browse files Browse the repository at this point in the history
  • Loading branch information
@bschoenmaeckers
bschoenmaeckers committed Dec 9, 2024
2 parents 84f04d4 + 87feed7 commit 6790fa5
Show file tree
Hide file tree
Showing 219 changed files with 4,077 additions and 1,721 deletions.
50 changes: 25 additions & 25 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

48 changes: 24 additions & 24 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ default-members = [
]

[workspace.package]
version = "0.44.2"
version = "0.45.1"
authors = ["Ritchie Vink <[email protected]>"]
edition = "2021"
homepage = "https://www.pola.rs/"
Expand Down Expand Up @@ -92,36 +92,36 @@ version_check = "0.9.4"
xxhash-rust = { version = "0.8.6", features = ["xxh3"] }
zstd = "0.13"

polars = { version = "0.44.2", path = "crates/polars", default-features = false }
polars-compute = { version = "0.44.2", path = "crates/polars-compute", default-features = false }
polars-core = { version = "0.44.2", path = "crates/polars-core", default-features = false }
polars-dylib = { version = "0.44.2", path = "crates/polars-dylib", default-features = false }
polars-error = { version = "0.44.2", path = "crates/polars-error", default-features = false }
polars-expr = { version = "0.44.2", path = "crates/polars-expr", default-features = false }
polars-ffi = { version = "0.44.2", path = "crates/polars-ffi", default-features = false }
polars-io = { version = "0.44.2", path = "crates/polars-io", default-features = false }
polars-json = { version = "0.44.2", path = "crates/polars-json", default-features = false }
polars-lazy = { version = "0.44.2", path = "crates/polars-lazy", default-features = false }
polars-mem-engine = { version = "0.44.2", path = "crates/polars-mem-engine", default-features = false }
polars-ops = { version = "0.44.2", path = "crates/polars-ops", default-features = false }
polars-parquet = { version = "0.44.2", path = "crates/polars-parquet", default-features = false }
polars-pipe = { version = "0.44.2", path = "crates/polars-pipe", default-features = false }
polars-plan = { version = "0.44.2", path = "crates/polars-plan", default-features = false }
polars-python = { version = "0.44.2", path = "crates/polars-python", default-features = false }
polars-row = { version = "0.44.2", path = "crates/polars-row", default-features = false }
polars-schema = { version = "0.44.2", path = "crates/polars-schema", default-features = false }
polars-sql = { version = "0.44.2", path = "crates/polars-sql", default-features = false }
polars-stream = { version = "0.44.2", path = "crates/polars-stream", default-features = false }
polars-time = { version = "0.44.2", path = "crates/polars-time", default-features = false }
polars-utils = { version = "0.44.2", path = "crates/polars-utils", default-features = false }
polars = { version = "0.45.1", path = "crates/polars", default-features = false }
polars-compute = { version = "0.45.1", path = "crates/polars-compute", default-features = false }
polars-core = { version = "0.45.1", path = "crates/polars-core", default-features = false }
polars-dylib = { version = "0.45.1", path = "crates/polars-dylib", default-features = false }
polars-error = { version = "0.45.1", path = "crates/polars-error", default-features = false }
polars-expr = { version = "0.45.1", path = "crates/polars-expr", default-features = false }
polars-ffi = { version = "0.45.1", path = "crates/polars-ffi", default-features = false }
polars-io = { version = "0.45.1", path = "crates/polars-io", default-features = false }
polars-json = { version = "0.45.1", path = "crates/polars-json", default-features = false }
polars-lazy = { version = "0.45.1", path = "crates/polars-lazy", default-features = false }
polars-mem-engine = { version = "0.45.1", path = "crates/polars-mem-engine", default-features = false }
polars-ops = { version = "0.45.1", path = "crates/polars-ops", default-features = false }
polars-parquet = { version = "0.45.1", path = "crates/polars-parquet", default-features = false }
polars-pipe = { version = "0.45.1", path = "crates/polars-pipe", default-features = false }
polars-plan = { version = "0.45.1", path = "crates/polars-plan", default-features = false }
polars-python = { version = "0.45.1", path = "crates/polars-python", default-features = false }
polars-row = { version = "0.45.1", path = "crates/polars-row", default-features = false }
polars-schema = { version = "0.45.1", path = "crates/polars-schema", default-features = false }
polars-sql = { version = "0.45.1", path = "crates/polars-sql", default-features = false }
polars-stream = { version = "0.45.1", path = "crates/polars-stream", default-features = false }
polars-time = { version = "0.45.1", path = "crates/polars-time", default-features = false }
polars-utils = { version = "0.45.1", path = "crates/polars-utils", default-features = false }

[workspace.dependencies.arrow-format]
package = "polars-arrow-format"
version = "0.1.0"

[workspace.dependencies.arrow]
package = "polars-arrow"
version = "0.44.2"
version = "0.45.1"
path = "crates/polars-arrow"
default-features = false
features = [
Expand Down
1 change: 0 additions & 1 deletion crates/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,6 @@ check-wasm: ## Check wasm build without supported features
--exclude-features aws \
--exclude-features azure \
--exclude-features cloud \
--exclude-features cloud_write \
--exclude-features decompress \
--exclude-features decompress-fast \
--exclude-features default \
Expand Down
4 changes: 4 additions & 0 deletions crates/polars-arrow/src/array/dictionary/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -401,6 +401,10 @@ impl<K: DictionaryKey> DictionaryArray<K> {
},
})
}

pub fn take(self) -> (ArrowDataType, PrimitiveArray<K>, Box<dyn Array>) {
(self.dtype, self.keys, self.values)
}
}

impl<K: DictionaryKey> Array for DictionaryArray<K> {
Expand Down
8 changes: 8 additions & 0 deletions crates/polars-arrow/src/bitmap/bitmask.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,14 @@ impl std::fmt::Debug for BitMask<'_> {
impl<'a> BitMask<'a> {
pub fn from_bitmap(bitmap: &'a Bitmap) -> Self {
let (bytes, offset, len) = bitmap.as_slice();
Self::new(bytes, offset, len)
}

pub fn inner(&self) -> (&[u8], usize, usize) {
(self.bytes, self.offset, self.len)
}

pub fn new(bytes: &'a [u8], offset: usize, len: usize) -> Self {
// Check length so we can use unsafe access in our get.
assert!(bytes.len() * 8 >= len + offset);
Self { bytes, offset, len }
Expand Down
7 changes: 7 additions & 0 deletions crates/polars-arrow/src/bitmap/mutable.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ use std::hint::unreachable_unchecked;
use polars_error::{polars_bail, PolarsResult};
use polars_utils::vec::PushUnchecked;

use super::bitmask::BitMask;
use super::utils::{count_zeros, fmt, BitChunk, BitChunks, BitChunksExactMut, BitmapIter};
use super::{intersects_with_mut, Bitmap};
use crate::bitmap::utils::{get_bit_unchecked, merge_reversed, set_bit_in_byte};
Expand Down Expand Up @@ -800,6 +801,12 @@ impl MutableBitmap {
unsafe { self.extend_from_slice_unchecked(slice, offset, length) }
}

#[inline]
pub fn extend_from_bitmask(&mut self, bitmask: BitMask<'_>) {
let (slice, offset, length) = bitmask.inner();
self.extend_from_slice(slice, offset, length)
}

/// Extends the [`MutableBitmap`] from a [`Bitmap`].
#[inline]
pub fn extend_from_bitmap(&mut self, bitmap: &Bitmap) {
Expand Down
Loading

0 comments on commit 6790fa5

Please sign in to comment.