From f76554bd3c927c917f4fd698ea74db85b22e220c Mon Sep 17 00:00:00 2001 From: "jinli.zjw" Date: Tue, 21 Jul 2026 15:30:01 +0800 Subject: [PATCH 1/2] build: fetch Boost from OSS --- LICENSE | 34 ------------------------- NOTICE | 3 --- cmake_modules/ThirdpartyToolchain.cmake | 12 ++++++++- third_party/boost/boost_1_66_0.tar.gz | 3 --- third_party/versions.txt | 2 +- 5 files changed, 12 insertions(+), 42 deletions(-) delete mode 100644 third_party/boost/boost_1_66_0.tar.gz diff --git a/LICENSE b/LICENSE index 54b4b1956..79afe0122 100644 --- a/LICENSE +++ b/LICENSE @@ -462,40 +462,6 @@ License: https://www.apache.org/licenses/LICENSE-2.0 -------------------------------------------------------------------------------- -This product includes code from boost. - -* Boost source code in third_party/boost/ directory - -Copyright: 2003-2023 The Boost Authors -Home page: https://www.boost.org/ -License: https://www.boost.org/LICENSE_1_0.txt - -Boost Software License - Version 1.0 - August 17th, 2003 - -Permission is hereby granted, free of charge, to any person or organization -obtaining a copy of the software and accompanying documentation covered by -this license (the "Software") to use, reproduce, display, distribute, -execute, and transmit the Software, and to prepare derivative works of the -Software, and to permit third-parties to whom the Software is furnished to -do so, all subject to the following: - -The copyright notices in the Software and this entire statement, including -the above license grant, this restriction and the following disclaimer, -must be included in all copies of the Software, in whole or in part, and -all derivative works of the Software, unless such copies or derivative -works are solely in the form of machine-executable object code generated by -a source language processor. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. - --------------------------------------------------------------------------------- - This product includes code from LucenePlusPlus. * LucenePlusPlus utility in src/paimon/global_index/lucene/ directory diff --git a/NOTICE b/NOTICE index 7f39800cb..61eb0d373 100644 --- a/NOTICE +++ b/NOTICE @@ -29,9 +29,6 @@ Copyright (C) 2012-2023 Yann Collet This product includes software from CRoaring project (Apache 2.0) Copyright 2016-2022 The CRoaring authors -This product includes software from boost project (BSL 1.0) -Copyright 2003-2023 The Boost authors - This product includes software from LucenePlusPlus project (Apache 2.0) Copyright 2009-2014 Alan Wright. diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake index 30763df10..1b31cd9d7 100644 --- a/cmake_modules/ThirdpartyToolchain.cmake +++ b/cmake_modules/ThirdpartyToolchain.cmake @@ -305,6 +305,16 @@ else() ) endif() +if(DEFINED ENV{PAIMON_BOOST_URL}) + set(BOOST_SOURCE_URL "$ENV{PAIMON_BOOST_URL}") +elseif(EXISTS "${THIRDPARTY_DIR}/${PAIMON_BOOST_PKG_NAME}") + set_urls(BOOST_SOURCE_URL "${THIRDPARTY_DIR}/${PAIMON_BOOST_PKG_NAME}") +else() + set_urls(BOOST_SOURCE_URL + "https://paimon-cpp.oss-cn-beijing.aliyuncs.com/thirdparty/boost/${PAIMON_BOOST_PKG_NAME}" + ) +endif() + if(APPLE) set(JINDOSDK_C_DYNAMIC_LIB_NAME "jindosdk_c.${PAIMON_JINDOSDK_C_BUILD_VERSION}") set(JINDOSDK_C_DYNAMIC_LIB_FILE "lib${JINDOSDK_C_DYNAMIC_LIB_NAME}.dylib") @@ -937,7 +947,7 @@ macro(build_boost) "using ${BOOST_TOOLSET} : : \"${CMAKE_CXX_COMPILER}\" ;\n") externalproject_add(boost_ep - URL "${THIRDPARTY_DIR}/boost/${PAIMON_BOOST_PKG_NAME}" + URL ${BOOST_SOURCE_URL} URL_HASH "SHA256=${PAIMON_BOOST_BUILD_SHA256_CHECKSUM}" CONFIGURE_COMMAND ${BOOST_PREFIX}/src/boost_ep/bootstrap.sh --with-libraries=date_time,filesystem,iostreams,regex,system,thread,chrono,atomic diff --git a/third_party/boost/boost_1_66_0.tar.gz b/third_party/boost/boost_1_66_0.tar.gz deleted file mode 100644 index 315fbbbd9..000000000 --- a/third_party/boost/boost_1_66_0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:28e9200637800fbfd1292b2c6876189dba7e8e1c5282c71fac6515e96f7af2b0 -size 88165095 diff --git a/third_party/versions.txt b/third_party/versions.txt index 20d9e9d27..5dc6e3718 100644 --- a/third_party/versions.txt +++ b/third_party/versions.txt @@ -114,7 +114,6 @@ PAIMON_JIEBA_BUILD_VERSION=v5.6.0 PAIMON_JIEBA_BUILD_SHA256_CHECKSUM=e6e517b778e0f4a99cbed1ee3eaa041616b74bc685e03a6ca08887ad9cedfe49 PAIMON_JIEBA_PKG_NAME=jieba-${PAIMON_JIEBA_BUILD_VERSION}.tar.gz -# Boost source package is bundled at third_party/boost/ PAIMON_BOOST_BUILD_VERSION=1_66_0 PAIMON_BOOST_BUILD_SHA256_CHECKSUM=28e9200637800fbfd1292b2c6876189dba7e8e1c5282c71fac6515e96f7af2b0 PAIMON_BOOST_PKG_NAME=boost_${PAIMON_BOOST_BUILD_VERSION}.tar.gz @@ -147,4 +146,5 @@ DEPENDENCIES=( "PAIMON_LUCENE_URL ${PAIMON_LUCENE_PKG_NAME} ${THIRDPARTY_MIRROR_URL}https://github.com/luceneplusplus/LucenePlusPlus/archive/refs/tags/rel_${PAIMON_LUCENE_BUILD_VERSION}.tar.gz" "PAIMON_LIMONP_URL ${PAIMON_LIMONP_PKG_NAME} ${THIRDPARTY_MIRROR_URL}https://github.com/yanyiwu/limonp/archive/refs/tags/v${PAIMON_LIMONP_BUILD_VERSION}.tar.gz" "PAIMON_JIEBA_URL ${PAIMON_JIEBA_PKG_NAME} ${THIRDPARTY_MIRROR_URL}https://github.com/yanyiwu/cppjieba/archive/refs/tags/${PAIMON_JIEBA_BUILD_VERSION}.tar.gz" + "PAIMON_BOOST_URL ${PAIMON_BOOST_PKG_NAME} https://paimon-cpp.oss-cn-beijing.aliyuncs.com/thirdparty/boost/${PAIMON_BOOST_PKG_NAME}" ) From 09d0d0e8344c6049febb1e706d5e1855442f6757 Mon Sep 17 00:00:00 2001 From: "jinli.zjw" Date: Tue, 21 Jul 2026 16:33:18 +0800 Subject: [PATCH 2/2] build: define network test macro globally --- CMakeLists.txt | 4 +--- src/paimon/CMakeLists.txt | 4 ---- test/inte/CMakeLists.txt | 4 ---- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index da9bbd652..588abe489 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -73,9 +73,7 @@ if(PAIMON_ENABLE_JINDO) add_definitions(-DPAIMON_ENABLE_JINDO) endif() if(PAIMON_ENABLE_NETWORK_TESTS) - if(NOT PAIMON_BUILD_TESTS) - message(FATAL_ERROR "PAIMON_ENABLE_NETWORK_TESTS requires PAIMON_BUILD_TESTS=ON") - endif() + add_definitions(-DPAIMON_ENABLE_NETWORK_TESTS) endif() if(PAIMON_USE_CXX11_ABI) add_definitions(-D_GLIBCXX_USE_CXX11_ABI=1) diff --git a/src/paimon/CMakeLists.txt b/src/paimon/CMakeLists.txt index 457970681..973ea9c6d 100644 --- a/src/paimon/CMakeLists.txt +++ b/src/paimon/CMakeLists.txt @@ -823,8 +823,4 @@ if(PAIMON_BUILD_TESTS) EXTRA_INCLUDES ${JINDOSDK_INCLUDE_DIR}) - if(PAIMON_ENABLE_NETWORK_TESTS) - target_compile_definitions(paimon-fs-test PRIVATE PAIMON_ENABLE_NETWORK_TESTS) - endif() - endif() diff --git a/test/inte/CMakeLists.txt b/test/inte/CMakeLists.txt index 2c537f9d4..535394809 100644 --- a/test/inte/CMakeLists.txt +++ b/test/inte/CMakeLists.txt @@ -40,10 +40,6 @@ if(PAIMON_BUILD_TESTS) ${TEST_STATIC_LINK_LIBS} test_utils_static ${GTEST_LINK_TOOLCHAIN}) - if(PAIMON_ENABLE_NETWORK_TESTS) - target_compile_definitions(paimon-write-and-read-inte-test - PRIVATE PAIMON_ENABLE_NETWORK_TESTS) - endif() add_paimon_test(clean_inte_test STATIC_LINK_LIBS