Skip to content

Commit 6e3a5e2

Browse files
authored
chore: Start 0.10.0 development (#1958)
1 parent ae7a1ab commit 6e3a5e2

File tree

14 files changed

+60
-61
lines changed

14 files changed

+60
-61
lines changed

common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ under the License.
2626
<parent>
2727
<groupId>org.apache.datafusion</groupId>
2828
<artifactId>comet-parent-spark${spark.version.short}_${scala.binary.version}</artifactId>
29-
<version>0.9.0-SNAPSHOT</version>
29+
<version>0.10.0-SNAPSHOT</version>
3030
<relativePath>../pom.xml</relativePath>
3131
</parent>
3232

dev/diffs/3.4.3.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ index d3544881af1..5cc127f064d 100644
77
<ivy.version>2.5.1</ivy.version>
88
<oro.version>2.0.8</oro.version>
99
+ <spark.version.short>3.4</spark.version.short>
10-
+ <comet.version>0.9.0-SNAPSHOT</comet.version>
10+
+ <comet.version>0.10.0-SNAPSHOT</comet.version>
1111
<!--
1212
If you changes codahale.metrics.version, you also need to change
1313
the link to metrics.dropwizard.io in docs/monitoring.md.

dev/diffs/3.5.6.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ index 68e2c422a24..fb9c2e88fac 100644
77
<ivy.version>2.5.1</ivy.version>
88
<oro.version>2.0.8</oro.version>
99
+ <spark.version.short>3.5</spark.version.short>
10-
+ <comet.version>0.9.0-SNAPSHOT</comet.version>
10+
+ <comet.version>0.10.0-SNAPSHOT</comet.version>
1111
<!--
1212
If you changes codahale.metrics.version, you also need to change
1313
the link to metrics.dropwizard.io in docs/monitoring.md.

dev/diffs/4.0.0.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ index 443d46a4302..3b8483173f1 100644
77
<ivy.version>2.5.3</ivy.version>
88
<oro.version>2.0.8</oro.version>
99
+ <spark.version.short>4.0</spark.version.short>
10-
+ <comet.version>0.9.0-SNAPSHOT</comet.version>
10+
+ <comet.version>0.10.0-SNAPSHOT</comet.version>
1111
<!--
1212
If you change codahale.metrics.version, you also need to change
1313
the link to metrics.dropwizard.io in docs/monitoring.md.

dev/diffs/iceberg/1.8.1.diff

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ index 6eb26e8..c288e72 100644
2020
}
2121

2222
- compileOnly "org.apache.datafusion:comet-spark-spark${sparkMajorVersion}_${scalaVersion}:0.5.0"
23-
+ compileOnly "org.apache.datafusion:comet-spark-spark${sparkMajorVersion}_${scalaVersion}:0.9.0-SNAPSHOT"
23+
+ compileOnly "org.apache.datafusion:comet-spark-spark${sparkMajorVersion}_${scalaVersion}:0.10.0-SNAPSHOT"
2424

2525
implementation libs.parquet.column
2626
implementation libs.parquet.hadoop
@@ -29,7 +29,7 @@ index 6eb26e8..c288e72 100644
2929
testImplementation libs.parquet.hadoop
3030
testImplementation libs.junit.vintage.engine
3131
- testImplementation "org.apache.datafusion:comet-spark-spark${sparkMajorVersion}_${scalaVersion}:0.5.0"
32-
+ testImplementation "org.apache.datafusion:comet-spark-spark${sparkMajorVersion}_${scalaVersion}:0.9.0-SNAPSHOT"
32+
+ testImplementation "org.apache.datafusion:comet-spark-spark${sparkMajorVersion}_${scalaVersion}:0.10.0-SNAPSHOT"
3333

3434
// Required because we remove antlr plugin dependencies from the compile configuration, see note above
3535
runtimeOnly libs.antlr.runtime
@@ -38,7 +38,7 @@ index 6eb26e8..c288e72 100644
3838
integrationImplementation project(path: ":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}", configuration: 'testArtifacts')
3939
integrationImplementation project(path: ":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVersion}", configuration: 'testArtifacts')
4040
+ integrationImplementation project(path: ':iceberg-parquet')
41-
+ integrationImplementation "org.apache.datafusion:comet-spark-spark${sparkMajorVersion}_${scalaVersion}:0.9.0-SNAPSHOT"
41+
+ integrationImplementation "org.apache.datafusion:comet-spark-spark${sparkMajorVersion}_${scalaVersion}:0.10.0-SNAPSHOT"
4242

4343
// runtime dependencies for running Hive Catalog based integration test
4444
integrationRuntimeOnly project(':iceberg-hive-metastore')
@@ -153,15 +153,15 @@ index e2d2c7a..8b5bff8 100644
153153
}
154154

155155
- compileOnly "org.apache.datafusion:comet-spark-spark${sparkMajorVersion}_${scalaVersion}:0.5.0"
156-
+ compileOnly "org.apache.datafusion:comet-spark-spark${sparkMajorVersion}_${scalaVersion}:0.9.0-SNAPSHOT"
156+
+ compileOnly "org.apache.datafusion:comet-spark-spark${sparkMajorVersion}_${scalaVersion}:0.10.0-SNAPSHOT"
157157

