github-actions[bot] commented on code in PR #69688:
URL: https://github.com/apache/doris/pull/69688#discussion_r4408678477
##########
thirdparty/download-thirdparty.sh:
##########
@@ -800,16 +800,21 @@ if [[ " ${TP_ARCHIVES[*]} " =~ " BOOST " ]]; then
echo "Finished patching ${BOOST_SOURCE}"
fi
-# Clang on AArch64 supports __int128. Enable phmap's multiply-based hash mixer
-# instead of falling back to the longer shift/xor implementation.
+# Clang on AArch64 supports __int128. Keep the existing hash mixer patch and
+# accelerate ARM control scans without changing the eight-byte group layout.
if [[ " ${TP_ARCHIVES[*]} " =~ " PARALLEL_HASHMAP " ]]; then
- cd "${TP_SOURCE_DIR}/${PARALLEL_HASHMAP_SOURCE}"
- if [[ ! -f "${PATCHED_MARK}_aarch64_int128" ]]; then
- patch -p1
<"${TP_PATCH_DIR}/parallel-hashmap-1.3.8-aarch64-int128.patch"
- touch "${PATCHED_MARK}_aarch64_int128"
- fi
- cd -
- echo "Finished patching ${PARALLEL_HASHMAP_SOURCE} for AArch64 int128"
+ (
+ cd "${TP_SOURCE_DIR}/${PARALLEL_HASHMAP_SOURCE}"
+ if [[ ! -f "${PATCHED_MARK}_aarch64_int128" ]]; then
+ patch -p1
<"${TP_PATCH_DIR}/parallel-hashmap-1.3.8-aarch64-int128.patch"
+ touch "${PATCHED_MARK}_aarch64_int128"
+ fi
+ if [[ ! -f "${PATCHED_MARK}_arm_neon" ]]; then
+ patch --batch --fuzz=0 -p1
<"${TP_PATCH_DIR}/parallel-hashmap-1.3.8-arm-neon.patch"
+ touch "${PATCHED_MARK}_arm_neon"
+ fi
+ )
Review Comment:
[P2] Prevent a rerun from reversing the NEON patch — `patch --batch
--fuzz=0` assumes `-R` when it sees an already-applied patch. If the downloader
is interrupted after applying the patch but before `touch
patched_mark_arm_neon`, the next run will silently undo both NEON hunks, return
success, and then create the marker, leaving the source in the unoptimized
state. Use `--forward` (and fail on an already-applied/rejected patch) or make
the marker update atomic so recovery cannot accept a reversed patch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
