Skip to content

Commit

Permalink
Merge branch 'main' into chunchun/udf-to-localtime
Browse files Browse the repository at this point in the history
  • Loading branch information
appletreeisyellow committed Jul 8, 2024
2 parents f3e49ad + 894a879 commit e59ff24
Show file tree
Hide file tree
Showing 219 changed files with 9,896 additions and 2,752 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -581,4 +581,4 @@ jobs:
run: cargo msrv verify
- name: Check datafusion-cli
working-directory: datafusion-cli
run: cargo msrv verify
run: cargo msrv verify
69 changes: 0 additions & 69 deletions .pre-commit-config.yaml

This file was deleted.

18 changes: 9 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,22 +64,22 @@ version = "39.0.0"
ahash = { version = "0.8", default-features = false, features = [
"runtime-rng",
] }
arrow = { version = "52.0.0", features = [
arrow = { version = "52.1.0", features = [
"prettyprint",
] }
arrow-array = { version = "52.0.0", default-features = false, features = [
arrow-array = { version = "52.1.0", default-features = false, features = [
"chrono-tz",
] }
arrow-buffer = { version = "52.0.0", default-features = false }
arrow-flight = { version = "52.0.0", features = [
arrow-buffer = { version = "52.1.0", default-features = false }
arrow-flight = { version = "52.1.0", features = [
"flight-sql-experimental",
] }
arrow-ipc = { version = "52.0.0", default-features = false, features = [
arrow-ipc = { version = "52.1.0", default-features = false, features = [
"lz4",
] }
arrow-ord = { version = "52.0.0", default-features = false }
arrow-schema = { version = "52.0.0", default-features = false }
arrow-string = { version = "52.0.0", default-features = false }
arrow-ord = { version = "52.1.0", default-features = false }
arrow-schema = { version = "52.1.0", default-features = false }
arrow-string = { version = "52.1.0", default-features = false }
async-trait = "0.1.73"
bigdecimal = "=0.4.1"
bytes = "1.4"
Expand Down Expand Up @@ -114,7 +114,7 @@ log = "^0.4"
num_cpus = "1.13.0"
object_store = { version = "0.10.1", default-features = false }
parking_lot = "0.12"
parquet = { version = "52.0.0", default-features = false, features = [
parquet = { version = "52.1.0", default-features = false, features = [
"arrow",
"async",
"object_store",
Expand Down
1 change: 0 additions & 1 deletion ci/scripts/rust_example.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

set -ex
cd datafusion-examples/examples/
cargo fmt --all -- --check
cargo check --examples

files=$(ls .)
Expand Down
Loading

0 comments on commit e59ff24

Please sign in to comment.