158158
implementation libs.parquet.column
159159
implementation libs.parquet.hadoop
160160
@@ -182,8 +182,8 @@ project(":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVer
161161

162162
testImplementation libs.avro.avro
163163
testImplementation libs.parquet.hadoop
164-
+ testImplementation "org.apache.datafusion:comet-spark-spark${sparkMajorVersion}_${scalaVersion}:0.9.0-SNAPSHOT"
164+
+ testImplementation "org.apache.datafusion:comet-spark-spark${sparkMajorVersion}_${scalaVersion}:0.10.0-SNAPSHOT"
165165
testImplementation libs.awaitility
166166
- testImplementation "org.apache.datafusion:comet-spark-spark${sparkMajorVersion}_${scalaVersion}:0.5.0"
167167

@@ -171,7 +171,7 @@ index e2d2c7a..8b5bff8 100644
171171
integrationImplementation project(path: ':iceberg-hive-metastore', configuration: 'testArtifacts')
172172
integrationImplementation project(path: ":iceberg-spark:iceberg-spark-${sparkMajorVersion}_${scalaVersion}", configuration: 'testArtifacts')
173173
integrationImplementation project(path: ":iceberg-spark:iceberg-spark-extensions-${sparkMajorVersion}_${scalaVersion}", configuration: 'testArtifacts')
174-
+ integrationImplementation "org.apache.datafusion:comet-spark-spark${sparkMajorVersion}_${scalaVersion}:0.9.0-SNAPSHOT"
174+
+ integrationImplementation "org.apache.datafusion:comet-spark-spark${sparkMajorVersion}_${scalaVersion}:0.10.0-SNAPSHOT"
175175

176176
// runtime dependencies for running Hive Catalog based integration test
177177
integrationRuntimeOnly project(':iceberg-hive-metastore')

docs/source/contributor-guide/debugging.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ Then build the Comet as [described](https://github.com/apache/arrow-datafusion-c
130130
Start Comet with `RUST_BACKTRACE=1`
131131

132132
```console
133-
RUST_BACKTRACE=1 $SPARK_HOME/spark-shell --jars spark/target/comet-spark-spark3.5_2.12-0.9.0-SNAPSHOT.jar --conf spark.plugins=org.apache.spark.CometPlugin --conf spark.comet.enabled=true --conf spark.comet.exec.enabled=true
133+
RUST_BACKTRACE=1 $SPARK_HOME/spark-shell --jars spark/target/comet-spark-spark3.5_2.12-0.10.0-SNAPSHOT.jar --conf spark.plugins=org.apache.spark.CometPlugin --conf spark.comet.enabled=true --conf spark.comet.exec.enabled=true
134134
```
135135

136136
Get the expanded exception details

docs/source/user-guide/iceberg.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ make release
3939
Set `COMET_JAR` env var:
4040

4141
```shell
42-
export COMET_JAR=`pwd`/spark/target/comet-spark-spark3.5_2.12-0.9.0-SNAPSHOT.jar
42+
export COMET_JAR=`pwd`/spark/target/comet-spark-spark3.5_2.12-0.10.0-SNAPSHOT.jar
4343
```
4444

4545
## Build Iceberg
@@ -52,7 +52,7 @@ git clone [email protected]:apache/iceberg.git
5252

5353
It will be necessary to make some small changes to Iceberg:
5454

55-
- Update Gradle files to change Comet version to `0.9.0-SNAPSHOT`.
55+
- Update Gradle files to change Comet version to `0.10.0-SNAPSHOT`.
5656
- Replace `import org.apache.comet.shaded.arrow.c.CometSchemaImporter;` with `import org.apache.comet.CometSchemaImporter;`
5757
- Modify `SparkBatchQueryScan` so that it implements the `SupportsComet` interface
5858
- Stop shading Parquet by commenting out the following lines in the iceberg-spark build:

docs/source/user-guide/installation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ See the [Comet Kubernetes Guide](kubernetes.md) guide.
8484
Make sure `SPARK_HOME` points to the same Spark version as Comet was built for.
8585

8686
```shell
87-
export COMET_JAR=spark/target/comet-spark-spark3.5_2.12-0.9.0-SNAPSHOT.jar
87+
export COMET_JAR=spark/target/comet-spark-spark3.5_2.12-0.10.0-SNAPSHOT.jar
8888

8989
$SPARK_HOME/bin/spark-shell \
9090
--jars $COMET_JAR \
@@ -140,7 +140,7 @@ explicitly contain Comet otherwise Spark may use a different class-loader for th
140140
components which will then fail at runtime. For example:
141141

142142
```
143-
--driver-class-path spark/target/comet-spark-spark3.5_2.12-0.9.0-SNAPSHOT.jar
143+
--driver-class-path spark/target/comet-spark-spark3.5_2.12-0.10.0-SNAPSHOT.jar
144144
```
145145

146146
Some cluster managers may require additional configuration, see <https://spark.apache.org/docs/latest/cluster-overview.html>

fuzz-testing/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ under the License.
2525
<parent>
2626
<groupId>org.apache.datafusion</groupId>
2727
<artifactId>comet-parent-spark${spark.version.short}_${scala.binary.version}</artifactId>
28-
<version>0.9.0-SNAPSHOT</version>
28+
<version>0.10.0-SNAPSHOT</version>
2929
<relativePath>../pom.xml</relativePath>
3030
</parent>
3131

0 commit comments

Comments
 (0)