Merge pull request #187 from ludv1x/METR-23101

Removed binary stripping, try to fix clickhouse-local test.

.gitignore

@@ -156,19 +156,6 @@ utils/zookeeper-dump-tree/zookeeper-dump-tree
 utils/zookeeper-remove-by-list/zookeeper-remove-by-list
 dbms/src/Storages/tests/remove_symlink_directory
 dbms/tests/queries/1_stateful
-debian/clickhouse-benchmark-metrika-yandex.postinst
-debian/clickhouse-benchmark.docs
-debian/clickhouse-client-metrika-yandex.postinst
-debian/clickhouse-client.docs
-debian/clickhouse-server-base.docs
-debian/clickhouse-server-common.docs
-debian/clickhouse-server-metrika-yandex.postinst
-debian/clickhouse-server-metrika.docs
-debian/clickhouse-server.docs
-debian/compressor-metrika-yandex.postinst
-debian/compressor.docs
-debian/config-processor-metrika-yandex.postinst
-debian/config-processor.docs
 debian/control
 debian/copyright
 debian/tmp/

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

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

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

@@ -11,8 +11,8 @@ function pack_unpack_compare()
 	clickhouse-client --query "DROP TABLE IF EXISTS test.buf_file"
 
 	clickhouse-client --query "CREATE TABLE test.buf ENGINE = Memory AS $1"
-	local res_orig=$(clickhouse-client --query "SELECT $TABLE_HASH FROM test.buf")
-	
+	local res_orig=$(clickhouse-client --max_threads=1 --query "SELECT $TABLE_HASH FROM test.buf")
+
 	clickhouse-client --max_threads=1 --query "CREATE TABLE test.buf_file ENGINE = File($3) AS SELECT * FROM test.buf"
 	local res_db_file=$(clickhouse-client --max_threads=1 --query "SELECT $TABLE_HASH FROM test.buf_file")
 
@@ -24,10 +24,10 @@ function pack_unpack_compare()
 	clickhouse-client --query "DROP TABLE IF EXISTS test.buf_file"
 	rm -f "$buf_file"
 
-	echo $((res_orig - res_db_file)) $((res_orig - res_ch_local1)) $((res_orig - res_ch_local2))
+	echo $res_orig $res_db_file $res_ch_local1 $res_ch_local2
 }
 
-pack_unpack_compare "SELECT number FROM system.numbers LIMIT 10000" "number UInt64" "TabSeparated" 
+pack_unpack_compare "SELECT number FROM system.numbers LIMIT 10000" "number UInt64" "TabSeparated"
 pack_unpack_compare "SELECT number FROM system.numbers LIMIT 10000" "number UInt64" "Native"
 pack_unpack_compare "SELECT number FROM system.numbers LIMIT 10000" "number UInt64" "JSONEachRow"
 echo

debian/clickhouse-server-base.postinst

@@ -12,7 +12,7 @@ if id metrika > /dev/null 2>&1; then
 	mkdir -p /opt/clickhouse/metadata/default/
 	mkdir -p /opt/cores/
 	chown metrika: /opt/clickhouse /opt/cores /opt/clickhouse/data /opt/clickhouse/metadata /opt/clickhouse/data/default /opt/clickhouse/metadata/default
-	# Очистка старых результатов динамической компиляции.
+	# Clean old dynamic compilation results
 	if [ -d "/opt/clickhouse/build" ]; then
 		rm -f /opt/clickhouse/build/*.cpp /opt/clickhouse/build/*.so ||:
 	fi

debian/rules

@@ -115,16 +115,6 @@ install: build
 		./copy_headers.sh . debian/tmp/usr/share/clickhouse/headers; \
 	fi;
 
-
-	# Список бинариев, для которых делаем strip. Это делается из-за того, что на некоторых серверах мало места.
-	$(eval STRIP_LIST=\
-		clickhouse-client \
-	)
-
-	for DAEMON in ${STRIP_LIST}; do \
-		if [ -e debian/tmp/usr/bin/$$DAEMON ]; then strip debian/tmp/usr/bin/$$DAEMON; fi; \
-	done
-
 	# Создаём документацию
 	cp LICENSE debian/copyright