diff --git a/copy_headers.sh b/copy_headers.sh index 7c106f2c3be..3396a1dec69 100755 --- a/copy_headers.sh +++ b/copy_headers.sh @@ -8,7 +8,7 @@ # Требуется clang, желательно наиболее свежий (trunk). # # Используется при сборке пакетов. -# Заголовочные файлы записываются в пакет clickhouse-server-base, в директорию /usr/share/clickhouse/headers. +# Заголовочные файлы записываются в пакет clickhouse-common, в директорию /usr/share/clickhouse/headers. # # Если вы хотите установить их самостоятельно, без сборки пакета, # чтобы clickhouse-server видел их там, где ожидается, выполните: diff --git a/debian/clickhouse-client.install b/debian/clickhouse-client.install index e41d7a4382f..561c0f90710 100644 --- a/debian/clickhouse-client.install +++ b/debian/clickhouse-client.install @@ -1,6 +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 +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-common-static.install b/debian/clickhouse-common-static.install new file mode 100644 index 00000000000..a2f5b69c964 --- /dev/null +++ b/debian/clickhouse-common-static.install @@ -0,0 +1,3 @@ +usr/bin/clickhouse +etc/security/limits.d/clickhouse.conf +usr/share/clickhouse/* diff --git a/debian/clickhouse-server-base.install b/debian/clickhouse-server-base.install deleted file mode 100644 index 573f34042bb..00000000000 --- a/debian/clickhouse-server-base.install +++ /dev/null @@ -1,11 +0,0 @@ -/usr/bin/clickhouse -/usr/bin/clickhouse-server -/usr/bin/clickhouse-clang -/usr/bin/clickhouse-lld -/usr/bin/clickhouse-copier -/usr/bin/clickhouse-report -/etc/systemd/system/clickhouse-server.service -/etc/init.d/clickhouse-server -/etc/cron.d/clickhouse-server -/usr/share/clickhouse/* -/etc/security/limits.d/clickhouse.conf diff --git a/debian/clickhouse-server-common.install b/debian/clickhouse-server-common.install deleted file mode 100644 index 7237e9914d5..00000000000 --- a/debian/clickhouse-server-common.install +++ /dev/null @@ -1,2 +0,0 @@ -etc/clickhouse-server/config.xml etc/clickhouse-server -etc/clickhouse-server/users.xml etc/clickhouse-server diff --git a/debian/clickhouse-server-metrika.links b/debian/clickhouse-server-metrika.links new file mode 100644 index 00000000000..037f5272b94 --- /dev/null +++ b/debian/clickhouse-server-metrika.links @@ -0,0 +1 @@ +usr/bin/clickhouse usr/bin/clickhouse-server diff --git a/debian/clickhouse-server-base.docs b/debian/clickhouse-server.docs similarity index 100% rename from debian/clickhouse-server-base.docs rename to debian/clickhouse-server.docs diff --git a/debian/clickhouse-server.install b/debian/clickhouse-server.install new file mode 100644 index 00000000000..f69969a6084 --- /dev/null +++ b/debian/clickhouse-server.install @@ -0,0 +1,8 @@ +usr/bin/clickhouse-server +usr/bin/clickhouse-clang +usr/bin/clickhouse-lld +usr/bin/clickhouse-copier +usr/bin/clickhouse-report +etc/clickhouse-server/config.xml +etc/clickhouse-server/users.xml +etc/systemd/system/clickhouse-server.service diff --git a/debian/clickhouse-server-base.postinst b/debian/clickhouse-server.postinst similarity index 100% rename from debian/clickhouse-server-base.postinst rename to debian/clickhouse-server.postinst diff --git a/debian/clickhouse-server-base.preinst b/debian/clickhouse-server.preinst similarity index 100% rename from debian/clickhouse-server-base.preinst rename to debian/clickhouse-server.preinst diff --git a/debian/clickhouse-server-base.prerm b/debian/clickhouse-server.prerm similarity index 100% rename from debian/clickhouse-server-base.prerm rename to debian/clickhouse-server.prerm diff --git a/debian/control b/debian/control index 5edac5f66a8..46b743636a5 100644 --- a/debian/control +++ b/debian/control @@ -13,11 +13,11 @@ Build-Depends: debhelper (>= 9), libreadline-dev, libssl-dev, unixodbc-dev -Standards-Version: 3.8.0 +Standards-Version: 3.9.8 Package: clickhouse-client Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, clickhouse-server-base (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, clickhouse-common-static (= ${binary:Version}) Replaces: clickhouse-compressor Conflicts: clickhouse-compressor Description: Client binary for clickhouse @@ -26,28 +26,37 @@ Description: Client binary for clickhouse . This package provides clickhouse-client , clickhouse-local and clickhouse-benchmark -Package: clickhouse-server-base +Package: clickhouse-common-static Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, tzdata +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: clickhouse-server-base +Provides: clickhouse-server-base +Conflicts: clickhouse-server-base +Description: Common files for clickhouse + Yandex ClickHouse is a column-oriented database management system + that allows generating analytical data reports in real time. + . + This package provides common files for both clickhouse server and client + +Package: clickhouse-server +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, clickhouse-common-static (= ${binary:Version}), adduser, tzdata +Replaces: clickhouse-server-common +Provides: clickhouse-server-common +Conflicts: clickhouse-server-common Description: Server binary for clickhouse Yandex ClickHouse is a column-oriented database management system that allows generating analytical data reports in real time. . This package provides clickhouse common configuration files -Package: clickhouse-server-common -Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, clickhouse-server-base (= ${binary:Version}) -Description: clickhouse-server-common - Common configuration files for clickhouse-server-base package - Package: clickhouse-common-dbg Architecture: any Section: debug Priority: extra -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. +Depends: ${misc:Depends}, clickhouse-common-static (= ${binary:Version}) +Description: debugging symbols for clickhouse-common-static + This package contains the debugging symbols for clickhouse-common. Package: clickhouse-test Priority: extra diff --git a/debian/rules b/debian/rules index c9d419b151b..fe53eac4643 100755 --- a/debian/rules +++ b/debian/rules @@ -66,32 +66,26 @@ override_dh_auto_test: override_dh_clean: rm -rf $(BUILDDIR) rm -rf $(DESTDIR) - rm -rf debian/copyright debian/clickhouse-server-common.docs debian/clickhouse-client.docs + rm -rf debian/copyright debian/clickhouse-client.docs debian/clickhouse-common-static.docs dh_clean override_dh_strip: - dh_strip -pclickhouse-server-base --dbg-package=clickhouse-common-dbg + dh_strip -pclickhouse-common-static --dbg-package=clickhouse-common-dbg override_dh_install: # Making docs cp LICENSE debian/copyright - ln -sf clickhouse-server-base.docs debian/clickhouse-client.docs - ln -sf clickhouse-server-base.docs debian/clickhouse-server-common.docs + ln -sf clickhouse-server.docs debian/clickhouse-client.docs + ln -sf clickhouse-server.docs debian/clickhouse-common-static.docs mkdir -p $(DESTDIR)/etc/security/limits.d cp debian/clickhouse.limits $(DESTDIR)/etc/security/limits.d/clickhouse.conf - # todo: remove after renaming package: - mkdir -p $(DESTDIR)/etc/init.d - cp debian/clickhouse-server.init $(DESTDIR)/etc/init.d/clickhouse-server # systemd compatibility mkdir -p $(DESTDIR)/etc/systemd/system/ cp debian/clickhouse-server.service $(DESTDIR)/etc/systemd/system/ - mkdir -p $(DESTDIR)/etc/cron.d - cp debian/clickhouse-server.cron.d $(DESTDIR)/etc/cron.d/clickhouse-server - # In case building clickhouse-server, adding to package binary of clang, ld and header files - for dynamic compilation. mkdir -p $(DESTDIR)/usr/share/clickhouse/headers diff --git a/debian/source/options b/debian/source/options index 9521b6828cc..51bf19d294a 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1,6 +1,6 @@ tar-ignore -tar-ignore="build" -tar-ignore="build_*" +tar-ignore="build/*" +tar-ignore="build_*/*" tar-ignore="contrib/poco/openssl/*" tar-ignore="contrib/poco/gradle/*" tar-ignore="contrib/poco/Data/SQLite/*" diff --git a/docker/server/Dockerfile b/docker/server/Dockerfile index 2d4f998eff1..20882fbeee3 100644 --- a/docker/server/Dockerfile +++ b/docker/server/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update && \ mkdir -p /etc/apt/sources.list.d && \ echo $repository | tee /etc/apt/sources.list.d/clickhouse.list && \ apt-get update && \ - apt-get install --allow-unauthenticated -y clickhouse-server-common=$version clickhouse-server-base=$version && \ + apt-get install --allow-unauthenticated -y clickhouse-server=$version && \ rm -rf /var/lib/apt/lists/* /var/cache/debconf && \ apt-get clean diff --git a/docs/en/getting_started/index.md b/docs/en/getting_started/index.md index d3e9ea03915..10ed75040d8 100755 --- a/docs/en/getting_started/index.md +++ b/docs/en/getting_started/index.md @@ -31,7 +31,7 @@ Then run: ```bash sudo apt-key adv --keyserver keyserver.ubuntu.com --recv E0C56BD4 # optional sudo apt-get update -sudo apt-get install clickhouse-client clickhouse-server-common +sudo apt-get install clickhouse-client clickhouse-server ``` You can also download and install packages manually from here: diff --git a/docs/ru/getting_started/index.md b/docs/ru/getting_started/index.md index 3847663b3d5..2198ab2bc7d 100644 --- a/docs/ru/getting_started/index.md +++ b/docs/ru/getting_started/index.md @@ -31,7 +31,7 @@ deb http://repo.yandex.ru/clickhouse/deb/stable/ main/ ```bash sudo apt-key adv --keyserver keyserver.ubuntu.com --recv E0C56BD4 # optional sudo apt-get update -sudo apt-get install clickhouse-client clickhouse-server-common +sudo apt-get install clickhouse-client clickhouse-server ``` Также можно скачать и установить пакеты вручную, отсюда: . diff --git a/website/deprecated/reference_en.html b/website/deprecated/reference_en.html index 728c9622087..e6e4dee6227 100644 --- a/website/deprecated/reference_en.html +++ b/website/deprecated/reference_en.html @@ -439,7 +439,7 @@ Then run: %% sudo apt-key adv --keyserver keyserver.ubuntu.com --recv E0C56BD4 # optional sudo apt-get update -sudo apt-get install clickhouse-client clickhouse-server-common +sudo apt-get install -y clickhouse-client clickhouse-server %% You can also download and install packages manually from here: @@ -709,7 +709,7 @@ echo 'DROP TABLE t' | POST 'http://localhost:8123/' For successful requests that don't return a data table, an empty response body is returned. -You can use compression when transmitting data. The compressed data has a non-standard format, and you will need to use a special compressor program to work with it (%%sudo apt-get install clickhouse-compressor%%). +You can use compression when transmitting data. The compressed data has a non-standard format, and you will need to use a special clickhouse-compressor program to work with it (%%sudo apt-get install clickhouse-utils%%). If you specified 'compress=1' in the URL, the server will compress the data it sends you. If you specified 'decompress=1' in the URL, the server will decompress the same data that you pass in the POST method. diff --git a/website/deprecated/reference_ru.html b/website/deprecated/reference_ru.html index c7b4126a167..2965054a737 100644 --- a/website/deprecated/reference_ru.html +++ b/website/deprecated/reference_ru.html @@ -449,7 +449,7 @@ deb http://repo.yandex.ru/clickhouse/trusty stable main %% sudo apt-key adv --keyserver keyserver.ubuntu.com --recv E0C56BD4 # optional sudo apt-get update -sudo apt-get install clickhouse-client clickhouse-server-common +sudo apt-get install -y clickhouse-client clickhouse-server %% Также можно скачать и установить пакеты вручную, отсюда: @@ -725,7 +725,7 @@ echo 'DROP TABLE t' | POST 'http://localhost:8123/' Для запросов, которые не возвращают таблицу с данными, в случае успеха, выдаётся пустое тело ответа. -Вы можете использовать сжатие при передаче данных. Формат сжатых данных нестандартный, и вам придётся использовать для работы с ним специальную программу compressor (%%sudo apt-get install clickhouse-compressor%%). +Вы можете использовать сжатие при передаче данных. Формат сжатых данных нестандартный, и вам придётся использовать для работы с ним специальную программу clickhouse-compressor (%%sudo apt-get install clickhouse-utils%%). Если вы указали в URL compress=1, то сервер будет сжимать отправляемые вам данные. Если вы указали в URL decompress=1, то сервер будет разжимать те данные, которые вы передаёте ему POST-ом. diff --git a/website/index.html b/website/index.html index e315b78199d..78b89d3b07b 100644 --- a/website/index.html +++ b/website/index.html @@ -393,7 +393,7 @@ sudo apt-key adv --keyserver keyserver.ubuntu.com --recv E0C56BD4 # optional sudo apt-add-repository "deb http://repo.yandex.ru/clickhouse/deb/stable/ main/" sudo apt-get update -sudo apt-get install clickhouse-server-common clickhouse-client -y +sudo apt-get install -y clickhouse-server clickhouse-client sudo service clickhouse-server start clickhouse-client diff --git a/website/tutorial.html b/website/tutorial.html index 0472bef268d..558d9a0d0fe 100644 --- a/website/tutorial.html +++ b/website/tutorial.html @@ -51,7 +51,7 @@

clickhouse-client package contains clickhouse-client application — - interactive ClickHouse client. clickhouse-server-base contains a clickhouse-server binary file. clickhouse-server-common + interactive ClickHouse client. clickhouse-common contains a clickhouse-server binary file. clickhouse-server — contains config files for the clickhouse-server.

Server config files are located in /etc/clickhouse-server/. Before getting to work please notice the path