Skip to content

Commit 011e6f5

Browse files
authored
Upgrade arrow parquet and arrow-flight to 24.0.0 (#3691)
* Update to arrow 24.0.0 * Update pyo3 interface * Update datafusion-cli lockfile
1 parent 010b352 commit 011e6f5

File tree

14 files changed

+87
-53
lines changed

14 files changed

+87
-53
lines changed

datafusion-cli/Cargo.lock

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

datafusion-cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ rust-version = "1.62"
2929
readme = "README.md"
3030

3131
[dependencies]
32-
arrow = "23.0.0"
32+
arrow = "24.0.0"
3333
clap = { version = "3", features = ["derive", "cargo"] }
3434
datafusion = { path = "../datafusion/core", version = "12.0.0" }
3535
dirs = "4.0.0"

datafusion-examples/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ path = "examples/avro_sql.rs"
3434
required-features = ["datafusion/avro"]
3535

3636
[dev-dependencies]
37-
arrow-flight = "23.0.0"
37+
arrow-flight = "24.0.0"
3838
async-trait = "0.1.41"
3939
datafusion = { path = "../datafusion/core" }
4040
futures = "0.3"

datafusion/common/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ pyarrow = ["pyo3", "arrow/pyarrow"]
4040

4141
[dependencies]
4242
apache-avro = { version = "0.14", default-features = false, features = ["snappy"], optional = true }
43-
arrow = { version = "23.0.0", default-features = false }
43+
arrow = { version = "24.0.0", default-features = false }
4444
cranelift-module = { version = "0.88.0", optional = true }
4545
object_store = { version = "0.5.0", default-features = false, optional = true }
4646
ordered-float = "3.0"
47-
parquet = { version = "23.0.0", default-features = false, optional = true }
47+
parquet = { version = "24.0.0", default-features = false, optional = true }
4848
pyo3 = { version = "0.17.1", optional = true }
4949
sqlparser = "0.24"

datafusion/common/src/pyarrow.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,16 @@ impl PyArrowConvert for ScalarValue {
4343
let array = factory.call1((args, typ))?;
4444

4545
// convert the pyarrow array to rust array using C data interface
46-
let array = array.extract::<ArrayData>()?;
47-
let scalar = ScalarValue::try_from_array(&array.into(), 0)?;
46+
let array = arrow::array::make_array(ArrayData::from_pyarrow(array)?);
47+
let scalar = ScalarValue::try_from_array(&array, 0)?;
4848

4949
Ok(scalar)
5050
}
5151

5252
fn to_pyarrow(&self, py: Python) -> PyResult<PyObject> {
5353
let array = self.to_array();
5454
// convert to pyarrow array using C data interface
55-
let pyarray = array.data_ref().clone().into_py(py);
55+
let pyarray = array.data().to_pyarrow(py)?;
5656
let pyscalar = pyarray.call_method1(py, "__getitem__", (0,))?;
5757

5858
Ok(pyscalar)

datafusion/core/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ unicode_expressions = ["datafusion-physical-expr/regex_expressions", "datafusion
5656
[dependencies]
5757
ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] }
5858
apache-avro = { version = "0.14", optional = true }
59-
arrow = { version = "23.0.0", features = ["prettyprint"] }
59+
arrow = { version = "24.0.0", features = ["prettyprint"] }
6060
async-trait = "0.1.41"
6161
bytes = "1.1"
6262
chrono = { version = "0.4", default-features = false }
@@ -78,7 +78,7 @@ num_cpus = "1.13.0"
7878
object_store = "0.5.0"
7979
ordered-float = "3.0"
8080
parking_lot = "0.12"
81-
parquet = { version = "23.0.0", features = ["arrow", "async"] }
81+
parquet = { version = "24.0.0", features = ["arrow", "async"] }
8282
paste = "^1.0"
8383
pin-project-lite = "^0.2.7"
8484
pyo3 = { version = "0.17.1", optional = true }
@@ -93,7 +93,7 @@ url = "2.2"
9393
uuid = { version = "1.0", features = ["v4"] }
9494

9595
[dev-dependencies]
96-
arrow = { version = "23.0.0", features = ["prettyprint", "dyn_cmp_dict"] }
96+
arrow = { version = "24.0.0", features = ["prettyprint", "dyn_cmp_dict"] }
9797
async-trait = "0.1.53"
9898
criterion = "0.4"
9999
csv = "1.1.6"

datafusion/core/fuzz-utils/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ edition = "2021"
2323
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
2424

2525
[dependencies]
26-
arrow = { version = "23.0.0", features = ["prettyprint"] }
26+
arrow = { version = "24.0.0", features = ["prettyprint"] }
2727
env_logger = "0.9.0"
2828
rand = "0.8"

datafusion/expr/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ path = "src/lib.rs"
3636

3737
[dependencies]
3838
ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] }
39-
arrow = { version = "23.0.0", default-features = false }
39+
arrow = { version = "24.0.0", default-features = false }
4040
datafusion-common = { path = "../common", version = "12.0.0" }
4141
sqlparser = "0.24"

datafusion/jit/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ path = "src/lib.rs"
3636
jit = []
3737

3838
[dependencies]
39-
arrow = { version = "23.0.0", default-features = false }
39+
arrow = { version = "24.0.0", default-features = false }
4040
cranelift = "0.88.0"
4141
cranelift-jit = "0.88.0"
4242
cranelift-module = "0.88.0"

datafusion/optimizer/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ default = ["unicode_expressions"]
3737
unicode_expressions = []
3838

3939
[dependencies]
40-
arrow = { version = "23.0.0", features = ["prettyprint"] }
40+
arrow = { version = "24.0.0", features = ["prettyprint"] }
4141
async-trait = "0.1.41"
4242
chrono = { version = "0.4", default-features = false }
4343
datafusion-common = { path = "../common", version = "12.0.0" }

datafusion/physical-expr/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ unicode_expressions = ["unicode-segmentation"]
4040

4141
[dependencies]
4242
ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] }
43-
arrow = { version = "23.0.0", features = ["prettyprint"] }
43+
arrow = { version = "24.0.0", features = ["prettyprint"] }
4444
blake2 = { version = "^0.10.2", optional = true }
4545
blake3 = { version = "1.0", optional = true }
4646
chrono = { version = "0.4", default-features = false }

datafusion/proto/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ default = []
4040
json = ["pbjson", "pbjson-build", "serde", "serde_json"]
4141

4242
[dependencies]
43-
arrow = "23.0.0"
43+
arrow = "24.0.0"
4444
datafusion = { path = "../core", version = "12.0.0" }
4545
datafusion-common = { path = "../common", version = "12.0.0" }
4646
datafusion-expr = { path = "../expr", version = "12.0.0" }

0 commit comments

Comments
 (0)