Skip to content

Commit

Permalink
Update to arrow 31
Browse files Browse the repository at this point in the history
  • Loading branch information
tustvold committed Jan 16, 2023
1 parent 03ef500 commit ed78813
Show file tree
Hide file tree
Showing 17 changed files with 61 additions and 61 deletions.
4 changes: 2 additions & 2 deletions benchmarks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ simd = ["datafusion/simd"]
snmalloc = ["snmalloc-rs"]

[dependencies]
arrow = "30.0.1"
arrow = "31.0.0"
datafusion = { path = "../datafusion/core", version = "16.0.0", features = ["scheduler"] }
env_logger = "0.10"
futures = "0.3"
mimalloc = { version = "0.1", optional = true, default-features = false }
num_cpus = "1.13.0"
object_store = "0.5.0"
parquet = "30.0.1"
parquet = "31.0.0"
parquet-test-utils = { path = "../parquet-test-utils/", version = "0.1.0" }
rand = "0.8.4"
serde = { version = "1.0.136", features = ["derive"] }
Expand Down
62 changes: 31 additions & 31 deletions datafusion-cli/Cargo.lock

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

2 changes: 1 addition & 1 deletion datafusion-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ rust-version = "1.62"
readme = "README.md"

[dependencies]
arrow = "30.0.1"
arrow = "31.0.0"
async-trait = "0.1.41"
clap = { version = "3", features = ["derive", "cargo"] }
datafusion = { path = "../datafusion/core", version = "16.0.0" }
Expand Down
4 changes: 2 additions & 2 deletions datafusion-examples/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ path = "examples/avro_sql.rs"
required-features = ["datafusion/avro"]

[dev-dependencies]
arrow = "30.0.1"
arrow-flight = "30.0.1"
arrow = "31.0.0"
arrow-flight = "31.0.0"
async-trait = "0.1.41"
datafusion = { path = "../datafusion/core" }
datafusion-common = { path = "../datafusion/common" }
Expand Down
4 changes: 2 additions & 2 deletions datafusion/common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,11 +40,11 @@ pyarrow = ["pyo3", "arrow/pyarrow"]

[dependencies]
apache-avro = { version = "0.14", default-features = false, features = ["snappy"], optional = true }
arrow = { version = "30.0.1", default-features = false }
arrow = { version = "31.0.0", default-features = false }
chrono = { version = "0.4", default-features = false }
cranelift-module = { version = "0.89.0", optional = true }
num_cpus = "1.13.0"
object_store = { version = "0.5.0", default-features = false, optional = true }
parquet = { version = "30.0.1", default-features = false, optional = true }
parquet = { version = "31.0.0", default-features = false, optional = true }
pyo3 = { version = "0.17.1", optional = true }
sqlparser = "0.30"
6 changes: 3 additions & 3 deletions datafusion/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ unicode_expressions = ["datafusion-physical-expr/regex_expressions", "datafusion
[dependencies]
ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] }
apache-avro = { version = "0.14", optional = true }
arrow = { version = "30.0.1", features = ["prettyprint"] }
arrow = { version = "31.0.0", features = ["prettyprint"] }
async-compression = { version = "0.3.14", features = ["bzip2", "gzip", "xz", "futures-io", "tokio"], optional = true }
async-trait = "0.1.41"
bytes = "1.1"
Expand All @@ -83,7 +83,7 @@ num-traits = { version = "0.2", optional = true }
num_cpus = "1.13.0"
object_store = "0.5.0"
parking_lot = "0.12"
parquet = { version = "30.0.1", features = ["arrow", "async"] }
parquet = { version = "31.0.0", features = ["arrow", "async"] }
paste = "^1.0"
percent-encoding = "2.2.0"
pin-project-lite = "^0.2.7"
Expand All @@ -102,7 +102,7 @@ xz2 = { version = "0.1", optional = true }


