Skip to content

Commit

Permalink
Fix auto merge conflict 10523 (#10528)
Browse files Browse the repository at this point in the history
* Update rapids jni and private dependency version to 24.02.1 (#10511)

Signed-off-by: Tim Liu <timl@nvidia.com>

* Add missed shims for scala2.13 (#10465)

* Add missed shims for scala2.13

Signed-off-by: Tim Liu <timl@nvidia.com>

* Add 351 snapshot shim for the scala2.13 version of plugin jar

Signed-off-by: Tim Liu <timl@nvidia.com>

* Remove 351 snapshot shim as spark 3.5.1 has been released

Signed-off-by: Tim Liu <timl@nvidia.com>

* Remove scala2.13 351 snapshot shim

Signed-off-by: Tim Liu <timl@nvidia.com>

* Remove 351 shim's jason string

Ran `mvn generate-sources -Dshimplify=true -Dshimplify.move=true -Dshimplify.remove.shim=351`

to remove 351 shim's jason string, and fix some unnecessary empty lines that were introduced

Signed-off-by: Tim Liu <timl@nvidia.com>

* Update Copyright 2024

Auto copyright by below scripts
```
export SPARK_RAPIDS_AUTO_COPYRIGHTER=ON

./scripts/auto-copyrighter.sh $(git diff --name-only origin/branch-24.04..HEAD)
```

Signed-off-by: Tim Liu <timl@nvidia.com>

* Revert "Update Copyright 2024"

This reverts commit 8482847.

* Revert "Remove 351 shim's jason string"

This reverts commit 78d1f00.

* skip 351 from strict checking

* Alien scala2.13/pom.xml to scala2.12 one

Run the script `bash build/make-scala-version-build-files.sh 2.13`

Signed-off-by: Tim Liu <timl@nvidia.com>

* pretend 351 is a snapshot in 24.02

Signed-off-by: Gera Shegalov <gera@apache.org>

* pretend 351 is a SNAPSHOT version

* Revert change of build/shimplify.py

Signed-off-by: Tim Liu <timl@nvidia.com>

---------

Signed-off-by: Tim Liu <timl@nvidia.com>
Signed-off-by: Gera Shegalov <gera@apache.org>
Co-authored-by: Raza Jafri <rjafri@nvidia.com>
Co-authored-by: Gera Shegalov <gera@apache.org>

* Update changelog for v24.02.0 release (#10525)

Signed-off-by: Tim Liu <timl@nvidia.com>

---------

Signed-off-by: Tim Liu <timl@nvidia.com>
Signed-off-by: Gera Shegalov <gera@apache.org>
Co-authored-by: Raza Jafri <rjafri@nvidia.com>
Co-authored-by: Gera Shegalov <gera@apache.org>
  • Loading branch information
3 people authored Mar 2, 2024
1 parent e3479a0 commit 358b105
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 1 deletion.
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Change log
Generated on 2024-02-17
Generated on 2024-03-01

## Release 24.02

Expand Down Expand Up @@ -46,6 +46,9 @@ Generated on 2024-02-17
### Bugs Fixed
|||
|:---|:---|
|[#10464](https://github.com/NVIDIA/spark-rapids/issues/10464)|[BUG] spark334 and spark342 shims missed in scala2.13 dist jar|
|[#10473](https://github.com/NVIDIA/spark-rapids/issues/10473)|[BUG] Leak when running RANK query|
|[#10432](https://github.com/NVIDIA/spark-rapids/issues/10432)|Plug-in Build Failing for Databricks 11.3 |
|[#9974](https://github.com/NVIDIA/spark-rapids/issues/9974)|[BUG] host memory Leak in MultiFileCoalescingPartitionReaderBase in UTC time zone|
|[#10359](https://github.com/NVIDIA/spark-rapids/issues/10359)|[BUG] Build failure on Databricks nightly run with `GpuMapInPandasExecMeta`|
|[#10327](https://github.com/NVIDIA/spark-rapids/issues/10327)|[BUG] Unit test FAILED against : SPARK-24957: average with decimal followed by aggregation returning wrong result |
Expand Down Expand Up @@ -119,6 +122,12 @@ Generated on 2024-02-17
### PRs
|||
|:---|:---|
|[#10465](https://github.com/NVIDIA/spark-rapids/pull/10465)|Add missed shims for scala2.13|
|[#10511](https://github.com/NVIDIA/spark-rapids/pull/10511)|Update rapids jni and private dependency version to 24.02.1|
|[#10475](https://github.com/NVIDIA/spark-rapids/pull/10475)|Fix scalar leak in RankFixer|
|[#10461](https://github.com/NVIDIA/spark-rapids/pull/10461)|Preserve tags on FileSourceScanExec|
|[#10459](https://github.com/NVIDIA/spark-rapids/pull/10459)|[DOC] Fix table rendering issue in github.io download UI page on branch-24.02 [skip ci] |
|[#10443](https://github.com/NVIDIA/spark-rapids/pull/10443)|Update change log for v24.02.0 release [skip ci]|
|[#10439](https://github.com/NVIDIA/spark-rapids/pull/10439)|Reverts NVIDIA/spark-rapids#10232 and fixes the plugin build on Databricks 11.3|
|[#10380](https://github.com/NVIDIA/spark-rapids/pull/10380)|Init changelog 24.02 [skip ci]|
|[#10367](https://github.com/NVIDIA/spark-rapids/pull/10367)|Update rapids JNI and private version to release 24.02.0|
Expand Down
2 changes: 2 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -855,8 +855,10 @@
331,
332,
333,
334,
340,
341,
342,
350,
351
</noSnapshotScala213.buildvers>
Expand Down
2 changes: 2 additions & 0 deletions scala2.13/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -855,8 +855,10 @@
331,
332,
333,
334,
340,
341,
342,
350,
351
</noSnapshotScala213.buildvers>
Expand Down

0 comments on commit 358b105

Please sign in to comment.