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

docker/test/performance-comparison/compare.sh

@@ -14,8 +14,8 @@ function configure
     rm right/config/config.d/text_log.xml ||:
     cp -rv right/config left ||:
 
-    sed -i 's/<tcp_port>9000/<tcp_port>9001/g' left/config/config.xml
-    sed -i 's/<tcp_port>9000/<tcp_port>9002/g' right/config/config.xml
+    sed -i 's/<tcp_port>900./<tcp_port>9001/g' left/config/config.xml
+    sed -i 's/<tcp_port>900./<tcp_port>9002/g' right/config/config.xml
 
     # Start a temporary server to rename the tables
     while killall clickhouse-server; do echo . ; sleep 1 ; done

docker/test/performance-comparison/download.sh

@@ -5,6 +5,8 @@ trap "exit" INT TERM
 trap 'kill $(jobs -pr) ||:' EXIT
 
 mkdir db0 ||:
+mkdir left ||:
+mkdir right ||:
 
 left_pr=$1
 left_sha=$2
@@ -22,11 +24,6 @@ dataset_paths["values"]="https://clickhouse-datasets.s3.yandex.net/values_with_e
 
 function download
 {
-    rm -r left ||:
-    mkdir left ||:
-    rm -r right ||:
-    mkdir right ||:
-
     # might have the same version on left and right
     if ! [ "$left_sha" = "$right_sha" ]
     then
@@ -39,7 +36,11 @@ function download
     for dataset_name in $datasets
     do
         dataset_path="${dataset_paths[$dataset_name]}"
-        [ "$dataset_path" != "" ]
+        if [ "$dataset_path" = "" ]
+        then
+            >&2 echo "Unknown dataset '$dataset_name'"
+            exit 1
+        fi
         cd db0 && wget -nv -nd -c "$dataset_path" -O- | tar -xv &
     done
 

docker/test/performance-comparison/manual-run.sh

+#!/bin/bash
+set -ex
+set -o pipefail
+trap "exit" INT TERM
+trap 'kill $(jobs -pr) ||:' EXIT
+
+stage=${stage:-}
+script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+repo_dir=${repo_dir:-$(readlink -f "$script_dir/../../..")}
+
+
+function download
+{
+    rm -r left right db0 ||:
+    mkdir left right db0 ||:
+
+    "$script_dir/download.sh" ||: &
+    cp -vP "$repo_dir"/../build-gcc9-rel/programs/clickhouse* right &
+    cp -vP "$repo_dir"/../build-clang10-rel/programs/clickhouse* left &
+    wait
+}
+
+function configure
+{
+    # Test files
+    cp -av "$repo_dir/tests/performance" right
+    cp -av "$repo_dir/tests/performance" left
+
+    # Configs
+    cp -av "$script_dir/config" right
+    cp -av "$script_dir/config" left
+    cp -av "$repo_dir"/programs/server/config* right/config
+    cp -av "$repo_dir"/programs/server/user* right/config
+    cp -av "$repo_dir"/programs/server/config* left/config
+    cp -av "$repo_dir"/programs/server/user* left/config
+
+    tree left
+}
+
+function run
+{
+    left/clickhouse-local --query "select * from system.build_options format PrettySpace" | sed 's/ *$//' | fold -w 80 -s > left-commit.txt
+    right/clickhouse-local --query "select * from system.build_options format PrettySpace" | sed 's/ *$//' | fold -w 80 -s > right-commit.txt
+
+    PATH=right:"$PATH" stage=configure "$script_dir/compare.sh" &> >(tee compare.log)
+}
+
+download
+configure
+run
+
+rm output.7z
+7z a output.7z ./*.{log,tsv,html,txt,rep,svg} {right,left}/{performance,db/preprocessed_configs}
+