From f6525c1c153f8ceebd3cb329c715593e6fdf9039 Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Fri, 23 Oct 2026 12:02:36 +0100 Subject: [PATCH 1/4] docs: list contrib/delta-spark/pom.xml in the release version bump --- docs/source/contributor-guide/release_process.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/source/contributor-guide/release_process.md b/docs/source/contributor-guide/release_process.md index c4e23606fee..cac242fddd9 100644 --- a/docs/source/contributor-guide/release_process.md +++ b/docs/source/contributor-guide/release_process.md @@ -174,7 +174,8 @@ targeting the release branch. Open a PR targeting the release branch that changes the Maven version from `0.13.0-SNAPSHOT` to `0.13.0` in: -- the `pom.xml` files: `pom.xml`, `common/pom.xml`, `spark/pom.xml`, and `spark-integration/pom.xml` +- the `pom.xml` files: `pom.xml`, `common/pom.xml`, `spark/pom.xml`, `spark-integration/pom.xml`, and + `contrib/delta-spark/pom.xml` - the `` property in the Spark test diffs under `dev/diffs` - the `comet` version in the Iceberg test diffs under `dev/diffs/iceberg`, which use a Gradle version catalog entry (`comet = "0.13.0"`) rather than a Maven property @@ -187,7 +188,8 @@ Once the version is bumped, verify that no references to the old version remain: git grep -n '0.13.0-SNAPSHOT' -- . ':!docs/source/changelog' ``` -Any hit outside the change log is a place that will break on the release branch. Note that dropping the +Any hit outside the change log is a place that will break on the release branch. This also catches a module +added since the last release that the list above doesn't name yet. Note that dropping the `-SNAPSHOT` qualifier changes the built artifact file names, so anything that locates the jar by glob must match a bare version too. Prefer patterns such as `comet-spark-spark3.5_2.12-*.jar` over `comet-spark-spark3.5_2.12-*-SNAPSHOT.jar`, and prefer resolving the jar by glob over hardcoding a version. From c4e93880bdf33eff78bdc95e44d4d61d02bac055 Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Fri, 23 Oct 2026 12:20:19 +0100 Subject: [PATCH 2/4] docs: add a dependency refresh step to the release process --- .../contributor-guide/release_process.md | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/docs/source/contributor-guide/release_process.md b/docs/source/contributor-guide/release_process.md index cac242fddd9..9bb81c3c461 100644 --- a/docs/source/contributor-guide/release_process.md +++ b/docs/source/contributor-guide/release_process.md @@ -54,6 +54,7 @@ instructions on each step. - [ ] Generate release documentation - [ ] Update Maven version in release branch - [ ] Update version in main for next development cycle + - [ ] Refresh the native dependencies in main - [ ] Find and fix regressions: - [ ] Review expression support status and the user guide - [ ] Benchmark against the previous release @@ -208,6 +209,30 @@ Create a PR against the main branch to prepare for developing the next release: - Update the Maven version to `0.14.0-SNAPSHOT` in the same set of files listed above (the `pom.xml` files, the Spark test diffs under `dev/diffs`, and the Iceberg test diffs under `dev/diffs/iceberg`). +### Refresh Dependencies in main + +Once the version bump has merged, refresh the native dependencies in a separate PR against the main branch. Doing +it at the start of the cycle gives the new versions the full cycle of nightly and merge queue runs before the next +release branch is cut. The release branch keeps the lockfile it was cut with, so it ships the dependency set that CI +has been testing. Keep this PR apart from the version bump so that a regression is easy to bisect and revert. + +Run `cargo update` in `native/` and in each contrib crate that has its own `Cargo.lock`, then check the build: + +```shell +cd native && cargo update && cargo check --all-targets --locked +cd ../contrib/delta/native && cargo update && cargo check --all-targets --locked +``` + +Dependabot already opens weekly PRs for `native/`, but it ignores major `arrow*`, `parquet` and `datafusion*` bumps, +which are handled manually, and it does not cover the contrib crates or transitive dependencies that `cargo update` +moves within their semver range. It also does not move git-pinned dependencies such as `iceberg-rust`, whose `rev` in +`native/Cargo.toml` needs a deliberate bump. + +List what moved in the PR description (`git diff` of `Cargo.lock` shows the version changes). A dependency refresh +can change the build on every platform and what the Spark and Iceberg suites exercise, so apply the labels that opt +the PR into the suites its tier skips, such as `run-all-spark-profiles`, `run-iceberg-tests` and `run-delta-tests`. +See [Opting a pull request into a suite the PR tier skips](ci.md#opting-a-pull-request-into-a-suite-the-pr-tier-skips). + ## Finding and Fixing Regressions Once the release branch is cut, spend about a week auditing it for regressions, then one to two weeks getting the From 0288acdd20b99a6ce5ad68610b530923ec416226 Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Wed, 11 Nov 2026 14:45:11 -0700 Subject: [PATCH 3/4] docs: say the dependency refresh leaves the major arrow, parquet, datafusion and git-pinned bumps alone --- docs/source/contributor-guide/release_process.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/source/contributor-guide/release_process.md b/docs/source/contributor-guide/release_process.md index fb5907fb384..f0b3cd3ad54 100644 --- a/docs/source/contributor-guide/release_process.md +++ b/docs/source/contributor-guide/release_process.md @@ -226,10 +226,10 @@ cd native && cargo update && cargo check --all-targets --locked cd ../contrib/delta/native && cargo update && cargo check --all-targets --locked ``` -Dependabot already opens weekly PRs for `native/`, but it ignores major `arrow*`, `parquet` and `datafusion*` bumps, -which are handled manually, and it does not cover the contrib crates or transitive dependencies that `cargo update` -moves within their semver range. It also does not move git-pinned dependencies such as `iceberg-rust`, whose `rev` in -`native/Cargo.toml` needs a deliberate bump. +Dependabot already opens weekly PRs for `native/`, but it does not cover the contrib crates or the transitive +dependencies that `cargo update` moves within their semver range. This refresh does not bump the major versions of +`arrow*`, `parquet` and `datafusion*`, or git-pinned dependencies such as `iceberg-rust`, whose `rev` is in +`native/Cargo.toml`. Those are upgrades that are planned and tested on their own, so leave them as they are. List what moved in the PR description (`git diff` of `Cargo.lock` shows the version changes). A dependency refresh can change the build on every platform and what the Spark and Iceberg suites exercise, so apply the labels that opt From 420f70e3d141130861cf92ef280bb6ef1fdc2c46 Mon Sep 17 00:00:00 2001 From: Andy Grove Date: Tue, 17 Nov 2026 08:46:23 -0700 Subject: [PATCH 4/4] docs: include native/native-executors in the dependency refresh step --- docs/source/contributor-guide/release_process.md | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/docs/source/contributor-guide/release_process.md b/docs/source/contributor-guide/release_process.md index 8b538455a30..d0d7e7eb3bd 100644 --- a/docs/source/contributor-guide/release_process.md +++ b/docs/source/contributor-guide/release_process.md @@ -219,15 +219,18 @@ it at the start of the cycle gives the new versions the full cycle of nightly an release branch is cut. The release branch keeps the lockfile it was cut with, so it ships the dependency set that CI has been testing. Keep this PR apart from the version bump so that a regression is easy to bisect and revert. -Run `cargo update` in `native/` and in each contrib crate that has its own `Cargo.lock`, then check the build: +Run `cargo update` in `native/`, in `native/native-executors/` and in each contrib crate that has its own +`Cargo.lock`, then check the build. `native/native-executors/` builds the `native/` crates by path but keeps its own +lockfile, so refreshing `native/` alone leaves it on the old transitive versions. ```shell cd native && cargo update && cargo check --all-targets --locked -cd ../contrib/delta/native && cargo update && cargo check --all-targets --locked +cd native-executors && cargo update && cargo check --all-targets --locked +cd ../../contrib/delta/native && cargo update && cargo check --all-targets --locked ``` -Dependabot already opens weekly PRs for `native/`, but it does not cover the contrib crates or the transitive -dependencies that `cargo update` moves within their semver range. This refresh does not bump the major versions of +Dependabot already opens weekly PRs for `native/` and `native/native-executors/`, but it does not cover the contrib +crates or the transitive dependencies that `cargo update` moves within their semver range. This refresh does not bump the major versions of `arrow*`, `parquet` and `datafusion*`, or git-pinned dependencies such as `iceberg-rust`, whose `rev` is in `native/Cargo.toml`. Those are upgrades that are planned and tested on their own, so leave them as they are.