Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ under the License.
<parent>
<groupId>org.apache.datafusion</groupId>
<artifactId>comet-parent-spark${spark.version.short}_${scala.binary.version}</artifactId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion dev/diffs/3.4.3.diff
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ index d3544881af1..9c174496a4b 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.10.0-SNAPSHOT</comet.version>
+ <comet.version>0.11.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.
Expand Down
2 changes: 1 addition & 1 deletion dev/diffs/3.5.6.diff
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ index 68e2c422a24..d971894ffe6 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.10.0-SNAPSHOT</comet.version>
+ <comet.version>0.11.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.
Expand Down
2 changes: 1 addition & 1 deletion dev/diffs/4.0.0.diff
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ index 443d46a4302..63ec4784625 100644
<ivy.version>2.5.3</ivy.version>
<oro.version>2.0.8</oro.version>
+ <spark.version.short>4.0</spark.version.short>
+ <comet.version>0.10.0-SNAPSHOT</comet.version>
+ <comet.version>0.11.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.
Expand Down
2 changes: 1 addition & 1 deletion dev/diffs/iceberg/1.8.1.diff
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ index 04ffa8f4edc..cc0099ccc93 100644
awssdk-s3accessgrants = "2.3.0"
caffeine = "2.9.3"
calcite = "1.10.0"
+comet = "0.10.0-SNAPSHOT"
+comet = "0.11.0-SNAPSHOT"
datasketches = "6.2.0"
delta-standalone = "3.3.0"
delta-spark = "3.3.0"
Expand Down
16 changes: 15 additions & 1 deletion docs/generate-versions.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,26 @@
# of Comet

import os
import xml.etree.ElementTree as ET
from pathlib import Path

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

def get_version_from_pom():
pom_path = Path(__file__).parent.parent / "pom.xml"
tree = ET.parse(pom_path)
root = tree.getroot()

namespace = {'maven': 'http://maven.apache.org/POM/4.0.0'}
version_element = root.find('maven:version', namespace)

if version_element is not None:
return version_element.text
else:
raise ValueError("Could not find version in pom.xml")

def replace_in_files(root: str, filename_pattern: str, search: str, replace: str):
root_path = Path(root)
for file in root_path.rglob(filename_pattern):
Expand Down Expand Up @@ -81,7 +95,7 @@ def generate_docs(snapshot_version: str, latest_released_version: str, previous_

if __name__ == "__main__":
print("Generating versioned user guide docs...")
snapshot_version = "0.10.0-SNAPSHOT"
snapshot_version = get_version_from_pom()
latest_released_version = "0.9.1"
previous_versions = ["0.8.0"]
generate_docs(snapshot_version, latest_released_version, previous_versions)
2 changes: 1 addition & 1 deletion docs/source/contributor-guide/debugging.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
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
```

Get the expanded exception details
Expand Down
2 changes: 1 addition & 1 deletion docs/source/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ as a native runtime to achieve improvement in terms of query efficiency and quer
:caption: User Guides:
:hidden:

Comet 0.10.0-SNAPSHOT <user-guide/latest/index>
$COMET_VERSION <user-guide/latest/index>
Comet 0.9.x <user-guide/0.9/index>
Comet 0.8.x <user-guide/0.8/index>

Expand Down
2 changes: 1 addition & 1 deletion fuzz-testing/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ under the License.
<parent>
<groupId>org.apache.datafusion</groupId>
<artifactId>comet-parent-spark${spark.version.short}_${scala.binary.version}</artifactId>
<version>0.10.0-SNAPSHOT</version>
<version>0.11.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
Loading
Loading