Merge branch 'branch-24.02' into main #10383

NvTimLiu · 2024-02-06T11:40:15Z

Merge branch 'branch-24.02' into main

Change version to 24.02.0

Note: please merge this change with "Create a merge commit"

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Signed-off-by: Peixin Li <[email protected]>

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

* use fixed seed for test_from_json_struct_decimal * signoff Signed-off-by: Andy Grove <[email protected]> --------- Signed-off-by: Andy Grove <[email protected]>

…" (NVIDIA#10355) This reverts commit 6723a68. Signed-off-by: Bobby Wang <[email protected]>

* xfail test * signoff Signed-off-by: Andy Grove <[email protected]> --------- Signed-off-by: Andy Grove <[email protected]>

…IA#10309) * add custom 404 page Signed-off-by: liyuan <[email protected]> * Update .github/404.html Co-authored-by: Gera Shegalov <[email protected]> * test markdownlink checker Signed-off-by: liyuan <[email protected]> * check all links Signed-off-by: liyuan <[email protected]> * fix all dead links Signed-off-by: liyuan <[email protected]> * revert markdown link checker config files after fix all dead links Signed-off-by: liyuan <[email protected]> * enable all links checking as discussed in NVIDIA#10322 Signed-off-by: liyuan <[email protected]> * we already support zstd orc and parquet write, fix NVIDIA#10365 Signed-off-by: liyuan <[email protected]> --------- Signed-off-by: liyuan <[email protected]> Co-authored-by: Gera Shegalov <[email protected]>

Signed-off-by: Tim Liu <[email protected]>

NvTimLiu · 2024-02-06T11:43:25Z

This PR is not the final merge to main change.

Draft the PR for the in-advance review purpose

NOTE: There are still some open PRs targeting 24.02, will do the final merge after they get merged.

https://github.com/NVIDIA/spark-rapids/pulls?q=is%3Apr+is%3Aopen+base%3Abranch-24.02+

jlowe · 2024-02-06T15:07:48Z

CHANGELOG.md

