Rebase branch velox_pr_rebase (96c290a) with oss-main (27299ef)

[prestodb-ci]

Base Branch Or Commit

27299ef

Target Branch

velox_pr_rebase

Force Push

• Please force push

Other contents

Rebase branch velox_pr_rebase (96c290a) with oss-main (27299ef)

Triggered by PR fix: Fix semi join result mismatch with filter and multi duplicated matched rows #13121 merged at 2025-06-24T21:35:45Z.

[prestodb-ci]

Failed

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

exit status 1
error: could not apply 289d52c74... [11771] [11772] Fix smj result mismatch issue

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

Base time: 2025-06-24T21:26:38Z
Rebase items finished before the failure:

id	repo	remote	issue_number	issue_title	issue_first_introduced	owner	commits	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	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	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.