Skip to content

Commit 6d5d5e4

Browse files
authored
chore: Start 0.11.0 development (#2365)
* Start 0.11.0 development * resolve snapshot version in docs from pom.xml * remove hard-coded snapshot versions * cargo update
1 parent b08f84a commit 6d5d5e4

File tree

14 files changed

+187
-200
lines changed

14 files changed

+187
-200
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.10.0-SNAPSHOT</version>
29+
<version>0.11.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..9c174496a4b 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.10.0-SNAPSHOT</comet.version>
10+
+ <comet.version>0.11.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..d971894ffe6 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.10.0-SNAPSHOT</comet.version>
10+
+ <comet.version>0.11.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..63ec4784625 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.10.0-SNAPSHOT</comet.version>
10+
+ <comet.version>0.11.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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ index 04ffa8f4edc..cc0099ccc93 100644
2424
awssdk-s3accessgrants = "2.3.0"
2525
caffeine = "2.9.3"
2626
calcite = "1.10.0"
27-
+comet = "0.10.0-SNAPSHOT"
27+
+comet = "0.11.0-SNAPSHOT"
2828
datasketches = "6.2.0"
2929
delta-standalone = "3.3.0"
3030
delta-spark = "3.3.0"

docs/generate-versions.py

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,26 @@
2323
# of Comet
2424

2525
import os
26+
import xml.etree.ElementTree as ET
2627
from pathlib import Path
2728

2829
def get_major_minor_version(version: str):
2930
parts = version.split('.')
3031
return f"{parts[0]}.{parts[1]}"
3132

33+
def get_version_from_pom():
34+
pom_path = Path(__file__).parent.parent / "pom.xml"
35+
tree = ET.parse(pom_path)
36+
root = tree.getroot()
37+
38+
namespace = {'maven': 'http://maven.apache.org/POM/4.0.0'}
39+
version_element = root.find('maven:version', namespace)
40+
41+
if version_element is not None:
42+
return version_element.text
43+
else:
44+
raise ValueError("Could not find version in pom.xml")
45+
3246
def replace_in_files(root: str, filename_pattern: str, search: str, replace: str):
3347
root_path = Path(root)
3448
for file in root_path.rglob(filename_pattern):
@@ -81,7 +95,7 @@ def generate_docs(snapshot_version: str, latest_released_version: str, previous_
8195

8296
if __name__ == "__main__":
8397
print("Generating versioned user guide docs...")
84-
snapshot_version = "0.10.0-SNAPSHOT"
98+
snapshot_version = get_version_from_pom()
8599
latest_released_version = "0.9.1"
86100
previous_versions = ["0.8.0"]
87101
generate_docs(snapshot_version, latest_released_version, previous_versions)

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.10.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-$COMET_VERSION.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/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ as a native runtime to achieve improvement in terms of query efficiency and quer
4949
:caption: User Guides:
5050
:hidden:
5151

52-
Comet 0.10.0-SNAPSHOT <user-guide/latest/index>
52+
$COMET_VERSION <user-guide/latest/index>
5353
Comet 0.9.x <user-guide/0.9/index>
5454
Comet 0.8.x <user-guide/0.8/index>
5555

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.10.0-SNAPSHOT</version>
28+
<version>0.11.0-SNAPSHOT</version>
2929
<relativePath>../pom.xml</relativePath>
3030
</parent>
3131

0 commit comments

Comments
 (0)