Skip to content

Commit 0eb1caf

Browse files
SteNicholasSteNicholas
committed
feat: support x86-64 and arm64 architectures of macOS
1 parent 9ed8cdd commit 0eb1caf

33 files changed

Lines changed: 896 additions & 523 deletions

‎.github/workflows/clang_test.yaml‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ permissions:
3030
contents: read
3131

3232
jobs:
33-
clang-test:
33+
clang-test-ubuntu-x86-64:
34+
name: Ubuntu 24.04 x86_64
3435
runs-on: ubuntu-24.04
3536
timeout-minutes: 120
3637
strategy:
@@ -47,3 +48,26 @@ jobs:
4748
CC: clang
4849
CXX: clang++
4950
run: ci/scripts/build_paimon.sh $(pwd) false true
51+
clang-test-macos-x86_64:
52+
name: macOS 26 x86_64
53+
runs-on: macos-26
54+
timeout-minutes: 120
55+
strategy:
56+
fail-fast: false
57+
steps:
58+
- name: Checkout paimon-cpp
59+
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
60+
with:
61+
lfs: true
62+
fetch-depth: 0 # fetch all history for git diff in clang-tidy
63+
- name: Build Paimon
64+
shell: bash
65+
run: |
66+
brew uninstall cmake
67+
brew uninstall --ignore-dependencies brotli
68+
wget https://cmake.org/files/v3.31/cmake-3.31.0-macos-universal.tar.gz
69+
tar -xzf cmake-3.31.0-macos-universal.tar.gz
70+
mv cmake-3.31.0-macos-universal/CMake.app /Applications/
71+
echo 'export PATH="/Applications/CMake.app/Contents/bin:$PATH"' >> ~/.zshrc
72+
source ~/.zshrc
73+
ci/scripts/build_paimon.sh $(pwd) false true

‎CMakeLists.txt‎

Lines changed: 80 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,15 @@ option(PAIMON_ENABLE_AVRO "Whether to enable avro file format" ON)
5252
option(PAIMON_ENABLE_ORC "Whether to enable orc file format" ON)
5353
option(PAIMON_ENABLE_LANCE "Whether to enable lance file format" OFF)
5454
option(PAIMON_ENABLE_JINDO "Whether to enable jindo file system" OFF)
55-
option(PAIMON_ENABLE_LUMINA "Whether to enable lumina vector index" ON)
56-
option(PAIMON_ENABLE_LUCENE "Whether to enable lucene index" ON)
55+
option(PAIMON_ENABLE_LUMINA "Whether to enable lumina vector index" OFF)
56+
option(PAIMON_ENABLE_LUCENE "Whether to enable lucene index" OFF)
57+
option(PAIMON_ENABLE_MACOS "Whether to enable experimental macOS support" OFF)
58+
59+
if(APPLE)
60+
if(NOT PAIMON_ENABLE_MACOS)
61+
message(FATAL_ERROR，"macOS support is currently experimental.")
62+
endif()
63+
endif()
5764

