This is an automated email from the ASF dual-hosted git repository.
agrove pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion-comet.git
The following commit(s) were added to refs/heads/main by this push:
new f1167980 chore: Update versions to 0.3.0 / 0.3.0-SNAPSHOT (#868)
f1167980 is described below
commit f11679800d2f5461c7b235899ef608584742e8a5
Author: Andy Grove <[email protected]>
AuthorDate: Mon Aug 26 17:24:15 2024 -0600
chore: Update versions to 0.3.0 / 0.3.0-SNAPSHOT (#868)
* Update versions to 0.3.0 / 0.3.0-SNAPSHOT
* update version in Spark diffs
* update more versions
* update version number in documentation
---
.github/actions/setup-spark-builder/action.yaml | 2 +-
.github/workflows/docker-publish.yml | 2 +-
.github/workflows/spark_sql_test.yml | 2 +-
.github/workflows/spark_sql_test_ansi.yml | 2 +-
common/pom.xml | 2 +-
dev/diffs/3.4.3.diff | 2 +-
dev/diffs/3.5.1.diff | 2 +-
dev/diffs/4.0.0-preview1.diff | 2 +-
dev/release/README.md | 3 +-
docs/source/contributor-guide/debugging.md | 2 +-
docs/source/user-guide/installation.md | 4 +-
fuzz-testing/pom.xml | 2 +-
native/Cargo.lock | 89 +++++++++++++++----------
native/Cargo.toml | 6 +-
pom.xml | 2 +-
spark-integration/pom.xml | 2 +-
spark/pom.xml | 2 +-
17 files changed, 72 insertions(+), 56 deletions(-)
diff --git a/.github/actions/setup-spark-builder/action.yaml
b/.github/actions/setup-spark-builder/action.yaml
index 8ea6a7d9..ae3d3146 100644
--- a/.github/actions/setup-spark-builder/action.yaml
+++ b/.github/actions/setup-spark-builder/action.yaml
@@ -29,7 +29,7 @@ inputs:
comet-version:
description: 'The Comet version to use for Spark'
required: true
- default: '0.2.0-SNAPSHOT'
+ default: '0.3.0-SNAPSHOT'
runs:
using: "composite"
steps:
diff --git a/.github/workflows/docker-publish.yml
b/.github/workflows/docker-publish.yml
index 1c0280a7..0fc86d33 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -44,7 +44,7 @@ jobs:
- name: Extract Comet version
id: extract_version
run: |
- # use the tag that triggered this workflow as the Comet version e.g.
0.2.0-rc1
+ # use the tag that triggered this workflow as the Comet version e.g.
0.3.0-rc1
echo "COMET_VERSION=${GITHUB_REF##*/}" >> $GITHUB_ENV
- name: Echo Comet version
run: echo "The current Comet version is ${{ env.COMET_VERSION }}"
diff --git a/.github/workflows/spark_sql_test.yml
b/.github/workflows/spark_sql_test.yml
index a6c4e229..0d2cec01 100644
--- a/.github/workflows/spark_sql_test.yml
+++ b/.github/workflows/spark_sql_test.yml
@@ -71,7 +71,7 @@ jobs:
with:
spark-version: ${{ matrix.spark-version.full }}
spark-short-version: ${{ matrix.spark-version.short }}
- comet-version: '0.2.0-SNAPSHOT' # TODO: get this from pom.xml
+ comet-version: '0.3.0-SNAPSHOT' # TODO: get this from pom.xml
- name: Run Spark tests
run: |
cd apache-spark
diff --git a/.github/workflows/spark_sql_test_ansi.yml
b/.github/workflows/spark_sql_test_ansi.yml
index 5be70de4..37212222 100644
--- a/.github/workflows/spark_sql_test_ansi.yml
+++ b/.github/workflows/spark_sql_test_ansi.yml
@@ -69,7 +69,7 @@ jobs:
with:
spark-version: ${{ matrix.spark-version.full }}
spark-short-version: ${{ matrix.spark-version.short }}
- comet-version: '0.2.0-SNAPSHOT' # TODO: get this from pom.xml
+ comet-version: '0.3.0-SNAPSHOT' # TODO: get this from pom.xml
- name: Run Spark tests
run: |
cd apache-spark
diff --git a/common/pom.xml b/common/pom.xml
index 37eac9c9..80814581 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.comet</groupId>
<artifactId>comet-parent-spark${spark.version.short}_${scala.binary.version}</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <version>0.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/dev/diffs/3.4.3.diff b/dev/diffs/3.4.3.diff
index 45a8bc41..bbf18e64 100644
--- a/dev/diffs/3.4.3.diff
+++ b/dev/diffs/3.4.3.diff
@@ -7,7 +7,7 @@ index d3544881af1..47382e29b5a 100644
<ivy.version>2.5.1</ivy.version>
<oro.version>2.0.8</oro.version>
+ <spark.version.short>3.4</spark.version.short>
-+ <comet.version>0.1.0-SNAPSHOT</comet.version>
++ <comet.version>0.3.0-SNAPSHOT</comet.version>
<!--
If you changes codahale.metrics.version, you also need to change
the link to metrics.dropwizard.io in docs/monitoring.md.
diff --git a/dev/diffs/3.5.1.diff b/dev/diffs/3.5.1.diff
index f65c943e..9b7d5e52 100644
--- a/dev/diffs/3.5.1.diff
+++ b/dev/diffs/3.5.1.diff
@@ -7,7 +7,7 @@ index 0f504dbee85..71fd49a3744 100644
<ivy.version>2.5.1</ivy.version>
<oro.version>2.0.8</oro.version>
+ <spark.version.short>3.5</spark.version.short>
-+ <comet.version>0.1.0-SNAPSHOT</comet.version>
++ <comet.version>0.3.0-SNAPSHOT</comet.version>
<!--
If you changes codahale.metrics.version, you also need to change
the link to metrics.dropwizard.io in docs/monitoring.md.
diff --git a/dev/diffs/4.0.0-preview1.diff b/dev/diffs/4.0.0-preview1.diff
index 42e8b8b1..a5da6797 100644
--- a/dev/diffs/4.0.0-preview1.diff
+++ b/dev/diffs/4.0.0-preview1.diff
@@ -7,7 +7,7 @@ index a4b1b2c3c9f..a2315d2a95b 100644
<ivy.version>2.5.2</ivy.version>
<oro.version>2.0.8</oro.version>
+ <spark.version.short>4.0</spark.version.short>
-+ <comet.version>0.1.0-SNAPSHOT</comet.version>
++ <comet.version>0.3.0-SNAPSHOT</comet.version>
<!--
If you change codahale.metrics.version, you also need to change
the link to metrics.dropwizard.io in docs/monitoring.md.
diff --git a/dev/release/README.md b/dev/release/README.md
index 83ba3f14..62291b51 100644
--- a/dev/release/README.md
+++ b/dev/release/README.md
@@ -49,11 +49,12 @@ git checkout -b branch-0.1
git push apache branch-0.1
```
-Create and merge a PR against the release branch to update the Maven version
from `0.1.0-SNAPSHOT` to `0.1.0`
+Create and merge a PR against the release branch to update the Maven version
from `0.3.0-SNAPSHOT` to `0.1.0`
### Update Version in main
Create a PR against the main branch to update the Rust crate version to
`0.2.0` and the Maven version to `0.2.0-SNAPSHOT`.
+The Spark diffs also need updating.
### Generate the Change Log
diff --git a/docs/source/contributor-guide/debugging.md
b/docs/source/contributor-guide/debugging.md
index 0b9c6aa4..2694802d 100644
--- a/docs/source/contributor-guide/debugging.md
+++ b/docs/source/contributor-guide/debugging.md
@@ -130,7 +130,7 @@ Then build the Comet as
[described](https://github.com/apache/arrow-datafusion-c
Start Comet with `RUST_BACKTRACE=1`
```console
-RUST_BACKTRACE=1 $SPARK_HOME/spark-shell --jars
spark/target/comet-spark-spark3.4_2.12-0.1.0-SNAPSHOT.jar --conf
spark.plugins=org.apache.spark.CometPlugin --conf spark.comet.enabled=true
--conf spark.comet.exec.enabled=true
+RUST_BACKTRACE=1 $SPARK_HOME/spark-shell --jars
spark/target/comet-spark-spark3.4_2.12-0.3.0-SNAPSHOT.jar --conf
spark.plugins=org.apache.spark.CometPlugin --conf spark.comet.enabled=true
--conf spark.comet.exec.enabled=true
```
Get the expanded exception details
diff --git a/docs/source/user-guide/installation.md
b/docs/source/user-guide/installation.md
index c5ca9140..c095c213 100644
--- a/docs/source/user-guide/installation.md
+++ b/docs/source/user-guide/installation.md
@@ -79,7 +79,7 @@ make release-nogit PROFILES="-Pspark-3.4"
Make sure `SPARK_HOME` points to the same Spark version as Comet was built for.
```console
-export COMET_JAR=spark/target/comet-spark-spark3.4_2.12-0.2.0-SNAPSHOT.jar
+export COMET_JAR=spark/target/comet-spark-spark3.4_2.12-0.3.0-SNAPSHOT.jar
$SPARK_HOME/bin/spark-shell \
--jars $COMET_JAR \
@@ -147,7 +147,7 @@ explicitly contain Comet otherwise Spark may use a
different class-loader for th
components which will then fail at runtime. For example:
```
---driver-class-path spark/target/comet-spark-spark3.4_2.12-0.2.0-SNAPSHOT.jar
+--driver-class-path spark/target/comet-spark-spark3.4_2.12-0.3.0-SNAPSHOT.jar
```
Some cluster managers may require additional configuration, see
<https://spark.apache.org/docs/latest/cluster-overview.html>
diff --git a/fuzz-testing/pom.xml b/fuzz-testing/pom.xml
index a413ae2e..38c83ddc 100644
--- a/fuzz-testing/pom.xml
+++ b/fuzz-testing/pom.xml
@@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.comet</groupId>
<artifactId>comet-parent-spark${spark.version.short}_${scala.binary.version}</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <version>0.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/native/Cargo.lock b/native/Cargo.lock
index b97740ee..19a2048d 100644
--- a/native/Cargo.lock
+++ b/native/Cargo.lock
@@ -17,6 +17,12 @@ version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index";
checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
[[package]]
name = "ahash"
version = "0.8.11"
@@ -346,7 +352,7 @@ checksum =
"6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.76",
]
[[package]]
@@ -374,7 +380,7 @@ dependencies = [
"cc",
"cfg-if",
"libc",
- "miniz_oxide",
+ "miniz_oxide 0.7.4",
"object",
"rustc-demangle",
]
@@ -408,9 +414,9 @@ dependencies = [
[[package]]
name = "blake3"
-version = "1.5.3"
+version = "1.5.4"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e9ec96fe9a81b5e365f9db71fe00edc4fe4ca2cc7dcb7861f0603012a7caa210"
+checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7"
dependencies = [
"arrayref",
"arrayvec",
@@ -481,9 +487,9 @@ checksum =
"37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
[[package]]
name = "cc"
-version = "1.1.13"
+version = "1.1.14"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "72db2f7947ecee9b03b510377e8bb9077afa27176fdbff55c51027e976fdcc48"
+checksum = "50d2eb3cd3d1bf4529e31c215ee6f93ec5a3d536d9f578f93d9d33ee19562932"
dependencies = [
"jobserver",
"libc",
@@ -866,7 +872,7 @@ dependencies = [
[[package]]
name = "datafusion-comet"
-version = "0.2.0"
+version = "0.3.0"
dependencies = [
"ahash",
"arrow",
@@ -919,7 +925,7 @@ dependencies = [
[[package]]
name = "datafusion-comet-proto"
-version = "0.2.0"
+version = "0.3.0"
dependencies = [
"prost 0.12.6",
"prost-build",
@@ -927,7 +933,7 @@ dependencies = [
[[package]]
name = "datafusion-comet-spark-expr"
-version = "0.2.0"
+version = "0.3.0"
dependencies = [
"arrow",
"arrow-array",
@@ -1280,9 +1286,9 @@ dependencies = [
[[package]]
name = "fastrand"
-version = "2.1.0"
+version = "2.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
[[package]]
name = "findshlibs"
@@ -1314,12 +1320,12 @@ dependencies = [
[[package]]
name = "flate2"
-version = "1.0.31"
+version = "1.0.33"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "7f211bbe8e69bbd0cfdea405084f128ae8b4aaa6b0b522fc8f2b009084797920"
+checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
dependencies = [
"crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.8.0",
]
[[package]]
@@ -1393,7 +1399,7 @@ checksum =
"87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.76",
]
[[package]]
@@ -1790,9 +1796,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.157"
+version = "0.2.158"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "374af5f94e54fa97cf75e945cce8a6b201e88a1a07e688b47dfd2a59c66dbd86"
+checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439"
[[package]]
name = "libloading"
@@ -1951,6 +1957,15 @@ dependencies = [
"adler",
]
+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
+]
+
[[package]]
name = "multimap"
version = "0.8.3"
@@ -2371,7 +2386,7 @@ dependencies = [
"itertools 0.12.1",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.76",
]
[[package]]
@@ -2395,9 +2410,9 @@ dependencies = [
[[package]]
name = "quote"
-version = "1.0.36"
+version = "1.0.37"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
dependencies = [
"proc-macro2",
]
@@ -2568,9 +2583,9 @@ checksum =
"a3f0bf26fd526d2a95683cd0f87bf103b8539e2ca1ef48ce002d67aad59aa0b4"
[[package]]
name = "serde"
-version = "1.0.208"
+version = "1.0.209"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "cff085d2cb684faa248efb494c39b68e522822ac0de72ccf08109abde717cfb2"
+checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
dependencies = [
"serde_derive",
]
@@ -2587,20 +2602,20 @@ dependencies = [
[[package]]
name = "serde_derive"
-version = "1.0.208"
+version = "1.0.209"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "24008e81ff7613ed8e5ba0cfaf24e2c2f1e5b8a0495711e44fcd4882fca62bcf"
+checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.76",
]
[[package]]
name = "serde_json"
-version = "1.0.125"
+version = "1.0.127"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "83c8e735a073ccf5be70aa8066aa984eaf2fa000db6c8d0100ae605b366d31ed"
+checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
dependencies = [
"itoa",
"memchr",
@@ -2711,7 +2726,7 @@ checksum =
"01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.76",
]
[[package]]
@@ -2751,7 +2766,7 @@ dependencies = [
"proc-macro2",
"quote",
"rustversion",
- "syn 2.0.75",
+ "syn 2.0.76",
]
[[package]]
@@ -2796,9 +2811,9 @@ dependencies = [
[[package]]
name = "syn"
-version = "2.0.75"
+version = "2.0.76"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f6af063034fc1935ede7be0122941bafa9bacb949334d090b77ca98b5817c7d9"
+checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
dependencies = [
"proc-macro2",
"quote",
@@ -2835,7 +2850,7 @@ checksum =
"a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.76",
]
[[package]]
@@ -2913,7 +2928,7 @@ checksum =
"693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.76",
]
[[package]]
@@ -2935,7 +2950,7 @@ checksum =
"34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.76",
]
[[package]]
@@ -3085,7 +3100,7 @@ dependencies = [
"once_cell",
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.76",
"wasm-bindgen-shared",
]
@@ -3107,7 +3122,7 @@ checksum =
"afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.76",
"wasm-bindgen-backend",
"wasm-bindgen-shared",
]
@@ -3346,7 +3361,7 @@ checksum =
"fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
- "syn 2.0.75",
+ "syn 2.0.76",
]
[[package]]
diff --git a/native/Cargo.toml b/native/Cargo.toml
index 2e73c544..ca2c4a8b 100644
--- a/native/Cargo.toml
+++ b/native/Cargo.toml
@@ -20,7 +20,7 @@ members = ["core", "spark-expr", "proto"]
resolver = "2"
[workspace.package]
-version = "0.2.0"
+version = "0.3.0"
homepage = "https://datafusion.apache.org/comet";
repository = "https://github.com/apache/datafusion-comet";
authors = ["Apache DataFusion <[email protected]>"]
@@ -48,8 +48,8 @@ datafusion-execution = { version = "41.0.0", default-features
= false }
datafusion-physical-plan = { version = "41.0.0", default-features = false }
datafusion-physical-expr-common = { version = "41.0.0", default-features =
false }
datafusion-physical-expr = { version = "41.0.0", default-features = false }
-datafusion-comet-spark-expr = { path = "spark-expr", version = "0.2.0" }
-datafusion-comet-proto = { path = "proto", version = "0.2.0" }
+datafusion-comet-spark-expr = { path = "spark-expr", version = "0.3.0" }
+datafusion-comet-proto = { path = "proto", version = "0.3.0" }
chrono = { version = "0.4", default-features = false, features = ["clock"] }
chrono-tz = { version = "0.8" }
num = "0.4"
diff --git a/pom.xml b/pom.xml
index d41a57db..57cd398a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@ under the License.
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.comet</groupId>
<artifactId>comet-parent-spark${spark.version.short}_${scala.binary.version}</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <version>0.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Comet Project Parent POM</name>
diff --git a/spark-integration/pom.xml b/spark-integration/pom.xml
index 20f4ee00..83d94d87 100644
--- a/spark-integration/pom.xml
+++ b/spark-integration/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.comet</groupId>
<artifactId>comet-parent-spark${spark.version.short}_${scala.binary.version}</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <version>0.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
diff --git a/spark/pom.xml b/spark/pom.xml
index e3ed6b2e..ac84a49d 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.comet</groupId>
<artifactId>comet-parent-spark${spark.version.short}_${scala.binary.version}</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <version>0.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
