Skip to content

Commit 678f0f6

Browse files
Merge branch 'main' into docs/4420-docs-review-skill
2 parents dea5294 + f78c0b1 commit 678f0f6

55 files changed

Lines changed: 10352 additions & 463 deletions

Some content is hidden

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

‎.github/dependabot.yml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,42 @@ updates:
5353
update-types:
5454
- "minor"
5555
- "patch"
56+
- package-ecosystem: cargo
57+
directory: "/native/native-executors"
58+
schedule:
59+
interval: weekly
60+
target-branch: main
61+
labels: [dependencies]
62+
ignore:
63+
# major version bumps of datafusion*, arrow*, parquet are handled manually
64+
- dependency-name: "arrow*"
65+
update-types: ["version-update:semver-major"]
66+
- dependency-name: "parquet"
67+
update-types: ["version-update:semver-major"]
68+
- dependency-name: "datafusion*"
69+
update-types: ["version-update:semver-major"]
70+
groups:
71+
proto:
72+
applies-to: version-updates
73+
patterns:
74+
- "prost*"
75+
- "pbjson*"
76+
# Catch-all: group only minor/patch into a single PR,
77+
# excluding deps we want always separate (and excluding arrow/parquet which have their own group)
78+
all-other-cargo-deps:
79+
applies-to: version-updates
80+
patterns:
81+
- "*"
82+
exclude-patterns:
83+
- "arrow*"
84+
- "parquet"
85+
- "object_store"
86+
- "sqlparser"
87+
- "prost*"
88+
- "pbjson*"
89+
update-types:
90+
- "minor"
91+
- "patch"
5692
- package-ecosystem: "github-actions"
5793
directory: "/"
5894
schedule:

‎.github/workflows/pr_build_linux.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@ jobs:
106106
run: |
107107
rustup component add rustfmt
108108
cd native && cargo fmt --all -- --check
109+
cargo fmt --manifest-path native-executors/Cargo.toml --all -- --check
109110
110111
# Fast syntactic-only scalafix check. Parses sources without compiling, so it
111112
# surfaces version-independent style issues (e.g. RedundantSyntax) in seconds,
@@ -476,6 +477,36 @@ jobs:
476477
- name: Rust test steps
477478
uses: ./.github/actions/rust-test
478479

480+
# native/native-executors, the Comet Native Executors cluster (issue #7288),
481+
# is a Cargo workspace of its own so that the main build never depends on
482+
# Ballista. linux-test-rust doesn't build it, so this job does, and the lint
483+
# job checks its formatting. When Comet moves to a DataFusion major that
484+
# Ballista hasn't released yet, the upgrade can turn this job off until
485+
# Ballista catches up.
486+
linux-test-native-executors:
487+
needs: lint
488+
name: ubuntu-latest/native-executors
489+
if: ${{ !inputs.cache-refresh-only && inputs.profiles != 'nightly' }}
490+
runs-on: ubuntu-24.04
491+
container:
492+
image: amd64/rust
493+
steps:
494+
- uses: actions/checkout@v7
495+
496+
- name: Setup Rust & Java toolchain
497+
uses: ./.github/actions/setup-builder
498+
with:
499+
rust-version: ${{ env.RUST_VERSION }}
500+
jdk-version: 17
501+
502+
- name: Check Cargo clippy
503+
run: |
504+
cargo clippy --manifest-path native/native-executors/Cargo.toml --color=never \
505+
--all-targets -- -D warnings
506+
507+
- name: Run Cargo test
508+
run: cargo test --manifest-path native/native-executors/Cargo.toml --color=never
509+
479510
linux-test:
480511
# `lint` is already upstream via build-native; it is listed here so this
481512
# job can read its `profile-matrix` output.

‎contrib/delta/native/Cargo.lock‎

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

‎dev/release/rat_exclude_files.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
.claude/skills
77
CLAUDE.md
88
native/Cargo.lock
9+
native/native-executors/Cargo.lock
910
dev/copyright/scala-header.txt
1011
dev/diffs/iceberg/*.diff
1112
dev/release/requirements.txt

‎docs/build.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ rm -rf comet-0.16
3232
rm -rf comet-0.17
3333
rm -rf comet-1.0
3434
rm -rf comet-1.1
35+
rm -rf comet-1.2
3536
python3 generate-versions.py
3637

3738
# Generate dynamic content (configs, compatibility matrices) for latest docs

‎docs/generate-versions.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,6 @@ def generate_docs(snapshot_version: str, latest_released_version: str, previous_
154154
if __name__ == "__main__":
155155
print("Generating versioned user guide docs...")
156156
snapshot_version = get_version_from_pom()
157-
latest_released_version = "1.1.0"
158-
previous_versions = ["0.13.0", "0.14.0", "0.15.0", "0.16.0", "0.17.0", "1.0.0"]
157+
latest_released_version = "1.2.0"
158+
previous_versions = ["0.13.0", "0.14.0", "0.15.0", "0.16.0", "0.17.0", "1.0.0", "1.1.0"]
159159
generate_docs(snapshot_version, latest_released_version, previous_versions)

‎docs/source/_static/images/comet-overview.svg‎

Lines changed: 7 additions & 7 deletions
Loading

0 commit comments

Comments
 (0)