Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/apache/datafusion into date…
Browse files Browse the repository at this point in the history
…-part-int
  • Loading branch information
jayzhan211 committed Nov 21, 2024
2 parents 68adb4e + 9fb7aee commit c7afa29
Show file tree
Hide file tree
Showing 70 changed files with 2,386 additions and 1,206 deletions.
14 changes: 7 additions & 7 deletions .github/actions/setup-builder/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,18 @@ runs:
- name: Install Build Dependencies
shell: bash
run: |
RETRY="ci/scripts/retry"
"${RETRY}" apt-get update
"${RETRY}" apt-get install -y protobuf-compiler
RETRY=("ci/scripts/retry" timeout 120)
"${RETRY[@]}" apt-get update
"${RETRY[@]}" apt-get install -y protobuf-compiler
- name: Setup Rust toolchain
shell: bash
# rustfmt is needed for the substrait build script
run: |
RETRY="ci/scripts/retry"
RETRY=("ci/scripts/retry" timeout 120)
echo "Installing ${{ inputs.rust-version }}"
"${RETRY}" rustup toolchain install ${{ inputs.rust-version }}
"${RETRY}" rustup default ${{ inputs.rust-version }}
"${RETRY}" rustup component add rustfmt
"${RETRY[@]}" rustup toolchain install ${{ inputs.rust-version }}
"${RETRY[@]}" rustup default ${{ inputs.rust-version }}
"${RETRY[@]}" rustup component add rustfmt
- name: Configure rust runtime env
uses: ./.github/actions/setup-rust-runtime
- name: Fixup git permissions
Expand Down
18 changes: 9 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,22 +74,22 @@ version = "43.0.0"
ahash = { version = "0.8", default-features = false, features = [
"runtime-rng",
] }
arrow = { version = "53.2.0", features = [
arrow = { version = "53.3.0", features = [
"prettyprint",
] }
arrow-array = { version = "53.2.0", default-features = false, features = [
arrow-array = { version = "53.3.0", default-features = false, features = [
"chrono-tz",
] }
arrow-buffer = { version = "53.2.0", default-features = false }
arrow-flight = { version = "53.2.0", features = [
arrow-buffer = { version = "53.3.0", default-features = false }
arrow-flight = { version = "53.3.0", features = [
"flight-sql-experimental",
] }
arrow-ipc = { version = "53.2.0", default-features = false, features = [
arrow-ipc = { version = "53.3.0", default-features = false, features = [
"lz4",
] }
arrow-ord = { version = "53.2.0", default-features = false }
arrow-schema = { version = "53.2.0", default-features = false }
arrow-string = { version = "53.2.0", default-features = false }
arrow-ord = { version = "53.3.0", default-features = false }
arrow-schema = { version = "53.3.0", default-features = false }
arrow-string = { version = "53.3.0", default-features = false }
async-trait = "0.1.73"
bigdecimal = "=0.4.1"
bytes = "1.4"
Expand Down Expand Up @@ -131,7 +131,7 @@ log = "^0.4"
num_cpus = "1.13.0"
object_store = { version = "0.11.0", default-features = false }
parking_lot = "0.12"
parquet = { version = "53.2.0", default-features = false, features = [
parquet = { version = "53.3.0", default-features = false, features = [
"arrow",
"async",
"object_store",
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/retry
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ x() {
"$@"
}

max_retry_time_seconds=$(( 3 * 60 ))
max_retry_time_seconds=$(( 5 * 60 ))
retry_delay_seconds=10

END=$(( $(date +%s) + ${max_retry_time_seconds} ))
Expand Down
Loading

0 comments on commit c7afa29

Please sign in to comment.