Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
2dot5
ClickHouse
提交
b0469def
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,发现更多精彩内容 >>
提交
b0469def
编写于
1月 09, 2018
作者:
P
proller
提交者:
alexey-milovidov
1月 10, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Remove package clickhouse-compressor, simpler pbuilder test
上级
d5f6c836
变更
10
隐藏空白更改
内联
并排
Showing
10 changed file
with
39 addition
and
31 deletion
+39
-31
dbms/src/Server/CMakeLists.txt
dbms/src/Server/CMakeLists.txt
+6
-4
debian/clickhouse-client.install
debian/clickhouse-client.install
+2
-0
debian/clickhouse-compressor.install
debian/clickhouse-compressor.install
+0
-1
debian/clickhouse-test.install
debian/clickhouse-test.install
+0
-1
debian/control
debian/control
+3
-14
debian/pbuilder-hooks/B90test-server
debian/pbuilder-hooks/B90test-server
+24
-0
debian/pbuilder-hooks/B92test-pkg
debian/pbuilder-hooks/B92test-pkg
+0
-1
debian/pbuilder-test/000_server_start
debian/pbuilder-test/000_server_start
+0
-4
debian/pbuilder-test/800_server_stop
debian/pbuilder-test/800_server_stop
+0
-3
utils/compressor/CMakeLists.txt
utils/compressor/CMakeLists.txt
+4
-3
未找到文件。
dbms/src/Server/CMakeLists.txt
浏览文件 @
b0469def
...
...
@@ -61,9 +61,9 @@ if (CLICKHOUSE_SPLIT_BINARY)
target_link_libraries
(
clickhouse-performance-test clickhouse-performance-test-lib dbms
)
add_executable
(
clickhouse-extract-from-config clickhouse-extract-from-config.cpp
)
target_link_libraries
(
clickhouse-extract-from-config clickhouse-extract-from-config-lib
)
#
now
in utils
#
add_executable (clickhouse-compressor clickhouse-compressor.cpp)
#
target_link_libraries (clickhouse-compressor clickhouse-compressor-lib)
#
Also
in utils
add_executable
(
clickhouse-compressor clickhouse-compressor.cpp
)
target_link_libraries
(
clickhouse-compressor clickhouse-compressor-lib
)
add_executable
(
clickhouse-format clickhouse-format.cpp
)
target_link_libraries
(
clickhouse-format clickhouse-format-lib dbms
)
...
...
@@ -108,6 +108,7 @@ else ()
add_custom_target
(
clickhouse-benchmark ALL COMMAND
${
CMAKE_COMMAND
}
-E create_symlink clickhouse clickhouse-benchmark DEPENDS clickhouse
)
add_custom_target
(
clickhouse-performance-test ALL COMMAND
${
CMAKE_COMMAND
}
-E create_symlink clickhouse clickhouse-performance-test DEPENDS clickhouse
)
add_custom_target
(
clickhouse-extract-from-config ALL COMMAND
${
CMAKE_COMMAND
}
-E create_symlink clickhouse clickhouse-extract-from-config DEPENDS clickhouse
)
add_custom_target
(
clickhouse-compressor ALL COMMAND
${
CMAKE_COMMAND
}
-E create_symlink clickhouse clickhouse-compressor DEPENDS clickhouse
)
add_custom_target
(
clickhouse-format ALL COMMAND
${
CMAKE_COMMAND
}
-E create_symlink clickhouse clickhouse-format DEPENDS clickhouse
)
# install always because depian package want this files:
add_custom_target
(
clickhouse-clang ALL COMMAND
${
CMAKE_COMMAND
}
-E create_symlink clickhouse clickhouse-clang DEPENDS clickhouse
)
...
...
@@ -121,12 +122,13 @@ else ()
${
CMAKE_CURRENT_BINARY_DIR
}
/clickhouse-benchmark
${
CMAKE_CURRENT_BINARY_DIR
}
/clickhouse-performance-test
${
CMAKE_CURRENT_BINARY_DIR
}
/clickhouse-extract-from-config
${
CMAKE_CURRENT_BINARY_DIR
}
/clickhouse-compressor
${
CMAKE_CURRENT_BINARY_DIR
}
/clickhouse-format
${
CMAKE_CURRENT_BINARY_DIR
}
/clickhouse-clang
${
CMAKE_CURRENT_BINARY_DIR
}
/clickhouse-lld
DESTINATION
${
CMAKE_INSTALL_BINDIR
}
COMPONENT clickhouse
)
add_custom_target
(
clickhouse-bundle ALL DEPENDS clickhouse-server clickhouse-client clickhouse-local clickhouse-benchmark clickhouse-performance-test clickhouse-extract-from-config clickhouse-format clickhouse-clang clickhouse-lld
)
add_custom_target
(
clickhouse-bundle ALL DEPENDS clickhouse-server clickhouse-client clickhouse-local clickhouse-benchmark clickhouse-performance-test clickhouse-extract-from-config clickhouse-
compressor clickhouse-
format clickhouse-clang clickhouse-lld
)
endif
()
install
(
...
...
debian/clickhouse-client.install
浏览文件 @
b0469def
/
usr
/
bin
/
clickhouse
-
client
/
usr
/
bin
/
clickhouse
-
local
/
usr
/
bin
/
clickhouse
-
compressor
/
usr
/
bin
/
clickhouse
-
benchmark
/
etc
/
clickhouse
-
client
/
config
.
xml
/
usr
/
bin
/
clickhouse
-
extract
-
from
-
config
debian/clickhouse-compressor.install
已删除
100644 → 0
浏览文件 @
d5f6c836
/
usr
/
bin
/
clickhouse
-
compressor
debian/clickhouse-test.install
浏览文件 @
b0469def
usr
/
bin
/
clickhouse
-
test
usr
/
share
/
clickhouse
-
test
/*
usr
/
bin
/
clickhouse
-
performance
-
test
usr
/
bin
/
clickhouse
-
benchmark
debian/control
浏览文件 @
b0469def
Source: clickhouse
Section: database
Priority: optional
Maintainer: Alexey Milovidov <milovidov@yandex-team.ru>
Build-Depends: debhelper (>= 9),
...
...
@@ -11,16 +12,8 @@ Build-Depends: debhelper (>= 9),
libssl-dev,
unixodbc-dev
Standards-Version: 3.8.0
Section: libs
Package: clickhouse-compressor
Section: libdevel
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: clickhouse-compressor
Package: clickhouse-client
Section: libdevel
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, clickhouse-server-base (= ${binary:Version})
Description: Client binary for clickhouse
...
...
@@ -30,7 +23,6 @@ Description: Client binary for clickhouse
This package provides clickhouse-client , clickhouse-local and clickhouse-benchmark
Package: clickhouse-server-base
Section: libdevel
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, tzdata
Description: Server binary for clickhouse
...
...
@@ -40,7 +32,6 @@ Description: Server binary for clickhouse
This package provides clickhouse common configuration files
Package: clickhouse-server-common
Section: libdevel
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, clickhouse-server-base (= ${binary:Version})
Description: clickhouse-server-common
...
...
@@ -54,10 +45,8 @@ Depends: ${misc:Depends}, clickhouse-server-base (= ${binary:Version})
Description: debugging symbols for clickhouse-server-base
This package contains the debugging symbols for clickhouse-server-base.
Package: clickhouse-test
Section: Database
Priority: extra
#Priority: extra
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, clickhouse-client,
clickhouse-compressor,
bash, expect, python, python-lxml, python-termcolor, curl, perl, sudo
Depends: ${shlibs:Depends}, ${misc:Depends}, clickhouse-client, bash, expect, python, python-lxml, python-termcolor, curl, perl, sudo
Description: Clickhouse tests
debian/pbuilder-
test/100_test_run
→
debian/pbuilder-
hooks/B90test-server
浏览文件 @
b0469def
#!/bin/bash
#!/usr/bin/env bash
set
-e
set
-x
for
PKG
in
$(
ls
/tmp/buildd/
*
.deb |
sed
-e
's,.*/,,;s,_.*,,'
)
;
do
apt-get
install
-y
--force-yes
"
$PKG
"
||
true
apt-get remove
-y
"
$PKG
"
||
true
done
dpkg
-i
/tmp/buildd/
*
.deb
||
true
apt
install
-y
-f
--allow-downgrades
service clickhouse-server start
sleep
3
clickhouse-client
-q
"SELECT * from system.build_options;"
# --no-shard because default server listen only :: and 127.0.0.1
[
-n
"
$TEST_RUN
"
]
&&
clickhouse-test
--no-shard
--queries
/usr/share/clickhouse-test/queries
--tmp
/tmp/clickhouse-test/
||
true
service clickhouse-server stop
debian/pbuilder-hooks/B92test-pkg
已删除
120000 → 0
浏览文件 @
d5f6c836
/usr/share/doc/pbuilder/examples/B92test-pkg
\ No newline at end of file
debian/pbuilder-test/000_server_start
已删除
100755 → 0
浏览文件 @
d5f6c836
#!/bin/bash
service clickhouse-server start
sleep
3
debian/pbuilder-test/800_server_stop
已删除
100755 → 0
浏览文件 @
d5f6c836
#!/bin/bash
service clickhouse-server stop
utils/compressor/CMakeLists.txt
浏览文件 @
b0469def
find_package
(
Threads
)
add_executable
(
clickhouse-compressor main.cpp
)
target_link_libraries
(
clickhouse-compressor clickhouse-compressor-lib
)
add_executable
(
util-clickhouse-compressor main.cpp
)
target_link_libraries
(
util-clickhouse-compressor clickhouse-compressor-lib
)
set_target_properties
(
util-clickhouse-compressor PROPERTIES OUTPUT_NAME
"clickhouse-compressor"
)
install
(
TARGETS
clickhouse-compressor RUNTIME DESTINATION
${
CMAKE_INSTALL_BINDIR
}
COMPONENT clickhouse-compressor
)
#install (TARGETS util-
clickhouse-compressor RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT clickhouse-compressor)
add_executable
(
zstd_test zstd_test.cpp
)
target_link_libraries
(
zstd_test
${
ZSTD_LIBRARY
}
Threads::Threads
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录