5865
if(PAIMON_ENABLE_ORC)
5966
add_definitions(-DPAIMON_ENABLE_ORC)
@@ -334,8 +341,13 @@ add_compile_definitions("GLOG_USE_GLOG_EXPORT")
334341
335342
set(THREADS_PREFER_PTHREAD_FLAG ON)
336343
find_package(Threads REQUIRED)
337-
set(PAIMON_VERSION_SCRIPT_FLAGS
338-
"-Wl,--version-script=${CMAKE_SOURCE_DIR}/src/paimon/symbols.map")
344+
if(APPLE)
345+
set(PAIMON_VERSION_SCRIPT_FLAGS
346+
"-Wl,-exported_symbols_list,${CMAKE_SOURCE_DIR}/src/paimon/symbols.list")
347+
else()
348+
set(PAIMON_VERSION_SCRIPT_FLAGS
349+
"-Wl,--version-script=${CMAKE_SOURCE_DIR}/src/paimon/symbols.map")
350+
endif()
339351
340352
set(ENV{PAIMON_TEST_DATA} "${CMAKE_SOURCE_DIR}/test/test_data")
341353
@@ -363,47 +375,82 @@ if(PAIMON_BUILD_TESTS)
363375
include_directories(SYSTEM ${GTEST_INCLUDE_DIR})
364376
include_directories("${CMAKE_SOURCE_DIR}/test/")
365377
366-
set(TEST_STATIC_LINK_LIBS
367-
"-Wl,--whole-archive"
368-
paimon_file_index_static
369-
paimon_global_index_static
370-
paimon_local_file_system_static
371-
paimon_mock_file_format_static
372-
"-Wl,--no-whole-archive"
373-
"-Wl,--no-as-needed"
374-
paimon_parquet_file_format_shared
375-
paimon_blob_file_format_shared
376-
"-Wl,--as-needed")
378+
if(APPLE)
379+
set(TEST_STATIC_LINK_LIBS
380+
"-Wl,-force_load"
381+
paimon_file_index_static
382+
paimon_global_index_static
383+
paimon_local_file_system_static
384+
paimon_mock_file_format_static
385+
paimon_parquet_file_format_shared
386+
paimon_blob_file_format_shared)
387+
else()
388+
set(TEST_STATIC_LINK_LIBS
389+
"-Wl,--whole-archive"
390+
paimon_file_index_static
391+
paimon_global_index_static
392+
paimon_local_file_system_static
393+
paimon_mock_file_format_static
394+
"-Wl,--no-whole-archive"
395+
"-Wl,--no-as-needed"
396+
paimon_parquet_file_format_shared
397+
paimon_blob_file_format_shared
398+
"-Wl,--as-needed")
399+
endif()
377400
378401
if(PAIMON_ENABLE_LANCE)
379-
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed")
380-
list(APPEND TEST_STATIC_LINK_LIBS paimon_lance_file_format_shared)
381-
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed")
402+
if(APPLE)
403+
list(APPEND TEST_STATIC_LINK_LIBS paimon_lance_file_format_shared)
404+
else()
405+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed")
406+
list(APPEND TEST_STATIC_LINK_LIBS paimon_lance_file_format_shared)
407+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed")
408+
endif()
382409
endif()
383410
if(PAIMON_ENABLE_ORC)
384-
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed")
385-
list(APPEND TEST_STATIC_LINK_LIBS paimon_orc_file_format_shared)
386-
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed")
411+
if(APPLE)
412+
list(APPEND TEST_STATIC_LINK_LIBS paimon_orc_file_format_shared)
413+
else()
414+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed")
415+
list(APPEND TEST_STATIC_LINK_LIBS paimon_orc_file_format_shared)
416+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed")
417+
endif()
387418
endif()
388419
if(PAIMON_ENABLE_AVRO)
389-
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed")
390-
list(APPEND TEST_STATIC_LINK_LIBS paimon_avro_file_format_shared)
391-
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed")
420+
if(APPLE)
421+
list(APPEND TEST_STATIC_LINK_LIBS paimon_avro_file_format_shared)
422+
else()
423+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed")
424+
list(APPEND TEST_STATIC_LINK_LIBS paimon_avro_file_format_shared)
425+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed")
426+
endif()
392427
endif()
393428
if(PAIMON_ENABLE_JINDO)
394-
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed")
395-
list(APPEND TEST_STATIC_LINK_LIBS paimon_jindo_file_system_shared)
396-
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed")
429+
if(APPLE)
430+
list(APPEND TEST_STATIC_LINK_LIBS paimon_jindo_file_system_shared)
431+
else()
432+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed")
433+
list(APPEND TEST_STATIC_LINK_LIBS paimon_jindo_file_system_shared)
434+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed")
435+
endif()
397436
endif()
398437
if(PAIMON_ENABLE_LUMINA)
399-
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed")
400-
list(APPEND TEST_STATIC_LINK_LIBS paimon_lumina_index_shared)
401-
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed")
438+
if(APPLE)
439+
list(APPEND TEST_STATIC_LINK_LIBS paimon_lumina_index_shared)
440+
else()
441+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed")
442+
list(APPEND TEST_STATIC_LINK_LIBS paimon_lumina_index_shared)
443+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed")
444+
endif()
402445
endif()
403446
if(PAIMON_ENABLE_LUCENE)
404-
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed")
405-
list(APPEND TEST_STATIC_LINK_LIBS paimon_lucene_index_shared)
406-
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed")
447+
if(APPLE)
448+
list(APPEND TEST_STATIC_LINK_LIBS paimon_lucene_index_shared)
449+
else()
450+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--no-as-needed")
451+
list(APPEND TEST_STATIC_LINK_LIBS paimon_lucene_index_shared)
452+
list(APPEND TEST_STATIC_LINK_LIBS "-Wl,--as-needed")
453+
endif()
407454
endif()
408455
endif()
409456

