Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename compressor to clickhouse-compressor, Fix magic in copy_headers.sh #345

Merged
merged 5 commits into from
Jan 18, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/print_include_directories.cmake
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
get_property (dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES)
get_property (dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/dbms PROPERTY INCLUDE_DIRECTORIES)
file (WRITE ${CMAKE_CURRENT_BINARY_DIR}/include_directories.txt "")
foreach (dir ${dirs})
string (REPLACE "${ClickHouse_SOURCE_DIR}" "." dir "${dir}")
Expand Down
2 changes: 1 addition & 1 deletion debian/compressor-metrika-yandex.install
Original file line number Diff line number Diff line change
@@ -1 +1 @@
/usr/bin/compressor
/usr/bin/clickhouse-compressor
2 changes: 1 addition & 1 deletion debian/daemons
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
compressor
clickhouse-compressor
clickhouse-client
clickhouse-server
2 changes: 1 addition & 1 deletion doc/reference_en.html
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ <h1>Interfaces</h1>

For successful requests that don&#39;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 compressor-metrika-yandex%%).
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%%).

If you specified &#39;compress=1&#39; in the URL, the server will compress the data it sends you.
If you specified &#39;decompress=1&#39; in the URL, the server will decompress the same data that you pass in the POST method.
Expand Down
2 changes: 1 addition & 1 deletion doc/reference_ru.html
Original file line number Diff line number Diff line change
Expand Up @@ -707,7 +707,7 @@ <h1>Интерфейсы</h1>

Для запросов, которые не возвращают таблицу с данными, в случае успеха, выдаётся пустое тело ответа.

Вы можете использовать сжатие при передаче данных. Формат сжатых данных нестандартный, и вам придётся использовать для работы с ним специальную программу compressor (%%sudo apt-get install compressor-metrika-yandex%%).
Вы можете использовать сжатие при передаче данных. Формат сжатых данных нестандартный, и вам придётся использовать для работы с ним специальную программу compressor (%%sudo apt-get install clickhouse-compressor%%).

Если вы указали в URL compress=1, то сервер будет сжимать отправляемые вам данные.
Если вы указали в URL decompress=1, то сервер будет разжимать те данные, которые вы передаёте ему POST-ом.
Expand Down
6 changes: 3 additions & 3 deletions utils/compressor/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@

include_directories (BEFORE ${CMAKE_SOURCE_DIR}/contrib/libzstd/include)

add_executable (compressor main.cpp)
target_link_libraries (compressor dbms ${Boost_PROGRAM_OPTIONS_LIBRARY})
add_executable (clickhouse-compressor main.cpp)
target_link_libraries (clickhouse-compressor dbms ${Boost_PROGRAM_OPTIONS_LIBRARY})

install (TARGETS compressor RUNTIME DESTINATION bin COMPONENT compressor)
install (TARGETS clickhouse-compressor RUNTIME DESTINATION bin COMPONENT clickhouse-compressor)

add_executable (zstd_test zstd_test.cpp)
target_link_libraries (zstd_test zstd)
4 changes: 2 additions & 2 deletions utils/compressor/test.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh

./compressor < compressor > compressor.compressed
./compressor -d < compressor.compressed > compressor2
./clickhouse-compressor < compressor > compressor.compressed
./clickhouse-compressor -d < compressor.compressed > compressor2
cmp compressor compressor2 && echo "Ok." || echo "Fail."