Skip to content

Commit 145f4fd

Browse files
authored
Merge pull request #11356 from NVIDIA/merge-branch-24.08-to-main
Merge branch-24.08 into main
2 parents 52b43d6 + 34facb0 commit 145f4fd

File tree

65 files changed

+140
-138
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+140
-138
lines changed

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Change log
2-
Generated on 2024-08-16
2+
Generated on 2024-08-18
33

44
## Release 24.08
55

@@ -88,6 +88,8 @@ Generated on 2024-08-16
8888
### PRs
8989
|||
9090
|:---|:---|
91+
|[#11353](https://github.com/NVIDIA/spark-rapids/pull/11353)|Update download doc for v24.08.1 [skip ci]|
92+
|[#11352](https://github.com/NVIDIA/spark-rapids/pull/11352)|Update version to 24.08.1-SNAPSHOT [skip ci]|
9193
|[#11335](https://github.com/NVIDIA/spark-rapids/pull/11335)|Fix Delta Lake truncation of min/max string values|
9294
|[#11304](https://github.com/NVIDIA/spark-rapids/pull/11304)|Update changelog for v24.08.0 release [skip ci]|
9395
|[#11303](https://github.com/NVIDIA/spark-rapids/pull/11303)|Update rapids JNI and private dependency to 24.08.0|

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,15 +127,15 @@ mvn -pl dist -PnoSnapshots package -DskipTests
127127
Verify that shim-specific classes are hidden from a conventional classloader.
128128

129129
```bash
130-
$ javap -cp dist/target/rapids-4-spark_2.12-24.08.0-cuda11.jar com.nvidia.spark.rapids.shims.SparkShimImpl
130+
$ javap -cp dist/target/rapids-4-spark_2.12-24.08.1-cuda11.jar com.nvidia.spark.rapids.shims.SparkShimImpl
131131
Error: class not found: com.nvidia.spark.rapids.shims.SparkShimImpl
132132
```
133133

134134
However, its bytecode can be loaded if prefixed with `spark3XY` not contained in the package name
135135

136136
```bash
137-
$ javap -cp dist/target/rapids-4-spark_2.12-24.08.0-cuda11.jar spark320.com.nvidia.spark.rapids.shims.SparkShimImpl | head -2
138-
Warning: File dist/target/rapids-4-spark_2.12-24.08.0-cuda11.jar(/spark320/com/nvidia/spark/rapids/shims/SparkShimImpl.class) does not contain class spark320.com.nvidia.spark.rapids.shims.SparkShimImpl
137+
$ javap -cp dist/target/rapids-4-spark_2.12-24.08.1-cuda11.jar spark320.com.nvidia.spark.rapids.shims.SparkShimImpl | head -2
138+
Warning: File dist/target/rapids-4-spark_2.12-24.08.1-cuda11.jar(/spark320/com/nvidia/spark/rapids/shims/SparkShimImpl.class) does not contain class spark320.com.nvidia.spark.rapids.shims.SparkShimImpl
139139
Compiled from "SparkShims.scala"
140140
public final class com.nvidia.spark.rapids.shims.SparkShimImpl {
141141
```
@@ -178,7 +178,7 @@ mvn package -pl dist -am -Dbuildver=340 -DallowConventionalDistJar=true
178178
Verify `com.nvidia.spark.rapids.shims.SparkShimImpl` is conventionally loadable:
179179
180180
```bash
181-
$ javap -cp dist/target/rapids-4-spark_2.12-24.08.0-cuda11.jar com.nvidia.spark.rapids.shims.SparkShimImpl | head -2
181+
$ javap -cp dist/target/rapids-4-spark_2.12-24.08.1-cuda11.jar com.nvidia.spark.rapids.shims.SparkShimImpl | head -2
182182
Compiled from "SparkShims.scala"
183183
public final class com.nvidia.spark.rapids.shims.SparkShimImpl {
184184
```

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ as a `provided` dependency.
7373
<dependency>
7474
<groupId>com.nvidia</groupId>
7575
<artifactId>rapids-4-spark_2.12</artifactId>
76-
<version>24.08.0</version>
76+
<version>24.08.1</version>
7777
<scope>provided</scope>
7878
</dependency>
7979
```

aggregator/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
<parent>
2323
<groupId>com.nvidia</groupId>
2424
<artifactId>rapids-4-spark-jdk-profiles_2.12</artifactId>
25-
<version>24.08.0</version>
25+
<version>24.08.1</version>
2626
<relativePath>../jdk-profiles/pom.xml</relativePath>
2727
</parent>
2828
<artifactId>rapids-4-spark-aggregator_2.12</artifactId>
2929
<name>RAPIDS Accelerator for Apache Spark Aggregator</name>
3030
<description>Creates an aggregated shaded package of the RAPIDS plugin for Apache Spark</description>
31-
<version>24.08.0</version>
31+
<version>24.08.1</version>
3232

3333
<properties>
3434
<rapids.module>aggregator</rapids.module>

api_validation/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
<parent>
2323
<groupId>com.nvidia</groupId>
2424
<artifactId>rapids-4-spark-shim-deps-parent_2.12</artifactId>
25-
<version>24.08.0</version>
25+
<version>24.08.1</version>
2626
<relativePath>../shim-deps/pom.xml</relativePath>
2727
</parent>
2828
<artifactId>rapids-4-spark-api-validation_2.12</artifactId>
29-
<version>24.08.0</version>
29+
<version>24.08.1</version>
3030

3131
<properties>
3232
<rapids.module>api_validation</rapids.module>

datagen/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ Where `$SPARK_VERSION` is a compressed version number, like 330 for Spark 3.3.0.
2424

2525
After this the jar should be at
2626
`target/datagen_2.12-$PLUGIN_VERSION-spark$SPARK_VERSION.jar`
27-
for example a Spark 3.3.0 jar for the 24.08.0 release would be
28-
`target/datagen_2.12-24.08.0-spark330.jar`
27+
for example a Spark 3.3.0 jar for the 24.08.1 release would be
28+
`target/datagen_2.12-24.08.1-spark330.jar`
2929

3030
To get a spark shell with this you can run
3131
```shell
32-
spark-shell --jars target/datagen_2.12-24.08.0-spark330.jar
32+
spark-shell --jars target/datagen_2.12-24.08.1-spark330.jar
3333
```
3434

3535
After that you should be good to go.

datagen/ScaleTest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ $SPARK_HOME/bin/spark-submit \
4444
--conf spark.sql.parquet.datetimeRebaseModeInWrite=CORRECTED \
4545
--class com.nvidia.rapids.tests.scaletest.ScaleTestDataGen \ # the main class
4646
--jars $SPARK_HOME/examples/jars/scopt_2.12-3.7.1.jar \ # one dependency jar just shipped with Spark under $SPARK_HOME
47-
./target/datagen_2.12-24.08.0-spark332.jar \
47+
./target/datagen_2.12-24.08.1-spark332.jar \
4848
1 \
4949
10 \
5050
parquet \

datagen/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
<parent>
2222
<groupId>com.nvidia</groupId>
2323
<artifactId>rapids-4-spark-shim-deps-parent_2.12</artifactId>
24-
<version>24.08.0</version>
24+
<version>24.08.1</version>
2525
<relativePath>../shim-deps/pom.xml</relativePath>
2626
</parent>
2727
<artifactId>datagen_2.12</artifactId>
2828
<name>Data Generator</name>
2929
<description>Tools for generating large amounts of data</description>
30-
<version>24.08.0</version>
30+
<version>24.08.1</version>
3131
<properties>
3232
<rapids.module>datagen</rapids.module>
3333
<target.classifier/>

delta-lake/delta-20x/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
<parent>
2323
<groupId>com.nvidia</groupId>
2424
<artifactId>rapids-4-spark-jdk-profiles_2.12</artifactId>
25-
<version>24.08.0</version>
25+
<version>24.08.1</version>
2626
<relativePath>../../jdk-profiles/pom.xml</relativePath>
2727
</parent>
2828

2929
<artifactId>rapids-4-spark-delta-20x_2.12</artifactId>
3030
<name>RAPIDS Accelerator for Apache Spark Delta Lake 2.0.x Support</name>
3131
<description>Delta Lake 2.0.x support for the RAPIDS Accelerator for Apache Spark</description>
32-
<version>24.08.0</version>
32+
<version>24.08.1</version>
3333

3434
<properties>
3535
<rapids.module>../delta-lake/delta-20x</rapids.module>

delta-lake/delta-21x/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@
2222
<parent>
2323
<groupId>com.nvidia</groupId>
2424
<artifactId>rapids-4-spark-jdk-profiles_2.12</artifactId>
25-
<version>24.08.0</version>
25+
<version>24.08.1</version>
2626
<relativePath>../../jdk-profiles/pom.xml</relativePath>
2727
</parent>
2828

2929
<artifactId>rapids-4-spark-delta-21x_2.12</artifactId>
3030
<name>RAPIDS Accelerator for Apache Spark Delta Lake 2.1.x Support</name>
3131
<description>Delta Lake 2.1.x support for the RAPIDS Accelerator for Apache Spark</description>
32-
<version>24.08.0</version>
32+
<version>24.08.1</version>
3333

3434
<properties>
3535
<rapids.module>../delta-lake/delta-21x</rapids.module>

0 commit comments

Comments
 (0)