Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
5f9496bf
C
ClickHouse
项目概览
2dot5
/
ClickHouse
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
ClickHouse
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
5f9496bf
编写于
2月 16, 2020
作者:
A
alexey-milovidov
提交者:
GitHub
2月 16, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #9148 from ClickHouse/revert-9041-fix27
Revert "Build fixes"
上级
36483e04
355ff00c
变更
16
隐藏空白更改
内联
并排
Showing
16 changed file
with
29 addition
and
61 deletion
+29
-61
cmake/find/h3.cmake
cmake/find/h3.cmake
+2
-1
cmake/find/zlib.cmake
cmake/find/zlib.cmake
+1
-1
cmake/tools.cmake
cmake/tools.cmake
+3
-5
contrib/CMakeLists.txt
contrib/CMakeLists.txt
+5
-9
contrib/arrow-cmake/CMakeLists.txt
contrib/arrow-cmake/CMakeLists.txt
+0
-1
contrib/boost-cmake/CMakeLists.txt
contrib/boost-cmake/CMakeLists.txt
+0
-1
contrib/libxml2-cmake/CMakeLists.txt
contrib/libxml2-cmake/CMakeLists.txt
+1
-1
contrib/replxx-cmake/CMakeLists.txt
contrib/replxx-cmake/CMakeLists.txt
+1
-4
dbms/CMakeLists.txt
dbms/CMakeLists.txt
+2
-6
dbms/src/Functions/geoToH3.cpp
dbms/src/Functions/geoToH3.cpp
+1
-5
dbms/src/Functions/h3EdgeAngle.cpp
dbms/src/Functions/h3EdgeAngle.cpp
+1
-5
dbms/src/Functions/h3EdgeLengthM.cpp
dbms/src/Functions/h3EdgeLengthM.cpp
+2
-7
dbms/src/Functions/h3GetResolution.cpp
dbms/src/Functions/h3GetResolution.cpp
+1
-5
dbms/src/Functions/h3IsValid.cpp
dbms/src/Functions/h3IsValid.cpp
+1
-5
dbms/src/Functions/h3kRing.cpp
dbms/src/Functions/h3kRing.cpp
+1
-5
debian/pbuilder-hooks/B90test-server
debian/pbuilder-hooks/B90test-server
+7
-0
未找到文件。
cmake/find/h3.cmake
浏览文件 @
5f9496bf
...
...
@@ -15,8 +15,9 @@ if (USE_INTERNAL_H3_LIBRARY)
set
(
H3_LIBRARY h3
)
set
(
H3_INCLUDE_DIR
${
ClickHouse_SOURCE_DIR
}
/contrib/h3/src/h3lib/include
)
elseif
(
NOT MISSING_INTERNAL_H3_LIBRARY
)
set
(
H3_INCLUDE_PATHS /usr/local/include/h3
)
find_library
(
H3_LIBRARY h3
)
find_path
(
H3_INCLUDE_DIR NAMES h3
/h3
api.h PATHS
${
H3_INCLUDE_PATHS
}
)
find_path
(
H3_INCLUDE_DIR NAMES h3api.h PATHS
${
H3_INCLUDE_PATHS
}
)
endif
()
if
(
H3_LIBRARY AND H3_INCLUDE_DIR
)
...
...
cmake/find/zlib.cmake
浏览文件 @
5f9496bf
...
...
@@ -29,7 +29,7 @@ if (NOT ZLIB_FOUND AND NOT MISSING_INTERNAL_ZLIB_LIBRARY)
set
(
ZLIB_INCLUDE_DIRS
${
ZLIB_INCLUDE_DIR
}
)
# for poco
set
(
ZLIB_INCLUDE_DIRECTORIES
${
ZLIB_INCLUDE_DIR
}
)
# for protobuf
set
(
ZLIB_FOUND 1
)
# for poco
if
(
USE_STATIC_LIBRARIES
AND DEFINED BUILD_SHARED_LIBS
)
if
(
USE_STATIC_LIBRARIES
)
set
(
ZLIB_LIBRARIES zlibstatic CACHE INTERNAL
""
)
else
()
set
(
ZLIB_LIBRARIES zlib CACHE INTERNAL
""
)
...
...
cmake/tools.cmake
浏览文件 @
5f9496bf
...
...
@@ -32,9 +32,8 @@ else ()
find_program
(
GOLD_PATH NAMES
"ld.gold"
"gold"
)
endif
()
if
(
NOT OS_FREEBSD
)
# We prefer LLD linker over Gold or BFD.
if
(
NOT LINKER_NAME
)
if
(
NOT LINKER_NAME
)
if
(
LLD_PATH
)
if
(
COMPILER_GCC
)
# GCC driver requires one of supported linker names like "lld".
...
...
@@ -44,9 +43,9 @@ if (NOT OS_FREEBSD)
set
(
LINKER_NAME
${
LLD_PATH
}
)
endif
()
endif
()
endif
()
endif
()
if
(
NOT LINKER_NAME
)
if
(
NOT LINKER_NAME
)
if
(
GOLD_PATH
)
if
(
COMPILER_GCC
)
set
(
LINKER_NAME
"gold"
)
...
...
@@ -54,7 +53,6 @@ if (NOT OS_FREEBSD)
set
(
LINKER_NAME
${
GOLD_PATH
}
)
endif
()
endif
()
endif
()
endif
()
if
(
LINKER_NAME
)
...
...
contrib/CMakeLists.txt
浏览文件 @
5f9496bf
...
...
@@ -54,6 +54,7 @@ if (USE_INTERNAL_BTRIE_LIBRARY)
endif
()
if
(
USE_INTERNAL_ZLIB_LIBRARY
)
unset
(
BUILD_SHARED_LIBS CACHE
)
set
(
ZLIB_ENABLE_TESTS 0 CACHE INTERNAL
""
)
set
(
SKIP_INSTALL_ALL 1 CACHE INTERNAL
""
)
set
(
ZLIB_COMPAT 1 CACHE INTERNAL
""
)
# also enables WITH_GZFILEOP
...
...
@@ -69,14 +70,10 @@ if (USE_INTERNAL_ZLIB_LIBRARY)
add_subdirectory
(
${
INTERNAL_ZLIB_NAME
}
)
# We should use same defines when including zlib.h as used when zlib compiled
target_compile_definitions
(
zlib PUBLIC ZLIB_COMPAT WITH_GZFILEOP
)
if
(
TARGET zlibstatic
)
target_compile_definitions
(
zlibstatic PUBLIC ZLIB_COMPAT WITH_GZFILEOP
)
endif
()
target_compile_definitions
(
zlibstatic PUBLIC ZLIB_COMPAT WITH_GZFILEOP
)
if
(
ARCH_AMD64 OR ARCH_AARCH64
)
target_compile_definitions
(
zlib PUBLIC X86_64 UNALIGNED_OK
)
if
(
TARGET zlibstatic
)
target_compile_definitions
(
zlibstatic PUBLIC X86_64 UNALIGNED_OK
)
endif
()
target_compile_definitions
(
zlib PUBLIC X86_64 UNALIGNED_OK
)
target_compile_definitions
(
zlibstatic PUBLIC X86_64 UNALIGNED_OK
)
endif
()
endif
()
...
...
@@ -119,7 +116,7 @@ function(mysql_support)
endif
()
if
(
USE_INTERNAL_ZLIB_LIBRARY
)
set
(
ZLIB_FOUND ON
)
set
(
ZLIB_LIBRARY
${
ZLIB_LIBRARIES
}
)
set
(
ZLIB_LIBRARY
zlibstatic
)
set
(
WITH_EXTERNAL_ZLIB ON
)
endif
()
add_subdirectory
(
mariadb-connector-c
)
...
...
@@ -262,7 +259,6 @@ if (USE_EMBEDDED_COMPILER AND USE_INTERNAL_LLVM_LIBRARY)
set
(
LLVM_ENABLE_PIC 0 CACHE INTERNAL
""
)
set
(
LLVM_TARGETS_TO_BUILD
"X86;AArch64"
CACHE STRING
""
)
add_subdirectory
(
llvm/llvm
)
target_include_directories
(
LLVMSupport SYSTEM BEFORE PRIVATE
${
ZLIB_INCLUDE_DIR
}
)
endif
()
if
(
USE_INTERNAL_LIBGSASL_LIBRARY
)
...
...
contrib/arrow-cmake/CMakeLists.txt
浏览文件 @
5f9496bf
...
...
@@ -348,7 +348,6 @@ if (ARROW_WITH_ZLIB)
endif
()
if
(
ARROW_WITH_ZSTD
)
target_link_libraries
(
${
ARROW_LIBRARY
}
PRIVATE
${
ZSTD_LIBRARY
}
)
target_include_directories
(
${
ARROW_LIBRARY
}
SYSTEM BEFORE PRIVATE
${
ZLIB_INCLUDE_DIR
}
)
endif
()
target_include_directories
(
${
ARROW_LIBRARY
}
PRIVATE SYSTEM
${
ORC_INCLUDE_DIR
}
)
...
...
contrib/boost-cmake/CMakeLists.txt
浏览文件 @
5f9496bf
...
...
@@ -41,5 +41,4 @@ endif()
if
(
USE_INTERNAL_AVRO_LIBRARY
)
add_boost_lib
(
iostreams
)
target_link_libraries
(
boost_iostreams_internal PUBLIC
${
ZLIB_LIBRARIES
}
)
target_include_directories
(
boost_iostreams_internal SYSTEM BEFORE PRIVATE
${
ZLIB_INCLUDE_DIR
}
)
endif
()
contrib/libxml2-cmake/CMakeLists.txt
浏览文件 @
5f9496bf
...
...
@@ -59,4 +59,4 @@ endif()
target_include_directories
(
libxml2 PUBLIC
${
CMAKE_CURRENT_SOURCE_DIR
}
/linux_x86_64/include
)
target_include_directories
(
libxml2 PUBLIC
${
LIBXML2_SOURCE_DIR
}
/include
)
target_include_directories
(
libxml2
SYSTEM BEFORE PRIVATE
${
ZLIB_INCLUDE_DIR
}
)
target_include_directories
(
libxml2
PRIVATE
${
ZLIB_INCLUDE_DIR
}
/include
)
contrib/replxx-cmake/CMakeLists.txt
浏览文件 @
5f9496bf
...
...
@@ -45,10 +45,7 @@ if (ENABLE_REPLXX)
endif
()
endif
()
if
(
NOT
(
COMPILER_GCC AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 9
))
target_compile_options
(
replxx PUBLIC -Wno-documentation
)
endif
()
target_compile_options
(
replxx PUBLIC -Wno-documentation
)
target_compile_definitions
(
replxx PUBLIC USE_REPLXX=1
)
message
(
STATUS
"Using replxx"
)
...
...
dbms/CMakeLists.txt
浏览文件 @
5f9496bf
...
...
@@ -176,12 +176,8 @@ elseif (COMPILER_GCC)
add_cxx_compile_options
(
-Wsizeof-array-argument
)
# Warn for suspicious length parameters to certain string and memory built-in functions if the argument uses sizeof
add_cxx_compile_options
(
-Wsizeof-pointer-memaccess
)
if
(
CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 9
)
# Warn about overriding virtual functions that are not marked with the override keyword
add_cxx_compile_options
(
-Wsuggest-override
)
endif
()
# Warn about overriding virtual functions that are not marked with the override keyword
add_cxx_compile_options
(
-Wsuggest-override
)
# Warn whenever a switch statement has an index of boolean type and the case values are outside the range of a boolean type
add_cxx_compile_options
(
-Wswitch-bool
)
# Warn if a self-comparison always evaluates to true or false
...
...
dbms/src/Functions/geoToH3.cpp
浏览文件 @
5f9496bf
...
...
@@ -10,11 +10,7 @@
#include <Common/typeid_cast.h>
#include <ext/range.h>
#if __has_include(<h3/h3api.h>)
# include <h3/h3api.h>
#else
# include <h3api.h>
#endif
#include <h3api.h>
namespace
DB
...
...
dbms/src/Functions/h3EdgeAngle.cpp
浏览文件 @
5f9496bf
...
...
@@ -7,11 +7,7 @@
# include <Common/typeid_cast.h>
# include <ext/range.h>
# if __has_include(<h3/h3api.h>)
# include <h3/h3api.h>
# else
# include <h3api.h>
# endif
# include <h3api.h>
namespace
DB
...
...
dbms/src/Functions/h3EdgeLengthM.cpp
浏览文件 @
5f9496bf
...
...
@@ -8,13 +8,8 @@
# include <Common/typeid_cast.h>
# include <ext/range.h>
# if __has_include(<h3/h3api.h>)
# include <h3/h3api.h>
# include <h3/constants.h>
# else
# include <h3api.h>
# include <constants.h>
# endif
# include <h3api.h>
# include <constants.h>
namespace
DB
...
...
dbms/src/Functions/h3GetResolution.cpp
浏览文件 @
5f9496bf
...
...
@@ -7,11 +7,7 @@
# include <Common/typeid_cast.h>
# include <ext/range.h>
# if __has_include(<h3/h3api.h>)
# include <h3/h3api.h>
# else
# include <h3api.h>
# endif
# include <h3api.h>
namespace
DB
...
...
dbms/src/Functions/h3IsValid.cpp
浏览文件 @
5f9496bf
...
...
@@ -7,11 +7,7 @@
# include <Common/typeid_cast.h>
# include <ext/range.h>
# if __has_include(<h3/h3api.h>)
# include <h3/h3api.h>
# else
# include <h3api.h>
# endif
# include <h3api.h>
namespace
DB
...
...
dbms/src/Functions/h3kRing.cpp
浏览文件 @
5f9496bf
...
...
@@ -11,11 +11,7 @@
# include <Common/typeid_cast.h>
# include <ext/range.h>
# if __has_include(<h3/h3api.h>)
# include <h3/h3api.h>
# else
# include <h3api.h>
# endif
# include <h3api.h>
namespace
DB
...
...
debian/pbuilder-hooks/B90test-server
浏览文件 @
5f9496bf
...
...
@@ -8,6 +8,11 @@ PACKAGE_INSTALL=${PACKAGE_INSTALL=1}
TEST_PORT_RANDOM
=
${
TEST_PORT_RANDOM
=1
}
if
[
"
${
PACKAGE_INSTALL
}
"
]
;
then
#for PKG in $(ls /tmp/buildd/*.deb | sed -e's,.*/,,;s,_.*,,' ); do
# apt-get install -y --force-yes "$PKG" ||:
# apt-get remove -y "$PKG" ||:
#done
dpkg
--auto-deconfigure
-i
/tmp/buildd/
*
.deb
||
:
apt
install
-y
-f
--allow-downgrades
||
:
dpkg
-l
|
grep
clickhouse
||
:
...
...
@@ -40,6 +45,8 @@ export CLICKHOUSE_PORT_TCP_SECURE=${CLICKHOUSE_PORT_TCP_SECURE:=9440}
export
CLICKHOUSE_PORT_HTTPS
=
${
CLICKHOUSE_PORT_HTTPS
:
=8443
}
if
[
"
${
TEST_CONNECT
}
"
]
;
then
sed
-i
's/ssl_conf = ssl_sect/#ssl_conf = ssl_sect/g'
/etc/ssl/openssl.cnf
||
:
[
"
${
TEST_PORT_RANDOM
}
"
]
&&
echo
"<yandex><http_port>
${
CLICKHOUSE_PORT_HTTP
}
</http_port><tcp_port>
${
CLICKHOUSE_PORT_TCP
}
</tcp_port><interserver_http_port>
${
CLICKHOUSE_PORT_INTERSERVER
}
</interserver_http_port></yandex>"
>
/etc/clickhouse-server/config.d/port.xml
if
[
"
${
TEST_SSL
}
"
]
;
then
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录