@@ -125,7 +125,7 @@ Generated on 2024-01-31
 |[#10123](https://github.com/NVIDIA/spark-rapids/pull/10123)|Change version to v23.12.1 [skip ci]|
 |[#10122](https://github.com/NVIDIA/spark-rapids/pull/10122)|Init changelog for v23.12.1 [skip ci]|
 |[#10121](https://github.com/NVIDIA/spark-rapids/pull/10121)|[DOC] update download page for db hot fix  [skip ci]|
-|[#10116](https://github.com/NVIDIA/spark-rapids/pull/10116)|Upgrade to 23.12.1|
+|[#10116](https://github.com/NVIDIA/spark-rapids/pull/10116)|Upgrade to 23.12.1-SNPASHOT|


Typo that's not in branch-24.02? Curious how this change happened since it should just be a merge.

Good catch! thanks @jlowe

I found the root cause, that's my fault:

On dev branch-24.02 it is 23.12.1-SNAPSHOT : https://github.com/NVIDIA/spark-rapids/blob/branch-24.02/CHANGELOG.md

But, on main branch, I replaced all 23.12.1-SNAPSHOT to 23.12.1, where I should NOT modify it in CHANGELOG.md file :
e83c1c1

So we should keep 23.12.1-SNPASHOT in CHANGELOG.md here, to make it the same as what dev branch is.

The dev branch does not have 23.12.1-SNPASHOT, it has 23.12.1-SNAPSHOT. I'm curious how SNAPSHOT became SNPASHOT.

Aha, sorry, this is a typo when I fixed merge conflicts to main from dev branch.

Compared to the dev branch, there is only version change to 24.02.0 from 24.02.0-SNAPSHOT

let me fix the typo

Signed-off-by: Tim Liu <[email protected]>

NvTimLiu · 2024-02-07T03:49:28Z

Oh I should create a PR targeting to branch-24.02 for : 19cd490

Let me revert it from merge-to-main, create a new PR for branch-24.02:

#10389

This reverts commit 19cd490. Create a change targeting to branch-24.02

NvTimLiu · 2024-02-07T04:30:05Z

Shall we update -2024 copyright targeting to main, as we change version to 24.02.0 from 24.02.0-SNAPSHOT branch-24.02(on which copyright is up to 2.23)? @jlowe @sameerz @GaryShen2008 @tgravescs @revans2

e.g. shuffle-plugin/pom.xml on branch-24.02 : https://github.com/NVIDIA/spark-rapids/blob/branch-24.02/shuffle-plugin/pom.xml#L3

shuffle-plugin/pom.xml changedmerge-to-main : f56520c#diff-c29b084f7d961795298e283df6dcc8b6a5a549abe6d1153347faa414e932acdb

jlowe · 2024-02-07T16:00:35Z

Shall we update -2024 copyright targeting to main, as we change version to 24.02.0 from 24.02.0-SNAPSHOT

Yes. If we are not simply merging but also modifying with this PR, any files modified instead of simply merged need to have updated copyrights.

Signed-off-by: Tim Liu <[email protected]>

NvTimLiu · 2024-02-08T06:23:57Z

This commit history of merge-to-main got messed up with additional commits:

19cd490

7610623

735a06f

and fix typo

I'd like to drop this one, and create a clean and new merge-to-main PR instead.

NvTimLiu · 2024-02-08T07:05:10Z

Close this PR, it's replaced by #10395

nvauto and others added 30 commits November 14, 2023 14:14

Merge pull request NVIDIA#9694 from NVIDIA/branch-23.12

7118506

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9699 from NVIDIA/branch-23.12

1a548eb

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9700 from NVIDIA/branch-23.12

2f088e3

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9704 from NVIDIA/branch-23.12

eacf2c8

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9706 from NVIDIA/branch-23.12

3b0d65d

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9709 from NVIDIA/branch-23.12

03496bf

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9710 from NVIDIA/branch-23.12

b21e21f

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9713 from NVIDIA/branch-23.12

a3eee5c

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9725 from NVIDIA/branch-23.12

f092553

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9727 from NVIDIA/branch-23.12

aeb70db

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9730 from NVIDIA/branch-23.12

a46849d

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9734 from NVIDIA/branch-23.12

a3d1e46

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9735 from NVIDIA/branch-23.12

ef427f4

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Initiate project version 24.02.0-SNAPSHOT (NVIDIA#9716)

342b67b

Signed-off-by: Peixin Li <[email protected]>

Merge pull request NVIDIA#9740 from NVIDIA/branch-23.12

3f1cddc

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9742 from NVIDIA/branch-23.12

42f38a2

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9749 from NVIDIA/branch-23.12

9ff3b7c

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9752 from NVIDIA/branch-23.12

c18d6ef

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9754 from NVIDIA/branch-23.12

198cfbd

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9756 from NVIDIA/branch-23.12

ecea3f4

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9757 from NVIDIA/branch-23.12

9a85791

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9762 from NVIDIA/branch-23.12

88d88ac

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9764 from NVIDIA/branch-23.12

ef79e11

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9772 from NVIDIA/branch-23.12

12fa043

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9791 from NVIDIA/branch-23.12

6e3881b

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9793 from NVIDIA/branch-23.12

5e53ed5

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9796 from NVIDIA/branch-23.12

2b116a2

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9797 from NVIDIA/branch-23.12

e61ce58

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9799 from NVIDIA/branch-23.12

fb7b8fc

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

Merge pull request NVIDIA#9803 from NVIDIA/branch-23.12

2660b0c

[auto-merge] branch-23.12 to branch-24.02 [skip ci] [bot]

andygrove and others added 6 commits February 1, 2024 08:46

Use fixed seed for test_from_json_struct_decimal (NVIDIA#10353)

f433de9

* use fixed seed for test_from_json_struct_decimal * signoff Signed-off-by: Andy Grove <[email protected]> --------- Signed-off-by: Andy Grove <[email protected]>

Revert "Support barrier mode for mapInPandas/mapInArrow (NVIDIA#10343)…

6c54f5d

…" (NVIDIA#10355) This reverts commit 6723a68. Signed-off-by: Bobby Wang <[email protected]>

xfail mixed type test (NVIDIA#10352)

b75b161

* xfail test * signoff Signed-off-by: Andy Grove <[email protected]> --------- Signed-off-by: Andy Grove <[email protected]>

Merge branch 'branch-24.02' into main

4bbf750

Change version to 24.02.0

f56520c

Signed-off-by: Tim Liu <[email protected]>

NvTimLiu added documentation Improvements or additions to documentation build Related to CI / CD or cleanly building labels Feb 6, 2024

NvTimLiu self-assigned this Feb 6, 2024

NvTimLiu requested review from jlowe, revans2, tgravescs and GaryShen2008 as code owners February 6, 2024 11:40

NvTimLiu marked this pull request as draft February 6, 2024 11:42

NvTimLiu requested review from sameerz, gerashegalov, yinqingh and YanxuanLiu February 6, 2024 11:44

jlowe reviewed Feb 6, 2024

View reviewed changes

Change version to 24.02.0-SNAPSHOT for CONTRIBUTING.md

19cd490

Signed-off-by: Tim Liu <[email protected]>

Revert "Change version to 24.02.0-SNAPSHOT for CONTRIBUTING.md"

7610623

This reverts commit 19cd490. Create a change targeting to branch-24.02

Update copyright for modified files

735a06f

Signed-off-by: Tim Liu <[email protected]>

NvTimLiu mentioned this pull request Feb 8, 2024

Merge branch branch-24.02 into main [skip ci] #10395

Merged

NvTimLiu closed this Feb 8, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge branch 'branch-24.02' into main #10383

Merge branch 'branch-24.02' into main #10383

NvTimLiu commented Feb 6, 2024

NvTimLiu commented Feb 6, 2024

jlowe Feb 6, 2024

NvTimLiu Feb 7, 2024 •

edited

Loading

jlowe Feb 7, 2024

NvTimLiu Feb 8, 2024 •

edited

Loading

NvTimLiu commented Feb 7, 2024 •

edited

Loading

NvTimLiu commented Feb 7, 2024 •

edited

Loading

jlowe commented Feb 7, 2024

NvTimLiu commented Feb 8, 2024 •

edited

Loading

NvTimLiu commented Feb 8, 2024

Merge branch 'branch-24.02' into main #10383

Merge branch 'branch-24.02' into main #10383

Conversation

NvTimLiu commented Feb 6, 2024

NvTimLiu commented Feb 6, 2024

jlowe Feb 6, 2024

Choose a reason for hiding this comment

NvTimLiu Feb 7, 2024 • edited Loading

Choose a reason for hiding this comment

jlowe Feb 7, 2024

Choose a reason for hiding this comment

NvTimLiu Feb 8, 2024 • edited Loading

Choose a reason for hiding this comment

NvTimLiu commented Feb 7, 2024 • edited Loading

NvTimLiu commented Feb 7, 2024 • edited Loading

jlowe commented Feb 7, 2024

NvTimLiu commented Feb 8, 2024 • edited Loading

NvTimLiu commented Feb 8, 2024

NvTimLiu Feb 7, 2024 •

edited

Loading

NvTimLiu Feb 8, 2024 •

edited

Loading

NvTimLiu commented Feb 7, 2024 •

edited

Loading

NvTimLiu commented Feb 7, 2024 •

edited

Loading

NvTimLiu commented Feb 8, 2024 •

edited

Loading