From b0469def79fc43dc5a64e8425bd6d5282ba28172 Mon Sep 17 00:00:00 2001 From: proller Date: Tue, 9 Jan 2018 23:20:13 +0300 Subject: [PATCH] Remove package clickhouse-compressor, simpler pbuilder test --- dbms/src/Server/CMakeLists.txt | 10 ++++++---- debian/clickhouse-client.install | 2 ++ debian/clickhouse-compressor.install | 1 - debian/clickhouse-test.install | 1 - debian/control | 17 +++-------------- debian/pbuilder-hooks/B90test-server | 24 ++++++++++++++++++++++++ debian/pbuilder-hooks/B92test-pkg | 1 - debian/pbuilder-test/000_server_start | 4 ---- debian/pbuilder-test/100_test_run | 6 ------ debian/pbuilder-test/800_server_stop | 3 --- utils/compressor/CMakeLists.txt | 7 ++++--- 11 files changed, 39 insertions(+), 37 deletions(-) delete mode 100644 debian/clickhouse-compressor.install create mode 100755 debian/pbuilder-hooks/B90test-server delete mode 120000 debian/pbuilder-hooks/B92test-pkg delete mode 100755 debian/pbuilder-test/000_server_start delete mode 100755 debian/pbuilder-test/100_test_run delete mode 100755 debian/pbuilder-test/800_server_stop diff --git a/dbms/src/Server/CMakeLists.txt b/dbms/src/Server/CMakeLists.txt index 8c24d377ed3..3a1bd47244d 100644 --- a/dbms/src/Server/CMakeLists.txt +++ b/dbms/src/Server/CMakeLists.txt @@ -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 ( diff --git a/debian/clickhouse-client.install b/debian/clickhouse-client.install index 0c3cb0d000e..e41d7a4382f 100644 --- a/debian/clickhouse-client.install +++ b/debian/clickhouse-client.install @@ -1,4 +1,6 @@ /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 diff --git a/debian/clickhouse-compressor.install b/debian/clickhouse-compressor.install deleted file mode 100644 index 413e28a3721..00000000000 --- a/debian/clickhouse-compressor.install +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/clickhouse-compressor diff --git a/debian/clickhouse-test.install b/debian/clickhouse-test.install index 6c9a2c182fe..a42fd0ed7f4 100644 --- a/debian/clickhouse-test.install +++ b/debian/clickhouse-test.install @@ -1,4 +1,3 @@ usr/bin/clickhouse-test usr/share/clickhouse-test/* usr/bin/clickhouse-performance-test -usr/bin/clickhouse-benchmark diff --git a/debian/control b/debian/control index 9b4e464620c..de9e8bfdc0e 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,5 @@ Source: clickhouse +Section: database Priority: optional Maintainer: Alexey Milovidov 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 diff --git a/debian/pbuilder-hooks/B90test-server b/debian/pbuilder-hooks/B90test-server new file mode 100755 index 00000000000..ffc684a3a99 --- /dev/null +++ b/debian/pbuilder-hooks/B90test-server @@ -0,0 +1,24 @@ +#!/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 diff --git a/debian/pbuilder-hooks/B92test-pkg b/debian/pbuilder-hooks/B92test-pkg deleted file mode 120000 index 50f3d1bef88..00000000000 --- a/debian/pbuilder-hooks/B92test-pkg +++ /dev/null @@ -1 +0,0 @@ -/usr/share/doc/pbuilder/examples/B92test-pkg \ No newline at end of file diff --git a/debian/pbuilder-test/000_server_start b/debian/pbuilder-test/000_server_start deleted file mode 100755 index 883837a24a5..00000000000 --- a/debian/pbuilder-test/000_server_start +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/bash - -service clickhouse-server start -sleep 3 diff --git a/debian/pbuilder-test/100_test_run b/debian/pbuilder-test/100_test_run deleted file mode 100755 index c2941eb8d3a..00000000000 --- a/debian/pbuilder-test/100_test_run +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -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 diff --git a/debian/pbuilder-test/800_server_stop b/debian/pbuilder-test/800_server_stop deleted file mode 100755 index a30595b7924..00000000000 --- a/debian/pbuilder-test/800_server_stop +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -service clickhouse-server stop diff --git a/utils/compressor/CMakeLists.txt b/utils/compressor/CMakeLists.txt index 62e11a75891..aff97c839db 100644 --- a/utils/compressor/CMakeLists.txt +++ b/utils/compressor/CMakeLists.txt @@ -1,9 +1,10 @@ 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)