Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
bf09c204
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,发现更多精彩内容 >>
提交
bf09c204
编写于
10月 01, 2018
作者:
L
luc1ph3r
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Parquet data format: update CMake configurations
上级
f1d21189
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
51 addition
and
6 deletion
+51
-6
CMakeLists.txt
CMakeLists.txt
+1
-2
cmake/find_parquet.cmake
cmake/find_parquet.cmake
+31
-0
contrib/CMakeLists.txt
contrib/CMakeLists.txt
+13
-0
dbms/CMakeLists.txt
dbms/CMakeLists.txt
+6
-4
未找到文件。
CMakeLists.txt
浏览文件 @
bf09c204
...
...
@@ -263,8 +263,7 @@ include (cmake/find_re2.cmake)
include
(
cmake/find_rdkafka.cmake
)
include
(
cmake/find_capnp.cmake
)
include
(
cmake/find_llvm.cmake
)
include
(
cmake/Modules/FindArrow.cmake
)
include
(
cmake/Modules/FindParquet.cmake
)
include
(
cmake/find_parquet.cmake
)
include
(
cmake/find_contrib_lib.cmake
)
find_contrib_lib
(
cityhash
)
...
...
cmake/find_parquet.cmake
0 → 100644
浏览文件 @
bf09c204
option
(
USE_INTERNAL_PARQUET_LIBRARY
"Set to FALSE to use system parquet library instead of bundled"
${
NOT_UNBUNDLED
}
)
if
(
NOT EXISTS
"
${
ClickHouse_SOURCE_DIR
}
/contrib/arrow/cpp/CMakeLists.txt"
)
if
(
USE_INTERNAL_PARQUET_LIBRARY
)
message
(
WARNING
"submodule contrib/arrow (required for Parquet) is missing. to fix try run:
\n
git submodule update --init --recursive"
)
endif
()
set
(
USE_INTERNAL_PARQUET_LIBRARY 0
)
set
(
MISSING_INTERNAL_PARQUET_LIBRARY 1
)
endif
()
if
(
NOT USE_INTERNAL_PARQUET_LIBRARY
)
find_package
(
Arrow
)
find_package
(
Parquet
)
endif
()
if
(
ARROW_INCLUDE_DIR AND PARQUET_INCLUDE_DIR
)
elseif
(
NOT MISSING_INTERNAL_PARQUET_LIBRARY
)
set
(
USE_INTERNAL_PARQUET_LIBRARY 1
)
# TODO: is it required?
# set (ARROW_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src/arrow")
# set (PARQUET_INCLUDE_DIR "${ClickHouse_SOURCE_DIR}/contrib/arrow/cpp/src/parquet")
set
(
ARROW_LIBRARY arrow_static
)
set
(
PARQUET_LIBRARY parquet_static
)
set
(
USE_PARQUET 1
)
endif
()
if
(
USE_PARQUET
)
message
(
STATUS
"Using Parquet:
${
ARROW_INCLUDE_DIR
}
${
PARQUET_INCLUDE_DIR
}
"
)
else
()
message
(
STATUS
"Building without Parquet support"
)
endif
()
contrib/CMakeLists.txt
浏览文件 @
bf09c204
...
...
@@ -121,6 +121,19 @@ if (USE_INTERNAL_CAPNP_LIBRARY)
target_include_directories
(
${
CAPNP_LIBRARY
}
PUBLIC $<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
/capnproto/c++/src>
)
endif
()
if
(
USE_INTERNAL_PARQUET_LIBRARY
)
set
(
ARROW_COMPUTE ON
)
set
(
ARROW_PARQUET ON
)
set
(
ARROW_VERBOSE_THIRDPARTY_BUILD ON
)
set
(
PARQUET_ARROW_LINKAGE
"static"
)
set
(
ARROW_BUILD_STATIC ON
)
# Because Arrow uses CMAKE_SOURCE_DIR as a project path
# Hopefully will be fixed in https://github.com/apache/arrow/pull/2676
set
(
CMAKE_MODULE_PATH
${
CMAKE_MODULE_PATH
}
"
${
ClickHouse_SOURCE_DIR
}
/contrib/arrow/cpp/cmake_modules"
)
add_subdirectory
(
arrow/cpp
)
endif
()
if
(
USE_INTERNAL_POCO_LIBRARY
)
set
(
save_CMAKE_CXX_FLAGS
${
CMAKE_CXX_FLAGS
}
)
...
...
dbms/CMakeLists.txt
浏览文件 @
bf09c204
...
...
@@ -220,10 +220,12 @@ if (USE_RDKAFKA)
endif
()
endif
()
# TODO: make it optional
# if (USE_PARQUET)
target_link_libraries
(
dbms
${
ARROW_SHARED_LIB
}
${
PARQUET_SHARED_LIB
}
)
# endif ()
if
(
USE_PARQUET
)
target_link_libraries
(
dbms
${
PARQUET_LIBRARY
}
${
ARROW_LIBRARY
}
)
if
(
NOT USE_INTERNAL_PARQUET_LIBRARY
)
target_include_directories
(
dbms BEFORE PRIVATE
${
PARQUET_INCLUDE_DIR
}
${
ARROW_INCLUDE_DIR
}
)
endif
()
endif
()
target_link_libraries
(
dbms
Threads::Threads
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录