Rebase branch velox_pr_rebase (de54770) with oss-main (ccd9e41)

[prestodb-ci]

Base Branch Or Commit

ccd9e41

Target Branch

velox_pr_rebase

Force Push

• Please force push

Other contents

Rebase branch velox_pr_rebase (de54770) with oss-main (ccd9e41)

Triggered by PR refactor: Merge join code cleanup #13015 merged at 2025-04-12T18:57:55Z.

[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-12T18:55:23Z
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.