Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebase Databricks 14.3 feature branch to 24.12 #5

Open
wants to merge 63 commits into
base: SP-10661-db-14.3
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
63 commits
Select commit Hold shift + click to select a range
5beeba8
Skip test_hash_groupby_approx_percentile byte and double tests tempor…
abellina Sep 12, 2024
938d4df
Replace scala.util.Try with a try statement in the DBR buildinfo [dat…
gerashegalov Sep 14, 2024
65f0095
Revert "Skip test_hash_groupby_approx_percentile byte and double test…
abellina Sep 16, 2024
00cd422
Enable tests after string_split was fixed (#11474)
revans2 Sep 16, 2024
2589976
Use improved CUDF JSON validation (#11464)
revans2 Sep 17, 2024
f4119c1
Fix a json test for non utc time zone (#11482)
revans2 Sep 18, 2024
7c13383
Use reusable auto-merge workflow (#11483)
pxLi Sep 19, 2024
4b26190
Enable tests for all JSON white space normalization (#11456)
revans2 Sep 20, 2024
0f5d510
Support yyyyMMdd in GetTimestamp operator for LEGACY mode [databricks…
res-life Sep 23, 2024
ebcc146
Support non-UTC timezone for casting from date type to timestamp type…
res-life Sep 23, 2024
510ee83
Install cuDF-py against python 3.10 on Databricks (#11477)
NvTimLiu Sep 24, 2024
a34f33e
Enable parquet suites from Spark UT (#11366)
Feng-Jiang28 Sep 24, 2024
614d8f5
Init version 24.12.0-SNAPSHOT
nvauto Sep 24, 2024
5725e2e
Optimzing Expand+Aggregate in sqls with many count distinct (#10798)
binmahone Sep 24, 2024
86d0f60
Merge pull request #11494 from NVIDIA/branch-24.10
nvauto Sep 24, 2024
6a9731f
Use UnaryLike instead of UnaryExpression (#11490)
abellina Sep 24, 2024
9ed9b94
Merge pull request #11495 from NVIDIA/branch-24.10
nvauto Sep 24, 2024
10eaa22
Download artifacts via wget (#11503)
NvTimLiu Sep 26, 2024
bae19e3
Merge pull request #11504 from NVIDIA/branch-24.10
nvauto Sep 26, 2024
01c3003
Support legacy mode for yyyymmdd format [databricks] (#11493)
res-life Sep 26, 2024
b113c46
Replace libmamba-solver with mamba command [skip ci] (#11507)
pxLi Sep 26, 2024
7661abb
Merge pull request #11508 from NVIDIA/branch-24.10
nvauto Sep 26, 2024
c047707
GPU device watermark metrics (#11457)
zpuller Sep 26, 2024
4b61b45
Merge pull request #11513 from NVIDIA/branch-24.10
nvauto Sep 26, 2024
41351c0
Fix FileAlreadyExistsException in LORE dump process (#11484)
ustcfy Sep 27, 2024
0e446ad
Merge pull request #11517 from NVIDIA/branch-24.10
nvauto Sep 27, 2024
9625e58
Deploy all submodules for default sparkver (#11516)
pxLi Sep 27, 2024
9089b7f
Merge pull request #11518 from NVIDIA/branch-24.10
nvauto Sep 27, 2024
fbd4db9
Update from_json to use new cudf features (#11497)
revans2 Sep 27, 2024
e9b89ff
Merge pull request #11523 from NVIDIA/branch-24.10
nvauto Sep 27, 2024
f87ccb9
Fixed buildall script (#11515)
razajafri Sep 27, 2024
6692d17
Merge pull request #11540 from NVIDIA/branch-24.10
nvauto Sep 28, 2024
2036f16
Update rapids JNI and private dependency to 24.12.0-SNAPSHOT [skip ci…
nvauto Sep 30, 2024
c74e2dd
Only test years after 1900 for LEGACY mode (#11545)
res-life Sep 30, 2024
5fae883
Fix negative rs. shuffle write time (#11548)
abellina Oct 1, 2024
8207f7b
Update test now that code is fixed (#11496)
revans2 Oct 1, 2024
1432649
Merge branch 'branch-24.10' into fix_merge_conflict
revans2 Oct 7, 2024
7a78951
Merge pull request #11563 from revans2/fix_merge_conflict
revans2 Oct 7, 2024
5eeddc6
Spark 4: Fix parquet_test.py [databricks] (#11519)
mythrocks Oct 8, 2024
b9b7629
Fix test case unix_timestamp(col, 'yyyyMMdd') failed for Africa/Casab…
res-life Oct 8, 2024
cd46572
Update test case related to LEACY datetime format to unblock nightly …
res-life Oct 8, 2024
6897713
Add in a basic plugin for dataframe UDF support in Apache Spark (#11561)
revans2 Oct 8, 2024
506d212
Disk spill metric (#11564)
zpuller Oct 8, 2024
b715ef2
Have "dump always" dump input files before trying to decode them (#11…
revans2 Oct 9, 2024
58eb33f
Merge branch 'branch-24.10' into fixmerge
jlowe Oct 9, 2024
180da0f
Log reconfigure multi-file thread pool only once (#11571)
gerashegalov Oct 9, 2024
025e62e
Merge pull request #11579 from jlowe/fixmerge
jlowe Oct 9, 2024
e8b78c0
[Spark 4.0] Address test failures in cast_test.py [databricks] (#11559)
mythrocks Oct 9, 2024
e8ac073
avoid long tail tasks due to PrioritySemaphore (#11574)
binmahone Oct 10, 2024
0ba4fd2
addressing jason's comment (#11587)
binmahone Oct 11, 2024
ec9d008
backport fixes of #11573 to branch 24.10 (#11588)
binmahone Oct 11, 2024
4866941
Merge pull request #11594 from NVIDIA/branch-24.10
nvauto Oct 11, 2024
aca15ab
Fix `collection_ops_tests` for Spark 4.0 [databricks] (#11414)
mythrocks Oct 12, 2024
8254f63
update doc for 2410 release (#11582)
nvliyuan Oct 14, 2024
3744ad2
Merge pull request #11601 from NVIDIA/branch-24.10
nvauto Oct 14, 2024
3c9bb8b
Update rapids JNI and private dependency to 24.10.0 (#11576)
nvauto Oct 14, 2024
b535f2d
Update latest changelog [skip ci] (#11577)
nvauto Oct 14, 2024
adc4e95
Merge branch-24.10 into branch-24.12
NvTimLiu Oct 14, 2024
8c55ef3
Merge pull request #11605 from NvTimLiu/fix-auto-merge-conflict-11604
jlowe Oct 14, 2024
2d3e0ec
Disable regex tests to unblock CI (#11606)
jlowe Oct 14, 2024
11964ae
Remove an unused config shuffle.spillThreads (#11595)
abellina Oct 14, 2024
441c052
Merge remote-tracking branch 'master/branch-24.12' into collect-ops-test
mythrocks Oct 14, 2024
8e14c65
Fixes for upmerge to branch-24.12.
mythrocks Oct 15, 2024
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
24 changes: 8 additions & 16 deletions .github/workflows/auto-merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,24 +18,16 @@ name: auto-merge HEAD to BASE
on:
pull_request_target:
branches:
- branch-24.08
- branch-*
types: [closed]

jobs:
auto-merge:
if: github.event.pull_request.merged == true
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
with:
ref: branch-24.08 # force to fetch from latest upstream instead of PR ref

- name: auto-merge job
uses: ./.github/workflows/auto-merge
env:
OWNER: NVIDIA
REPO_NAME: spark-rapids
HEAD: branch-24.08
BASE: branch-24.10
AUTOMERGE_TOKEN: ${{ secrets.AUTOMERGE_TOKEN }} # use to merge PR
uses: NVIDIA/spark-rapids-common/.github/workflows/auto-merge.yml@main
with:
owner: ${{ github.repository_owner }}
repo: spark-rapids
branch: ${{ github.event.pull_request.base.ref }}
secrets:
token: ${{ secrets.AUTOMERGE_TOKEN }}
22 changes: 0 additions & 22 deletions .github/workflows/auto-merge/Dockerfile

This file was deleted.

20 changes: 0 additions & 20 deletions .github/workflows/auto-merge/action.yml

This file was deleted.

137 changes: 0 additions & 137 deletions .github/workflows/auto-merge/automerge

This file was deleted.

Loading
Loading