[dev-dependencies]
arrow = { version = "30.0.1", features = ["prettyprint", "dyn_cmp_dict"] }
arrow = { version = "31.0.0", features = ["prettyprint", "dyn_cmp_dict"] }
async-trait = "0.1.53"
criterion = "0.4"
csv = "1.1.6"
Expand Down
2 changes: 1 addition & 1 deletion datafusion/core/src/physical_plan/file_format/csv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ mod tests {
let err = it.next().await.unwrap().unwrap_err().to_string();
assert_eq!(
err,
"Csv error: incorrect number of fields, expected 14 got 13"
"Csv error: incorrect number of fields for line 1, expected 14 got 13"
);
Ok(())
}
Expand Down
14 changes: 7 additions & 7 deletions datafusion/core/tests/sql/timestamp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1539,13 +1539,13 @@ async fn cast_timestamp_to_timestamptz() -> Result<()> {
let actual = execute_to_batches(&ctx, sql).await;

let expected = vec![
"+----------------------------------+---------------------------------------+",
"| table_a.ts | arrowtypeof(table_a.ts) |",
"+----------------------------------+---------------------------------------+",
"| 2020-09-08T13:42:29.190855+00:00 | Timestamp(Nanosecond, Some(\"+00:00\")) |",
"| 2020-09-08T12:42:29.190855+00:00 | Timestamp(Nanosecond, Some(\"+00:00\")) |",
"| 2020-09-08T11:42:29.190855+00:00 | Timestamp(Nanosecond, Some(\"+00:00\")) |",
"+----------------------------------+---------------------------------------+",
"+-----------------------------+---------------------------------------+",
"| table_a.ts | arrowtypeof(table_a.ts) |",
"+-----------------------------+---------------------------------------+",
"| 2020-09-08T13:42:29.190855Z | Timestamp(Nanosecond, Some(\"+00:00\")) |",
"| 2020-09-08T12:42:29.190855Z | Timestamp(Nanosecond, Some(\"+00:00\")) |",
"| 2020-09-08T11:42:29.190855Z | Timestamp(Nanosecond, Some(\"+00:00\")) |",
"+-----------------------------+---------------------------------------+",
];
assert_batches_eq!(expected, &actual);

Expand Down
2 changes: 1 addition & 1 deletion datafusion/expr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ path = "src/lib.rs"

[dependencies]
ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] }
arrow = { version = "30.0.1", default-features = false }
arrow = { version = "31.0.0", default-features = false }
datafusion-common = { path = "../common", version = "16.0.0" }
log = "^0.4"
sqlparser = "0.30"
2 changes: 1 addition & 1 deletion datafusion/jit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ path = "src/lib.rs"
jit = []

[dependencies]
arrow = { version = "30.0.1", default-features = false }
arrow = { version = "31.0.0", default-features = false }
cranelift = "0.89.0"
cranelift-jit = "0.89.0"
cranelift-module = "0.89.0"
Expand Down
2 changes: 1 addition & 1 deletion datafusion/optimizer/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ default = ["unicode_expressions"]
unicode_expressions = []

[dependencies]
arrow = { version = "30.0.1", features = ["prettyprint"] }
arrow = { version = "31.0.0", features = ["prettyprint"] }
async-trait = "0.1.41"
chrono = { version = "0.4.23", default-features = false }
datafusion-common = { path = "../common", version = "16.0.0" }
Expand Down
6 changes: 3 additions & 3 deletions datafusion/physical-expr/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ unicode_expressions = ["unicode-segmentation"]

[dependencies]
ahash = { version = "0.8", default-features = false, features = ["runtime-rng"] }
arrow = { version = "30.0.1", features = ["prettyprint", "dyn_cmp_dict"] }
arrow-buffer = "30.0.1"
arrow-schema = "30.0.1"
arrow = { version = "31.0.0", features = ["prettyprint", "dyn_cmp_dict"] }
arrow-buffer = "31.0.0"
arrow-schema = "31.0.0"
blake2 = { version = "^0.10.2", optional = true }
blake3 = { version = "1.0", optional = true }
chrono = { version = "0.4.23", default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions datafusion/proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ default = []
json = ["pbjson", "serde", "serde_json"]

[dependencies]
arrow = "30.0.1"
arrow = "31.0.0"
chrono = { version = "0.4", default-features = false }
datafusion = { path = "../core", version = "16.0.0" }
datafusion-common = { path = "../common", version = "16.0.0" }
Expand All @@ -60,4 +60,4 @@ tokio = "1.18"
[build-dependencies]
# Pin these dependencies so that the generated output is deterministic
pbjson-build = { version = "=0.5.1" }
prost-build = { version = "=0.11.5" }
prost-build = { version = "=0.11.6" }
2 changes: 1 addition & 1 deletion datafusion/row/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ path = "src/lib.rs"
jit = ["datafusion-jit"]

[dependencies]
arrow = "30.0.1"
arrow = "31.0.0"
datafusion-common = { path = "../common", version = "16.0.0" }
datafusion-jit = { path = "../jit", version = "16.0.0", optional = true }
paste = "^1.0"
Expand Down
2 changes: 1 addition & 1 deletion datafusion/sql/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ default = ["unicode_expressions"]
unicode_expressions = []

[dependencies]
arrow-schema = "30.0.1"
arrow-schema = "31.0.0"
datafusion-common = { path = "../common", version = "16.0.0" }
datafusion-expr = { path = "../expr", version = "16.0.0" }
log = "^0.4"
Expand Down
2 changes: 1 addition & 1 deletion parquet-test-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ edition = "2021"
[dependencies]
datafusion = { path = "../datafusion/core" }
object_store = "0.5.0"
parquet = "30.0.1"
parquet = "31.0.0"
2 changes: 1 addition & 1 deletion test-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
arrow = { version = "30.0.1", features = ["prettyprint"] }
arrow = { version = "31.0.0", features = ["prettyprint"] }
datafusion-common = { path = "../datafusion/common" }
env_logger = "0.10.0"
rand = "0.8"

0 comments on commit ed78813

Please sign in to comment.