thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 23:52:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into METR-23466

Browse Source
This commit is contained in:
proller 2016-11-16 02:56:08 +03:00
commit d56fc2fd39
9 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dbms/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app.reference
View File

@ -1,7 +1,7 @@
7785028801797101796 7785028801797101796 7785028801797101796 7785028801797101796
7785028801797101796 7785028801797101796 7785028801797101796 7785028801797101796
7785028801797101796 7785028801797101796 7785028801797101796 7785028801797101796
0 0 0
0 0 0
0 0 0
4030087544159056847 4030087544159056847 4030087544159056847 4030087544159056847
4030087544159056847 4030087544159056847 4030087544159056847 4030087544159056847
4030087544159056847 4030087544159056847 4030087544159056847 4030087544159056847
0 0 0
0 0 0
0 0 0

8
dbms/tests/queries/0_stateless/00385_storage_file_and_clickhouse-local_app.sh
View File

@ -17,14 +17,14 @@ function pack_unpack_compare()
local res_db_file=$(clickhouse-client --max_threads=1 --query "SELECT $TABLE_HASH FROM test.buf_file")
clickhouse-client --max_threads=1 --query "SELECT * FROM test.buf FORMAT $3" > "$buf_file"
local res_ch_local1=$(clickhouse-local --structure "$2" --file "$buf_file" --table "my super table" --input-format "$3" --output-format TabSeparated --query "SELECT $TABLE_HASH FROM \`my super table\`" 2>/dev/null)
local res_ch_local2=$(clickhouse-local --structure "$2" --table "my super table" --input-format "$3" --output-format TabSeparated --query "SELECT $TABLE_HASH FROM \`my super table\`" < "$buf_file" 2>/dev/null)
local res_ch_local1=$(clickhouse-local --structure "$2" --file "$buf_file" --table "my super table" --input-format "$3" --output-format TabSeparated --query "SELECT $TABLE_HASH FROM \`my super table\`" 2>stderr || cat stderr 1>&2)
local res_ch_local2=$(clickhouse-local --structure "$2" --table "my super table" --input-format "$3" --output-format TabSeparated --query "SELECT $TABLE_HASH FROM \`my super table\`" < "$buf_file" 2>stderr || cat stderr 1>&2)
clickhouse-client --query "DROP TABLE IF EXISTS test.buf"
clickhouse-client --query "DROP TABLE IF EXISTS test.buf_file"
rm -f "$buf_file"
rm -f "$buf_file" stderr
echo $res_orig $res_db_file $res_ch_local1 $res_ch_local2
echo $((res_orig - res_db_file)) $((res_orig - res_ch_local1)) $((res_orig - res_ch_local2))
}
pack_unpack_compare "SELECT number FROM system.numbers LIMIT 10000" "number UInt64" "TabSeparated"

1
debian/clickhouse-benchmark.install vendored
View File

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

1
debian/clickhouse-client.install vendored
View File

@ -1,2 +1 @@
/etc/clickhouse-client/config.xml
/usr/bin/clickhouse-client

3
debian/clickhouse-client.links vendored Normal file
View File

@ -0,0 +1,3 @@
/usr/bin/clickhouse /usr/bin/clickhouse-client
/usr/bin/clickhouse /usr/bin/clickhouse-benchmark
/usr/bin/clickhouse /usr/bin/clickhouse-local

1
debian/clickhouse-local.install vendored
View File

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

2
debian/daemons vendored
View File

@ -1,6 +1,4 @@
compressor
clickhouse-client
clickhouse-server
clickhouse-benchmark
clickhouse-local
config-processor

11
debian/rules vendored
View File

@ -7,6 +7,8 @@ ifndef THREADS_COUNT
THREADS_COUNT=`grep -c ^processor /proc/cpuinfo`
endif
BUILD_TARGETS=clickhouse $(DAEMONS)
configure-stamp:
dh_testdir
rm -rf build
@ -25,14 +27,13 @@ build-stamp: configure-stamp
# последовательно запускаем make для каждой из целей.
# т.к. при параллельном запуске (make target1 target2) несколько раз одновременно создаются бинарники
# и возникает raise с custom_command, использующие эти бинарники
for daemon in clickhouse ${DAEMONS}; do $(MAKE) -j$(THREADS_COUNT) -C build $$daemon; done
for target in ${BUILD_TARGETS}; do $(MAKE) -j$(THREADS_COUNT) -C build $$target; done
touch $@
clean:
dh_testdir
dh_testroot
rm -f configure-stamp
rm -f build-stamp
rm -f configure-stamp build-stamp
rm -rf build
# Удалим созданные для dh_installinit файлы
find ./debian/ -name "*.init" -type l -delete
@ -50,9 +51,7 @@ install: build
dh_testroot
dh_prep
cd build && \
for daemon in clickhouse ${DAEMONS}; do\
DESTDIR=../debian/tmp cmake -DCOMPONENT=$$daemon -P cmake_install.cmake;\
done
for target in ${BUILD_TARGETS}; do DESTDIR=../debian/tmp cmake -DCOMPONENT=$$target -P cmake_install.cmake; done
# Создаём нужные файлы для dh_installinit, т.к. он их понимает только внутри debian/
for I in debian/tmp/etc/init.d/*; do echo $$I; ln -s tmp/etc/init.d/`basename $$I` debian/`basename $$I`.init; done

6
release_lib.sh
View File

@ -39,13 +39,13 @@ function make_control {
add_daemon_impl clickhouse-server-common "clickhouse-server-base(=1.1.$REVISION)" 'Common configuration files for clickhouse-server-base package'
;;
'clickhouse-client' )
add_daemon_impl clickhouse-client "clickhouse-server-base(=1.1.$REVISION)" "ClickHouse client"
add_daemon_impl clickhouse-client "clickhouse-server-base(=1.1.$REVISION)" "ClickHouse client and additional tools such as clickhouse-local and clickhouse-benchmark."
;;
'clickhouse-benchmark' )
add_daemon_impl clickhouse-benchmark "clickhouse-server-base(=1.1.$REVISION)" "ClickHouse benchmark tool"
#skip it explicitly
;;
'clickhouse-local' )
add_daemon_impl clickhouse-local "clickhouse-server-base(=1.1.$REVISION)" "ClickHouse local server application"
#skip it explicitly
;;
* )
add_daemon_impl "${DAEMON_PKG}-metrika-yandex"