‎ci/scripts/build_paimon.sh‎

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,31 @@ build_dir=${1}/build
2525
mkdir ${build_dir}
2626
pushd ${build_dir}
2727

28-
CMAKE_ARGS=(
29-
"-G Ninja"
30-
"-DCMAKE_BUILD_TYPE=${build_type}"
31-
"-DPAIMON_BUILD_TESTS=ON"
32-
"-DPAIMON_ENABLE_LANCE=ON"
33-
"-DPAIMON_ENABLE_JINDO=ON"
34-
)
28+
is_macos() {
29+
[[ "${OSTYPE}" == "darwin"* ]]
30+
}
31+
32+
if is_macos; then
33+
CMAKE_ARGS=(
34+
"-G Ninja"
35+
"-DCMAKE_BUILD_TYPE=${build_type}"
36+
"-DPAIMON_BUILD_TESTS=ON"
37+
"-DPAIMON_ENABLE_MACOS=ON"
38+
"-DPAIMON_ENABLE_JINDO=ON"
39+
)
40+
NPROCS=$(sysctl -n hw.ncpu)
41+
else
42+
CMAKE_ARGS=(
43+
"-G Ninja"
44+
"-DCMAKE_BUILD_TYPE=${build_type}"
45+
"-DPAIMON_BUILD_TESTS=ON"
46+
"-DPAIMON_ENABLE_LANCE=ON"
47+
"-DPAIMON_ENABLE_JINDO=ON"
48+
"-DPAIMON_ENABLE_LUMINA=ON"
49+
"-DPAIMON_ENABLE_LUCENE=ON"
50+
)
51+
NPROCS=$(nproc)
52+
fi
3553

3654
if [[ "${enable_sanitizer}" == "true" ]]; then
3755
CMAKE_ARGS+=(
@@ -41,11 +59,13 @@ if [[ "${enable_sanitizer}" == "true" ]]; then
4159
fi
4260

4361
cmake "${CMAKE_ARGS[@]}" ${source_dir}
44-
cmake --build . -- -j$(nproc)
45-
ctest --output-on-failure -j $(nproc)
62+
cmake --build . -- -j${NPROCS}
63+
if ! is_macos; then
64+
ctest --output-on-failure -j ${NPROCS}
4665

47-
if [[ "${check_clang_tidy}" == "true" ]]; then
48-
cmake --build . --target check-clang-tidy
66+
if [[ "${check_clang_tidy}" == "true" ]]; then
67+
cmake --build . --target check-clang-tidy
68+
fi
4969
fi
5070

5171
popd

‎cmake_modules/BuildUtils.cmake‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,12 +124,16 @@ function(add_paimon_lib LIB_NAME)
124124
target_link_libraries(${LIB_NAME}_shared
125125
PUBLIC "$<BUILD_INTERFACE:paimon_sanitizer_flags>")
126126

127-
target_link_options(${LIB_NAME}_shared
128-
PRIVATE
129-
-Wl,--exclude-libs,ALL
130-
-Wl,-Bsymbolic
131-
-Wl,-z,defs
132-
-Wl,--gc-sections)
127+
if(APPLE)
128+
target_link_options(${LIB_NAME}_shared PRIVATE -Wl,-dead_strip)
129+
else()
130+
target_link_options(${LIB_NAME}_shared
131+
PRIVATE
132+
-Wl,--exclude-libs,ALL
133+
-Wl,-Bsymbolic
134+
-Wl,-z,defs
135+
-Wl,--gc-sections)
136+
endif()
133137

134138
install(TARGETS ${LIB_NAME}_shared ${INSTALL_IS_OPTIONAL}
135139
EXPORT ${LIB_NAME}_targets

‎cmake_modules/SetupCxxFlags.cmake‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,17 @@ if("${BUILD_WARNING_LEVEL}" STREQUAL "CHECKIN")
7575
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wall")
7676
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wextra")
7777
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wdocumentation")
78-
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wglobal-constructors")
7978
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-missing-braces")
8079
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-unused-parameter")
8180
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-unknown-warning-option")
8281
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-constant-logical-operand")
8382
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-deprecated-declarations")
8483
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-deprecated-builtins")
84+
if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
85+
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-global-constructors")
86+
else()
87+
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wglobal-constructors")
88+
endif()
8589
elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
8690
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wall")
8791
set(CXX_COMMON_FLAGS "${CXX_COMMON_FLAGS} -Wno-conversion")

0 commit comments

Comments
 (0)