Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into 9188-list-arithmetic
Browse files Browse the repository at this point in the history
  • Loading branch information
@pythonspeed
pythonspeed committed Sep 11, 2024
2 parents d1d3950 + d8acacf commit cfd08f9
Show file tree
Hide file tree
Showing 137 changed files with 3,679 additions and 3,046 deletions.
49 changes: 25 additions & 24 deletions Cargo.lock
View file

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

46 changes: 23 additions & 23 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ default-members = [
# ]

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

polars = { version = "0.42.0", path = "crates/polars", default-features = false }
polars-compute = { version = "0.42.0", path = "crates/polars-compute", default-features = false }
polars-core = { version = "0.42.0", path = "crates/polars-core", default-features = false }
polars-error = { version = "0.42.0", path = "crates/polars-error", default-features = false }
polars-expr = { version = "0.42.0", path = "crates/polars-expr", default-features = false }
polars-ffi = { version = "0.42.0", path = "crates/polars-ffi", default-features = false }
polars-io = { version = "0.42.0", path = "crates/polars-io", default-features = false }
polars-json = { version = "0.42.0", path = "crates/polars-json", default-features = false }
polars-lazy = { version = "0.42.0", path = "crates/polars-lazy", default-features = false }
polars-mem-engine = { version = "0.42.0", path = "crates/polars-mem-engine", default-features = false }
polars-ops = { version = "0.42.0", path = "crates/polars-ops", default-features = false }
polars-parquet = { version = "0.42.0", path = "crates/polars-parquet", default-features = false }
polars-pipe = { version = "0.42.0", path = "crates/polars-pipe", default-features = false }
polars-plan = { version = "0.42.0", path = "crates/polars-plan", default-features = false }
polars-python = { version = "0.42.0", path = "crates/polars-python", default-features = false }
polars-row = { version = "0.42.0", path = "crates/polars-row", default-features = false }
polars-schema = { version = "0.42.0", path = "crates/polars-schema", default-features = false }
polars-sql = { version = "0.42.0", path = "crates/polars-sql", default-features = false }
polars-stream = { version = "0.42.0", path = "crates/polars-stream", default-features = false }
polars-time = { version = "0.42.0", path = "crates/polars-time", default-features = false }
polars-utils = { version = "0.42.0", path = "crates/polars-utils", default-features = false }
polars = { version = "0.43.0", path = "crates/polars", default-features = false }
polars-compute = { version = "0.43.0", path = "crates/polars-compute", default-features = false }
polars-core = { version = "0.43.0", path = "crates/polars-core", default-features = false }
polars-error = { version = "0.43.0", path = "crates/polars-error", default-features = false }
polars-expr = { version = "0.43.0", path = "crates/polars-expr", default-features = false }
polars-ffi = { version = "0.43.0", path = "crates/polars-ffi", default-features = false }
polars-io = { version = "0.43.0", path = "crates/polars-io", default-features = false }
polars-json = { version = "0.43.0", path = "crates/polars-json", default-features = false }
polars-lazy = { version = "0.43.0", path = "crates/polars-lazy", default-features = false }
polars-mem-engine = { version = "0.43.0", path = "crates/polars-mem-engine", default-features = false }
polars-ops = { version = "0.43.0", path = "crates/polars-ops", default-features = false }
polars-parquet = { version = "0.43.0", path = "crates/polars-parquet", default-features = false }
polars-pipe = { version = "0.43.0", path = "crates/polars-pipe", default-features = false }
polars-plan = { version = "0.43.0", path = "crates/polars-plan", default-features = false }
polars-python = { version = "0.43.0", path = "crates/polars-python", default-features = false }
polars-row = { version = "0.43.0", path = "crates/polars-row", default-features = false }
polars-schema = { version = "0.43.0", path = "crates/polars-schema", default-features = false }
polars-sql = { version = "0.43.0", path = "crates/polars-sql", default-features = false }
polars-stream = { version = "0.43.0", path = "crates/polars-stream", default-features = false }
polars-time = { version = "0.43.0", path = "crates/polars-time", default-features = false }
polars-utils = { version = "0.43.0", 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.42.0"
version = "0.43.0"
path = "crates/polars-arrow"
default-features = false
features = [
Expand Down
1 change: 1 addition & 0 deletions crates/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ doctest: ## Check that documentation builds
publish: ## Publish Polars crates
cargo publish --allow-dirty -p polars-error
cargo publish --allow-dirty -p polars-utils
cargo publish --allow-dirty -p polars-schema
cargo publish --allow-dirty -p polars-arrow
cargo publish --allow-dirty -p polars-compute
cargo publish --allow-dirty -p polars-row
Expand Down
6 changes: 3 additions & 3 deletions crates/polars-arrow/src/array/binview/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -403,10 +403,10 @@ impl<T: ViewType + ?Sized> BinaryViewArrayGeneric<T> {
self.buffers
.iter()
.map(|buf| {
if buf.shared_count_strong() == 1 {
buf.len()
} else {
if buf.storage_refcount() > 1 {
0
} else {
buf.len()
}
})
.sum()
Expand Down
10 changes: 5 additions & 5 deletions crates/polars-arrow/src/array/static_array_collect.rs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use std::borrow::Cow;
use std::sync::Arc;

use polars_utils::no_call_const;

Expand All @@ -15,6 +14,7 @@ use crate::datatypes::ArrowDataType;
use crate::legacy::prelude::fixed_size_list::AnonymousBuilder as AnonymousFixedSizeListArrayBuilder;
use crate::legacy::prelude::list::AnonymousBuilder as AnonymousListArrayBuilder;
use crate::legacy::trusted_len::TrustedLenPush;
use crate::storage::SharedStorage;
use crate::trusted_len::TrustedLen;
use crate::types::NativeType;

Expand Down Expand Up @@ -256,7 +256,7 @@ macro_rules! impl_collect_vec_validity {
unsafe {
// SAFETY: we made sure the null_count is correct.
Some(Bitmap::from_inner_unchecked(
Arc::new(bitmap.into()),
SharedStorage::from_vec(bitmap),
0,
buf.len(),
Some(null_count),
Expand Down Expand Up @@ -317,7 +317,7 @@ macro_rules! impl_trusted_collect_vec_validity {
unsafe {
// SAFETY: we made sure the null_count is correct.
Some(Bitmap::from_inner_unchecked(
Arc::new(bitmap.into()),
SharedStorage::from_vec(bitmap),
0,
buf.len(),
Some(null_count),
Expand Down Expand Up @@ -766,15 +766,15 @@ macro_rules! impl_collect_bool_validity {

let false_count = len - true_count;
let values = unsafe {
Bitmap::from_inner_unchecked(Arc::new(buf.into()), 0, len, Some(false_count))
Bitmap::from_inner_unchecked(SharedStorage::from_vec(buf), 0, len, Some(false_count))
};

let null_count = len - nonnull_count;
let validity_bitmap = if $with_valid && null_count > 0 {
unsafe {
// SAFETY: we made sure the null_count is correct.
Some(Bitmap::from_inner_unchecked(
Arc::new(validity.into()),
SharedStorage::from_vec(validity),
0,
len,
Some(null_count),
Expand Down
Loading

0 comments on commit cfd08f9

Please sign in to comment.