Skip to content

Commit

Permalink
Merge branch 'main' into filesystem-5779
Browse files Browse the repository at this point in the history
  • Loading branch information
thomas-k-cameron authored Dec 10, 2023
2 parents 03690ab + d091b55 commit cdba47b
Show file tree
Hide file tree
Showing 824 changed files with 154,542 additions and 78,274 deletions.
8 changes: 6 additions & 2 deletions .asf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
# https://cwiki.apache.org/confluence/display/INFRA/Git+-+.asf.yaml+features

notifications:
commits: [email protected]
issues: [email protected]
commits: [email protected]
issues: [email protected]
pullrequests: [email protected]
jira_options: link label worklog
github:
Expand All @@ -44,6 +44,10 @@ github:
rebase: false
features:
issues: true
protected_branches:
main:
required_pull_request_reviews:
required_approving_review_count: 1

# publishes the content of the `asf-site` branch to
# https://arrow.apache.org/datafusion/
Expand Down
5 changes: 5 additions & 0 deletions .github/actions/setup-builder/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ runs:
# "1" means line tables only, which is useful for panic tracebacks.
shell: bash
run: echo "RUSTFLAGS=-C debuginfo=1" >> $GITHUB_ENV
- name: Disable incremental compilation
# Disable incremental compilation to save diskspace (the CI doesn't recompile modified files)
# https://github.com/apache/arrow-datafusion/issues/6676
shell: bash
run: echo "CARGO_INCREMENTAL=0" >> $GITHUB_ENV
- name: Enable backtraces
shell: bash
run: echo "RUST_BACKTRACE=1" >> $GITHUB_ENV
Expand Down
12 changes: 6 additions & 6 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# Which issue does this PR close?
## Which issue does this PR close?

<!--
We generally require a GitHub issue to be filed for all bug fixes and enhancements and this helps us generate change logs for our releases. You can link an issue to this PR using the GitHub syntax. For example `Closes #123` indicates that this PR will close issue #123.
-->

Closes #.

# Rationale for this change
## Rationale for this change

<!--
Why are you proposing this change? If this is already explained clearly in the issue then this section is not needed.
Explaining clearly why changes are proposed helps reviewers understand your changes and offer better suggestions for fixes.
-->

# What changes are included in this PR?
## What changes are included in this PR?

<!--
There is no need to duplicate the description in the issue here but it is sometimes worth providing a summary of the individual changes in this PR.
-->

# Are these changes tested?
## Are these changes tested?

<!--
We typically require tests for all PRs in order to:
Expand All @@ -29,12 +29,12 @@ We typically require tests for all PRs in order to:
If tests are not included in your PR, please explain why (for example, are they covered by existing tests)?
-->

# Are there any user-facing changes?
## Are there any user-facing changes?

<!--
If there are user-facing changes then we may require documentation to be updated before approving the PR.
-->

<!--
If there are any breaking changes to public APIs, please add the `api change` label.
-->
-->
10 changes: 5 additions & 5 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"
- name: Audit licenses
Expand All @@ -40,10 +40,10 @@ jobs:
name: Use prettier to check formatting of documents
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "14"
node-version: "20"
- name: Prettier check
run: |
# if you encounter error, rerun the command below and commit the changes
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dev_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,14 @@ jobs:
contents: read
pull-requests: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Assign GitHub labels
if: |
github.event_name == 'pull_request_target' &&
(github.event.action == 'opened' ||
github.event.action == 'synchronize')
uses: actions/labeler@4.1.0
uses: actions/labeler@v5.0.0
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
configuration-path: .github/workflows/dev_pr/labeler.yml
Expand Down
34 changes: 18 additions & 16 deletions .github/workflows/dev_pr/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,37 @@
# under the License.

development-process:
- dev/**.*
- .github/**.*
- ci/**.*
- .asf.yaml
- changed-files:
- any-glob-to-any-file: ['dev/**.*', '.github/**.*', 'ci/**.*', '.asf.yaml']

documentation:
- docs/**.*
- README.md
- ./**/README.md
- DEVELOPERS.md
- datafusion/docs/**.*
- changed-files:
- any-glob-to-any-file: ['docs/**.*', 'README.md', './**/README.md', 'DEVELOPERS.md', 'datafusion/docs/**.*']

sql:
- datafusion/sql/**/*
- changed-files:
- any-glob-to-any-file: ['datafusion/sql/**/*']

logical-expr:
- datafusion/expr/**/*
- changed-files:
- any-glob-to-any-file: ['datafusion/expr/**/*']

physical-expr:
- datafusion/physical-expr/**/*
- changed-files:
- any-glob-to-any-file: ['datafusion/physical-expr/**/*']

optimizer:
- datafusion/optimizer/**/*
- changed-files:
- any-glob-to-any-file: ['datafusion/optimizer/**/*']

core:
- datafusion/core/**/*
- changed-files:
- any-glob-to-any-file: ['datafusion/core/**/*']

substrait:
- datafusion/substrait/**/*
- changed-files:
- any-glob-to-any-file: ['datafusion/substrait/**/*']

sqllogictest:
- datafusion/core/tests/sqllogictests/**/*
- changed-files:
- any-glob-to-any-file: ['datafusion/sqllogictest/**/*']
6 changes: 3 additions & 3 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,16 +15,16 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout docs sources
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Checkout asf-site branch
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: asf-site
path: asf-site

- name: Setup Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.10"

Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/docs_pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,13 @@ jobs:
container:
image: amd64/rust
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: Setup Rust toolchain
uses: ./.github/actions/setup-builder
with:
rust-version: stable
# Note: this does not include dictionary_expressions to reduce codegen
- name: Run doctests
run: cargo test --doc --features avro,json
- name: Verify Working Directory Clean
Expand Down
Loading

0 comments on commit cdba47b

Please sign in to comment.