Merge branch 'master' of github.com:yandex/ClickHouse

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 (

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

debian/clickhouse-compressor.install

@@ -1 +0,0 @@
-/usr/bin/clickhouse-compressor

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

debian/control

@@ -1,4 +1,5 @@
 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-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

debian/pbuilder-hooks/B92test-pkg

@@ -1 +0,0 @@
-/usr/share/doc/pbuilder/examples/B92test-pkg

debian/pbuilder-test/000_server_start

@@ -1,4 +0,0 @@
-#!/bin/bash
-
-service clickhouse-server start
-sleep 3

debian/pbuilder-test/100_test_run

@@ -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

debian/pbuilder-test/800_server_stop

@@ -1,3 +0,0 @@
-#!/bin/bash
-
-service clickhouse-server stop

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)