Rebase branch velox_pr_rebase (de54770) with oss-main (78fbe6c)

[prestodb-ci]

Base Branch Or Commit

78fbe6c

Target Branch

velox_pr_rebase

Force Push

• Please force push

Other contents

Rebase branch velox_pr_rebase (de54770) with oss-main (78fbe6c)

Triggered by PR refactor: Clean up RowSerializer.h and add RowSerializer.cpp #13018 merged at 2025-04-13T02:31:08Z.

[prestodb-ci]

Failed

Failed to cherry-pick item [11771] [11772] Fix smj result mismatch issue commit 0 - 1ef5a31 onto staging/velox_pr_rebase

exit status 1
error: could not apply 1ef5a31a6... [11771] [11772] Fix smj result mismatch issue
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
hint: Disable this message with "git config advice.mergeConflict false"

Auto-merging velox/exec/MergeJoin.cpp
CONFLICT (content): Merge conflict in velox/exec/MergeJoin.cpp
Auto-merging velox/exec/MergeJoin.h
CONFLICT (content): Merge conflict in velox/exec/MergeJoin.h

Base time: 2025-04-13T02:28:07Z
Rebase items finished before the failure:

id	repo	remote	issue_number	issue_title	issue_first_introduced	owner	commits	auto_removed_by	time_added	added_by_user	added_by_url	time_removed	removed_by_user	removed_by_url
60	velox	oap	511	[6020] Spark sql avg agg function support decimal	2023-08-07T10:37:06Z	liujiayi771	475f069	NULL	2023-08-07T10:37:06Z	prestodb-ci	#511 (comment)	NULL	NULL	NULL
61	velox	oap	512	[oap] Register merge extract companion agg functions without suffix	2023-12-29T02:31:07Z	zhztheplayer	c1e41a3	NULL	2023-12-29T02:31:07Z	prestodb-ci	#512 (comment)	NULL	NULL	NULL

If you would like to retry, fix the issue input by editing the description if needed, then reopen.

[prestodb-ci]

Success!

Rebase completed successfully, branch is available at velox_pr_rebase.
Base time: 2025-04-13T02:28:07Z
Items rebased:

id	repo	remote	issue_number	issue_title	issue_first_introduced	owner	commits	auto_removed_by	time_added	added_by_user	added_by_url	time_removed	removed_by_user	removed_by_url
60	velox	oap	511	[6020] Spark sql avg agg function support decimal	2023-08-07T10:37:06Z	liujiayi771	475f069	NULL	2023-08-07T10:37:06Z	prestodb-ci	#511 (comment)	NULL	NULL	NULL
61	velox	oap	512	[oap] Register merge extract companion agg functions without suffix	2023-12-29T02:31:07Z	zhztheplayer	c1e41a3	NULL	2023-12-29T02:31:07Z	prestodb-ci	#512 (comment)	NULL	NULL	NULL
66	velox	oap	514	[11771] [11772] Fix smj result mismatch issue	2025-01-03T07:53:23Z	JkSelf	df7a52b	NULL	2025-01-03T07:53:23Z	zhouyuan	#514 (comment)	NULL	NULL	NULL
62	velox	oap	513	[11067] Support scan filter for decimal in ORC	2025-03-14T11:44:17Z	rui-mo	36d42f8	NULL	2025-03-14T11:44:17Z	prestodb-ci	#513 (comment)	NULL	NULL	NULL
59	velox	oap	510	[5962] Support struct schema evolution matching by name	2025-03-25T10:07:04Z	rui-mo	3b172d7	NULL	2025-03-25T10:07:04Z	prestodb-ci	#510 (comment)	NULL	NULL	NULL

[prestodb-ci]

OSS Gluten build ABORTED:

{
  "build_url": "http://ci.ibm.prestodb.dev/job/presto-performance/job/presto-performance/job/pipeline-build-spark-gluten-images/537/",
  "build_status": "ABORTED",
  "gluten_repo": "https://github.com/apache/incubator-gluten.git",
  "gluten_branch": "main",
  "velox_repo": "https://github.com/oap-project/velox.git",
  "velox_branch": "velox_pr_rebase",
  "gluten_commit_sha": "d78825a59d1d899f916f8e3743a81ea13c7b792d",
  "docker_images": "",
  "triggered_by": "https://github.com/oap-project/velox/issues/532#issuecomment-2802192297"
}