Skip to content
Open
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
4 changes: 1 addition & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
34 changes: 0 additions & 34 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions NOTICE
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
12 changes: 11 additions & 1 deletion cmake_modules/ThirdpartyToolchain.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions src/paimon/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
4 changes: 0 additions & 4 deletions test/inte/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions third_party/boost/boost_1_66_0.tar.gz

This file was deleted.

2 changes: 1 addition & 1 deletion third_party/versions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}"
)
Loading