Skip to content

Commit 66ee0c5

Browse files
committed
Merge branch 'main' into udaf-schema-16997
2 parents 1d31dfe + 7d52145 commit 66ee0c5

File tree

100 files changed

+5099
-841
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+5099
-841
lines changed

.devcontainer/Dockerfile

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
44
# Remove imagemagick due to https://security-tracker.debian.org/tracker/CVE-2019-10131
55
&& apt-get purge -y imagemagick imagemagick-6-common
66

7-
# Add protoc
7+
# setup the containers WORKDIR so npm install works
8+
# https://stackoverflow.com/questions/57534295/npm-err-tracker-idealtree-already-exists-while-creating-the-docker-image-for
9+
WORKDIR /root
10+
11+
# Add protoc, npm, prettier
812
# https://datafusion.apache.org/contributor-guide/development_environment.html#protoc-installation
913
RUN apt-get update \
10-
&& apt-get install -y --no-install-recommends protobuf-compiler libprotobuf-dev \
14+
&& apt-get install -y --no-install-recommends protobuf-compiler libprotobuf-dev npm nodejs\
1115
&& rm -rf /var/lib/apt/lists/*

.github/workflows/extended.yml

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -159,44 +159,6 @@ jobs:
159159
cargo test --features backtrace --profile release-nonlto --test sqllogictests -- --include-sqlite
160160
cargo clean
161161
162-
# If the workflow was triggered by the PR comment (through pr_comment_commands.yml action) we need to manually update check status to display in UI
163-
update-check-status:
164-
needs: [linux-build-lib, linux-test-extended, hash-collisions, sqllogictest-sqlite]
165-
runs-on: ubuntu-latest
166-
if: ${{ always() && github.event_name == 'workflow_dispatch' }}
167-
steps:
168-
- name: Determine workflow status
169-
id: status
170-
run: |
171-
if [[ "${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}" == "true" ]]; then
172-
echo "workflow_status=failure" >> $GITHUB_OUTPUT
173-
echo "conclusion=failure" >> $GITHUB_OUTPUT
174-
else
175-
echo "workflow_status=completed" >> $GITHUB_OUTPUT
176-
echo "conclusion=success" >> $GITHUB_OUTPUT
177-
fi
178-
179-
- name: Update check run
180-
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
181-
with:
182-
github-token: ${{ secrets.GITHUB_TOKEN }}
183-
script: |
184-
const workflowRunUrl = `https://github.com/${context.repo.owner}/${context.repo.repo}/actions/runs/${context.runId}`;
185-
186-
await github.rest.checks.update({
187-
owner: context.repo.owner,
188-
repo: context.repo.repo,
189-
check_run_id: ${{ github.event.inputs.check_run_id }},
190-
status: 'completed',
191-
conclusion: '${{ steps.status.outputs.conclusion }}',
192-
output: {
193-
title: '${{ steps.status.outputs.conclusion == 'success' && 'Extended Tests Passed' || 'Extended Tests Failed' }}',
194-
summary: `Extended tests have completed with status: ${{ steps.status.outputs.conclusion }}.\n\n[View workflow run](${workflowRunUrl})`
195-
},
196-
details_url: workflowRunUrl
197-
});
198-
199-
200162
201163
202164

.github/workflows/pr_comment_commands.yml

Lines changed: 0 additions & 89 deletions
This file was deleted.

Cargo.lock

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

clippy.toml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,14 @@ disallowed-types = [
99

1010
# Lowering the threshold to help prevent stack overflows (default is 16384)
1111
# See: https://rust-lang.github.io/rust-clippy/master/index.html#/large_futures
12-
future-size-threshold = 10000
12+
future-size-threshold = 10000
13+
14+
# Be more aware of large error variants which can impact the "happy path" due
15+
# to large stack footprint when considering async state machines (default is 128).
16+
#
17+
# Value of 70 picked arbitrarily as something less than 100.
18+
#
19+
# See:
20+
# - https://github.com/apache/datafusion/issues/16652
21+
# - https://rust-lang.github.io/rust-clippy/master/index.html#result_large_err
22+
large-error-threshold = 70

datafusion-cli/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ arrow = { workspace = true }
3939
async-trait = { workspace = true }
4040
aws-config = "1.8.3"
4141
aws-credential-types = "1.2.5"
42-
clap = { version = "4.5.41", features = ["derive", "cargo"] }
42+
clap = { version = "4.5.43", features = ["derive", "cargo"] }
4343
datafusion = { workspace = true, features = [
4444
"avro",
4545
"crypto_expressions",
@@ -61,7 +61,7 @@ object_store = { workspace = true, features = ["aws", "gcp", "http"] }
6161
parking_lot = { workspace = true }
6262
parquet = { workspace = true, default-features = false }
6363
regex = { workspace = true }
64-
rustyline = "16.0"
64+
rustyline = "17.0"
6565
tokio = { workspace = true, features = ["macros", "rt", "rt-multi-thread", "sync", "parking_lot", "signal"] }
6666
url = { workspace = true }
6767

0 commit comments

Comments
 (0)