Skip to content

Commit 180faac

Browse files
authored
Merge pull request #10125 from NvTimLiu/release-tmp
Merge branch 'branch-23.12' into main [skip ci]
2 parents 02cf1a0 + 9856aeb commit 180faac

File tree

63 files changed

+139
-134
lines changed

Some content is hidden

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

63 files changed

+139
-134
lines changed

CHANGELOG.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Change log
2-
Generated on 2023-12-12
2+
Generated on 2023-12-29
33

44
## Release 23.12
55

@@ -118,6 +118,11 @@ Generated on 2023-12-12
118118
### PRs
119119
|||
120120
|:---|:---|
121+
|[#10123](https://github.com/NVIDIA/spark-rapids/pull/10123)|Change version to v23.12.1 [skip ci]|
122+
|[#10122](https://github.com/NVIDIA/spark-rapids/pull/10122)|Init changelog for v23.12.1 [skip ci]|
123+
|[#10121](https://github.com/NVIDIA/spark-rapids/pull/10121)|[DOC] update download page for db hot fix [skip ci]|
124+
|[#10116](https://github.com/NVIDIA/spark-rapids/pull/10116)|Upgrade to 23.12.1|
125+
|[#9935](https://github.com/NVIDIA/spark-rapids/pull/9935)|Init 23.12 changelog [skip ci]|
121126
|[#9943](https://github.com/NVIDIA/spark-rapids/pull/9943)|[DOC] Update docs for 23.12.0 release [skip ci]|
122127
|[#10014](https://github.com/NVIDIA/spark-rapids/pull/10014)|Add documentation for how to run tests with a fixed datagen seed [skip ci]|
123128
|[#9954](https://github.com/NVIDIA/spark-rapids/pull/9954)|Update private and JNI version to released 23.12.0|

CONTRIBUTING.md

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

132132
```bash
133-
$ javap -cp dist/target/rapids-4-spark_2.12-23.12.0-SNAPSHOT-cuda11.jar com.nvidia.spark.rapids.shims.SparkShimImpl
133+
$ javap -cp dist/target/rapids-4-spark_2.12-23.12.1-cuda11.jar com.nvidia.spark.rapids.shims.SparkShimImpl
134134
Error: class not found: com.nvidia.spark.rapids.shims.SparkShimImpl
135135
```
136136

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

139139
```bash
140-
$ javap -cp dist/target/rapids-4-spark_2.12-23.12.0-SNAPSHOT-cuda11.jar spark320.com.nvidia.spark.rapids.shims.SparkShimImpl | head -2
141-
Warning: File dist/target/rapids-4-spark_2.12-23.12.0-SNAPSHOT-cuda11.jar(/spark320/com/nvidia/spark/rapids/shims/SparkShimImpl.class) does not contain class spark320.com.nvidia.spark.rapids.shims.SparkShimImpl
140+
$ javap -cp dist/target/rapids-4-spark_2.12-23.12.1-cuda11.jar spark320.com.nvidia.spark.rapids.shims.SparkShimImpl | head -2
141+
Warning: File dist/target/rapids-4-spark_2.12-23.12.1-cuda11.jar(/spark320/com/nvidia/spark/rapids/shims/SparkShimImpl.class) does not contain class spark320.com.nvidia.spark.rapids.shims.SparkShimImpl
142142
Compiled from "SparkShims.scala"
143143
public final class com.nvidia.spark.rapids.shims.SparkShimImpl {
144144
```
@@ -181,7 +181,7 @@ mvn package -pl dist -am -Dbuildver=340 -DallowConventionalDistJar=true
181181
Verify `com.nvidia.spark.rapids.shims.SparkShimImpl` is conventionally loadable:
182182
183183
```bash
184-
$ javap -cp dist/target/rapids-4-spark_2.12-23.12.0-SNAPSHOT-cuda11.jar com.nvidia.spark.rapids.shims.SparkShimImpl | head -2
184+
$ javap -cp dist/target/rapids-4-spark_2.12-23.12.1-cuda11.jar com.nvidia.spark.rapids.shims.SparkShimImpl | head -2
185185
Compiled from "SparkShims.scala"
186186
public final class com.nvidia.spark.rapids.shims.SparkShimImpl {
187187
```

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>23.12.0</version>
76+
<version>23.12.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>23.12.0</version>
25+
<version>23.12.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>23.12.0</version>
31+
<version>23.12.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>23.12.0</version>
25+
<version>23.12.1</version>
2626
<relativePath>../shim-deps/pom.xml</relativePath>
2727
</parent>
2828
<artifactId>rapids-4-spark-api-validation_2.12</artifactId>
29-
<version>23.12.0</version>
29+
<version>23.12.1</version>
3030

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

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-23.12.0-spark332.jar \
47+
./target/datagen_2.12-23.12.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>23.12.0</version>
24+
<version>23.12.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>23.12.0</version>
30+
<version>23.12.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>23.12.0</version>
25+
<version>23.12.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>23.12.0</version>
32+
<version>23.12.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>23.12.0</version>
25+
<version>23.12.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>23.12.0</version>
32+
<version>23.12.1</version>
3333

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

delta-lake/delta-22x/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>23.12.0</version>
25+
<version>23.12.1</version>
2626
<relativePath>../../jdk-profiles/pom.xml</relativePath>
2727
</parent>
2828

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

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

0 commit comments

Comments
 (0)