From e8a3f0abb3e3169f0ade88bc2edd076ea4a0cff1 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Sun, 12 Jul 2020 21:54:13 +0300
Subject: [PATCH] Correct default secure port for clickhouse-benchmark #11044

---
 programs/benchmark/Benchmark.cpp                   | 14 +++++++++++---
 .../01393_benchmark_secure_port.reference          |  1 +
 .../0_stateless/01393_benchmark_secure_port.sh     |  6 ++++++
 3 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 tests/queries/0_stateless/01393_benchmark_secure_port.reference
 create mode 100755 tests/queries/0_stateless/01393_benchmark_secure_port.sh

diff --git a/programs/benchmark/Benchmark.cpp b/programs/benchmark/Benchmark.cpp
index 89b9a877d5e..8da164d01d6 100644
--- a/programs/benchmark/Benchmark.cpp
+++ b/programs/benchmark/Benchmark.cpp
@@ -84,7 +84,8 @@ public:
             UInt16 cur_port = i >= ports_.size() ? 9000 : ports_[i];
             std::string cur_host = i >= hosts_.size() ? "localhost" : hosts_[i];
 
-            connections.emplace_back(std::make_unique<ConnectionPool>(concurrency, cur_host, cur_port, default_database_, user_, password_, "benchmark", Protocol::Compression::Enable, secure));
+            connections.emplace_back(std::make_unique<ConnectionPool>(
+                concurrency, cur_host, cur_port, default_database_, user_, password_, "benchmark", Protocol::Compression::Enable, secure));
             comparison_info_per_interval.emplace_back(std::make_shared<Stats>());
             comparison_info_total.emplace_back(std::make_shared<Stats>());
         }
@@ -563,7 +564,7 @@ int mainEntryClickHouseBenchmark(int argc, char ** argv)
         desc.add_options()
             ("help",                                                            "produce help message")
             ("concurrency,c", value<unsigned>()->default_value(1),              "number of parallel queries")
-            ("delay,d",       value<double>()->default_value(1),                "delay between intermediate reports in seconds (set 0 to disable reports)")
+            ("delay,d",       value<double>()->default_value(1), "delay between intermediate reports in seconds (set 0 to disable reports)")
             ("stage",         value<std::string>()->default_value("complete"),  "request query processing up to specified stage: complete,fetch_columns,with_mergeable_state")
             ("iterations,i",  value<size_t>()->default_value(0),                "amount of queries to be executed")
             ("timelimit,t",   value<double>()->default_value(0.),               "stop launch of queries after specified time limit")
@@ -600,8 +601,15 @@ int mainEntryClickHouseBenchmark(int argc, char ** argv)
 
         print_stacktrace = options.count("stacktrace");
 
+        /// NOTE Maybe clickhouse-benchmark should also respect .xml configuration of clickhouse-client.
+
+        UInt16 default_port = options.count("secure") ? DBMS_DEFAULT_SECURE_PORT : DBMS_DEFAULT_PORT;
+
         UseSSL use_ssl;
-        Ports ports = options.count("port") ? options["port"].as<Ports>() : Ports({9000});
+        Ports ports = options.count("port")
+            ? options["port"].as<Ports>()
+            : Ports({default_port});
+
         Strings hosts = options.count("host") ? options["host"].as<Strings>() : Strings({"localhost"});
 
         Benchmark benchmark(
diff --git a/tests/queries/0_stateless/01393_benchmark_secure_port.reference b/tests/queries/0_stateless/01393_benchmark_secure_port.reference
new file mode 100644
index 00000000000..4615c5c648a
--- /dev/null
+++ b/tests/queries/0_stateless/01393_benchmark_secure_port.reference
@@ -0,0 +1 @@
+Queries executed: 100.
diff --git a/tests/queries/0_stateless/01393_benchmark_secure_port.sh b/tests/queries/0_stateless/01393_benchmark_secure_port.sh
new file mode 100755
index 00000000000..32f092ca58a
--- /dev/null
+++ b/tests/queries/0_stateless/01393_benchmark_secure_port.sh
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+. $CURDIR/../shell_config.sh
+
+$CLICKHOUSE_BENCHMARK --secure -i 100 <<< 'SELECT 1' 2>&1 | grep -F 'Queries executed'