fixup

docker/test/performance-comparison/compare.sh

@@ -1083,45 +1083,41 @@ function upload_results
     fi 
 
     # Surprisingly, clickhouse-client doesn't understand --host 127.0.0.1:9000
-    # so I have to do this instead. I tried to use Poco URI parser for this,
-    # but it's also broken and can't parse host:port.
-    IFS=':' read -r host port <<<"${CHPC_DATABASE_URL}"
-
-    upload_client=(clickhouse-client
-        --host "${host}"
-        --port "${port}"
-        --secure
-        --user "${CHPC_DATABASE_USER}"
-        --password "${CHPC_DATABASE_PASSWORD}"
-        --config "ch/tests/config/client_config.xml"
-        --database perftest
-        -m
-        "--date_time_input_format=best_effort")
-
-     set +x # Don't show password in the log
-     "${upload_client[@]}" --query "
-        insert into query_metrics_tmp
-        select 
-            toDate(event_time) event_date,
-            toDateTime('$(cd right/ch && git show -s --format=%ci "$SHA_TO_TEST" | cut -d' ' -f-2)') event_time,
-            $PR_TO_TEST pr_number,
-            '$REF_SHA' old_sha,
-            '$SHA_TO_TEST' new_sha,
-            test,
-            query_index,
-            query_display_name,
-            metric_name,
-            old_value,
-            new_value,
-            diff,
-            stat_threshold
-        from input('metric_name text, old_value float, new_value float, diff float,
-                ratio_display_text text, stat_threshold float,
-                test text, query_index int, query_display_name text')
-        settings date_time_input_format='best_effort'
-        format TSV
-        settings date_time_input_format='best_effort'
-    " < "report/all-query-metrics.tsv"
+    # so I have to extract host and port with clickhouse-local. I tried to use
+    # Poco URI parser to support this in the client, but it's broken and can't
+    # parse host:port.
+    set +x # Don't show password in the log
+    clickhouse-client \
+        $(clickhouse-local --query "with '${CHPC_DATABASE_URL}' as url select '--host ' || domain(url) || ' --port ' || toString(port(url)) format TSV") \
+        --secure \
+        --user "${CHPC_DATABASE_USER}" \
+        --password "${CHPC_DATABASE_PASSWORD}" \
+        --config "ch/tests/config/client_config.xml" \
+        --database perftest \
+        --date_time_input_format=best_effort \
+        --query "
+            insert into query_metrics_tmp
+            select
+                toDate(event_time) event_date,
+                toDateTime('$(cd right/ch && git show -s --format=%ci "$SHA_TO_TEST" | cut -d' ' -f-2)') event_time,
+                $PR_TO_TEST pr_number,
+                '$REF_SHA' old_sha,
+                '$SHA_TO_TEST' new_sha,
+                test,
+                query_index,
+                query_display_name,
+                metric_name,
+                old_value,
+                new_value,
+                diff,
+                stat_threshold
+            from input('metric_name text, old_value float, new_value float, diff float,
+                    ratio_display_text text, stat_threshold float,
+                    test text, query_index int, query_display_name text')
+            settings date_time_input_format='best_effort'
+            format TSV
+            settings date_time_input_format='best_effort'
+" < report/all-query-metrics.tsv # Don't leave whitespace after INSERT: https://github.com/ClickHouse/ClickHouse/issues/16652
     set -x
 }