This is an automated email from the ASF dual-hosted git repository. yiguolei pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/doris.git
commit 3b093cabd17b37c2ce008e967d56e008924b354b Author: kindred77 <[email protected]> AuthorDate: Tue Feb 27 00:58:41 2024 +0800 Fix building issue in be on ubuntu with test enabled. (#31407) Co-authored-by: tangye <[email protected]> --- be/src/runtime/thread_context.h | 4 ++-- build.sh | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/be/src/runtime/thread_context.h b/be/src/runtime/thread_context.h index 85ca125f36f..f6ca46acaba 100644 --- a/be/src/runtime/thread_context.h +++ b/be/src/runtime/thread_context.h @@ -418,8 +418,8 @@ private: #define THREAD_MEM_TRACKER_TRANSFER_FROM(size, tracker) (void)0 #define CONSUME_THREAD_MEM_TRACKER_BY_HOOK(size) (void)0 #define RELEASE_THREAD_MEM_TRACKER_BY_HOOK(size) (void)0 -#define CONSUME_THREAD_MEM_TRACKER_BY_HOOK_WITH_FN(size) (void)0 -#define RELEASE_THREAD_MEM_TRACKER_BY_HOOK_WITH_FN(size) (void)0 +#define CONSUME_THREAD_MEM_TRACKER_BY_HOOK_WITH_FN(size_fn, ...) (void)0 +#define RELEASE_THREAD_MEM_TRACKER_BY_HOOK_WITH_FN(size_fn, ...) (void)0 #define CONSUME_THREAD_MEM_TRACKER(size) (void)0 #define RELEASE_THREAD_MEM_TRACKER(size) (void)0 #endif diff --git a/build.sh b/build.sh index 8363705b555..7b67a303db1 100755 --- a/build.sh +++ b/build.sh @@ -670,8 +670,10 @@ EOF # Fix Killed: 9 error on MacOS (arm64). # See: https://stackoverflow.com/questions/67378106/mac-m1-cping-binary-over-another-results-in-crash - rm -f "${DORIS_OUTPUT}/be/lib/doris_be" - cp -r -p "${DORIS_HOME}/be/output/lib/doris_be" "${DORIS_OUTPUT}/be/lib"/ + if [[ -f "${DORIS_HOME}/be/output/lib/doris_be" ]]; then + rm -f "${DORIS_OUTPUT}/be/lib/doris_be" + cp -r -p "${DORIS_HOME}/be/output/lib/doris_be" "${DORIS_OUTPUT}/be/lib"/ + fi if [[ -d "${DORIS_HOME}/be/output/lib/doris_be.dSYM" ]]; then rm -rf "${DORIS_OUTPUT}/be/lib/doris_be.dSYM" cp -r "${DORIS_HOME}/be/output/lib/doris_be.dSYM" "${DORIS_OUTPUT}/be/lib"/ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
