Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/be-ut-mac.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
'texinfo'
'coreutils'
'gnu-getopt'
'python'
'python@3'
'cmake'
'ninja'
'ccache'
Expand All @@ -79,6 +79,7 @@ jobs:
'openjdk@11'
'maven'
'node'
'llvm@15'
)
brew install "${cellars[@]}"

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/build-thirdparty.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ jobs:
'texinfo'
'coreutils'
'gnu-getopt'
'python'
'python@3'
'cmake'
'ninja'
'ccache'
Expand All @@ -146,6 +146,7 @@ jobs:
'openjdk@11'
'maven'
'node'
'llvm@15'
)

brew install "${packages[@]}"
Expand Down
3 changes: 3 additions & 0 deletions be/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -885,6 +885,9 @@ if (${MAKE_TEST} STREQUAL "ON")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lgcov")
endif()
add_definitions(-DBE_TEST)
if (ARCH_ARM)
add_compile_options(-ffp-contract=off)
endif()
endif ()

add_subdirectory(${SRC_DIR}/agent)
Expand Down
4 changes: 3 additions & 1 deletion be/test/util/threadpool_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,9 @@ TEST_F(ThreadPoolTest, TestDeadlocks) {
#ifdef __APPLE__
const char* death_msg =
"_ZNSt3__1L8__invokeIRNS_6__bindIMN5doris10ThreadPoolEFvvEJPS3_EEEJEEEDTclscT_fp_"
"spscT0_fp0_EEOS9_DpOSA_";
"spscT0_fp0_EEOS9_DpOSA_|_ZNSt3__18__invokeB6v15007IRNS_6__"
"bindIMN5doris10ThreadPoolEFvvEJPS3_EEEJEEEDTclclsr3stdE7declvalIT_"
"EEspclsr3stdE7declvalIT0_EEEEOS9_DpOSA_";
#else
const char* death_msg =
"_ZNSt5_BindIFMN5doris10ThreadPoolEFvvEPS1_EE6__callIvJEJLm0EEEET_OSt5tupleIJDpT0_"
Expand Down
2 changes: 1 addition & 1 deletion bin/start_be.sh
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ if [[ "${RUN_IN_AWS}" -eq 0 ]]; then
fi

## set asan and ubsan env to generate core file
export ASAN_OPTIONS=symbolize=1:abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1
export ASAN_OPTIONS=symbolize=1:abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1:detect_container_overflow=0
export UBSAN_OPTIONS=print_stacktrace=1

## set TCMALLOC_HEAP_LIMIT_MB to limit memory used by tcmalloc
Expand Down
7 changes: 3 additions & 4 deletions docs/en/docs/install/source-install/compilation-mac.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,15 @@ This post introduces how to compile from source on macOS (both x86_64 and arm64)

## Prerequisites

1. macOS 12 (Monterey) or newer(_**both Intel chip and Apple Silicon chip are supported**_)
2. Apple Clang 13 or newer(the latest version is recommended)
3. [Homebrew](https://brew.sh/)
1. macOS 12 (Monterey) or newer(_**both Intel chip and Apple Silicon chips are supported**_)
2. [Homebrew](https://brew.sh/)

## Steps

1. Use [Homebrew](https://brew.sh/) to install tools
```shell
brew install automake autoconf libtool pkg-config texinfo coreutils gnu-getopt \
python cmake ninja ccache bison byacc gettext wget pcre maven openjdk@11 npm
python@3 cmake ninja ccache bison byacc gettext wget pcre maven llvm@15 openjdk@11 npm
```

2. Compile from source
Expand Down
5 changes: 2 additions & 3 deletions docs/zh-CN/docs/install/source-install/compilation-mac.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,14 @@ under the License.
## 环境要求

1. macOS 12 (Monterey) 及以上(_**Intel和Apple Silicon均支持**_)
2. Apple Clang 13及以上(最好使用最新版本)
3. [Homebrew](https://brew.sh/)
2. [Homebrew](https://brew.sh/)

## 编译步骤

1. 使用[Homebrew](https://brew.sh/)安装依赖
```shell
brew install automake autoconf libtool pkg-config texinfo coreutils gnu-getopt \
python cmake ninja ccache bison byacc gettext wget pcre maven openjdk@11 npm
python@3 cmake ninja ccache bison byacc gettext wget pcre maven llvm@15 openjdk@11 npm
```

2. 编译源码
Expand Down
3 changes: 2 additions & 1 deletion env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ CELLARS=(
texinfo
coreutils
gnu-getopt
python
python@3
cmake
ninja
ccache
Expand All @@ -61,6 +61,7 @@ CELLARS=(
wget
pcre
maven
llvm@15
)
for cellar in "\${CELLARS[@]}"; do
EXPORT_CELLARS="\${HOMEBREW_REPO_PREFIX}/opt/\${cellar}/bin:\${EXPORT_CELLARS}"
Expand Down
2 changes: 1 addition & 1 deletion run-be-ut.sh
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ mkdir "${UT_TMP_DIR}"
touch "${UT_TMP_DIR}/tmp_file"

# set asan and ubsan env to generate core file
export ASAN_OPTIONS=symbolize=1:abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1
export ASAN_OPTIONS=symbolize=1:abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1:detect_container_overflow=0
export UBSAN_OPTIONS=print_stacktrace=1

# find all executable test files
Expand Down