Skip to content

Commit

Permalink
update arrow
Browse files Browse the repository at this point in the history
  • Loading branch information
ritchie46 committed Apr 19, 2022
1 parent 66f0b27 commit a002017
Show file tree
Hide file tree
Showing 6 changed files with 30 additions and 40 deletions.
4 changes: 2 additions & 2 deletions polars/polars-arrow/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ description = "Arrow interfaces for Polars DataFrame library"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
# arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "36b08249dd03c8b8f88f454158fcf3401c647a49", default-features = false }
arrow = { package = "arrow2", git = "https://github.com/ritchie46/arrow2", branch = "polars", default-features = false }
arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "ddede6c9063a843fd60b793ba9d761653d020e6a", default-features = false }
# arrow = { package = "arrow2", git = "https://github.com/ritchie46/arrow2", branch = "polars", default-features = false }
# arrow = { package = "arrow2", version = "0.10", default-features = false, features = ["compute_concatenate"] }
hashbrown = "0.12"
num = "^0.4"
Expand Down
8 changes: 4 additions & 4 deletions polars/polars-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,10 @@ thiserror = "^1.0"

[dependencies.arrow]
package = "arrow2"
# git = "https://github.com/jorgecarleitao/arrow2"
git = "https://github.com/ritchie46/arrow2"
# rev = "36b08249dd03c8b8f88f454158fcf3401c647a49"
branch = "polars"
git = "https://github.com/jorgecarleitao/arrow2"
# git = "https://github.com/ritchie46/arrow2"
rev = "ddede6c9063a843fd60b793ba9d761653d020e6a"
# branch = "polars"
version = "0.10"
default-features = false
features = [
Expand Down
3 changes: 3 additions & 0 deletions polars/polars-core/src/chunked_array/object/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@ where
arr.null_bitmap = validity;
Box::new(arr)
}
fn to_boxed(&self) -> Box<dyn Array> {
Box::new(self.clone())
}
}

impl<T> ObjectChunked<T>
Expand Down
4 changes: 2 additions & 2 deletions polars/polars-io/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ private = ["polars-time/private"]
[dependencies]
ahash = "0.7"
anyhow = "1.0"
# arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "36b08249dd03c8b8f88f454158fcf3401c647a49", default-features = false }
arrow = { package = "arrow2", git = "https://github.com/ritchie46/arrow2", branch = "polars", default-features = false }
arrow = { package = "arrow2", git = "https://github.com/jorgecarleitao/arrow2", rev = "ddede6c9063a843fd60b793ba9d761653d020e6a", default-features = false }
# arrow = { package = "arrow2", git = "https://github.com/ritchie46/arrow2", branch = "polars", default-features = false }
# arrow = { package = "arrow2", version = "0.10", default-features = false }
csv-core = { version = "0.1.10", optional = true }
dirs = "4.0"
Expand Down
12 changes: 8 additions & 4 deletions polars/polars-io/src/parquet/write.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,12 @@ where
.zip(parquet_schema.columns().par_iter())
.zip(encodings.par_iter())
.map(|((array, descriptor), encoding)| {
let encoded_pages =
array_to_pages(array.as_ref(), descriptor.clone(), options, *encoding)?;
let encoded_pages = array_to_pages(
array.as_ref(),
descriptor.descriptor.clone(),
options,
*encoding,
)?;
encoded_pages
.map(|page| {
compress(page?, vec![], options.compression).map_err(|x| x.into())
Expand All @@ -133,8 +137,8 @@ where
// write the headers
writer.start()?;
for group in row_group_iter {
let (group, len) = group?;
writer.write(group, len)?;
let (group, _len) = group?;
writer.write(group)?;
}
let _ = writer.end(None)?;

Expand Down
39 changes: 11 additions & 28 deletions py-polars/Cargo.lock

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

0 comments on commit a002017

Please sign in to comment.