From 11c79e13718f5411bbc6ef996f80a8713eb1b380 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@yandex-team.ru>
Date: Thu, 11 Jun 2020 20:53:33 +0300
Subject: [PATCH] Fix JSON in clickhouse-benchmark; add test

---
 programs/benchmark/Benchmark.cpp                         | 4 ++--
 tests/queries/0_stateless/01306_benchmark_json.reference | 1 +
 tests/queries/0_stateless/01306_benchmark_json.sh        | 9 +++++++++
 3 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 tests/queries/0_stateless/01306_benchmark_json.reference
 create mode 100755 tests/queries/0_stateless/01306_benchmark_json.sh

diff --git a/programs/benchmark/Benchmark.cpp b/programs/benchmark/Benchmark.cpp
index 1b2867940ea..e17320b39ea 100644
--- a/programs/benchmark/Benchmark.cpp
+++ b/programs/benchmark/Benchmark.cpp
@@ -469,7 +469,7 @@ private:
             const auto & info = infos[i];
 
             json_out << double_quote << connections[i]->getDescription() << ": {\n";
-            json_out << double_quote << "statistics: {\n";
+            json_out << double_quote << "statistics" << ": {\n";
 
             print_key_value("QPS", info->queries / info->work_time);
             print_key_value("RPS", info->read_rows / info->work_time);
@@ -479,7 +479,7 @@ private:
             print_key_value("num_queries", info->queries.load(), false);
 
             json_out << "},\n";
-            json_out << double_quote << "query_time_percentiles: {\n";
+            json_out << double_quote << "query_time_percentiles" << ": {\n";
 
             for (int percent = 0; percent <= 90; percent += 10)
                 print_percentile(*info, percent);
diff --git a/tests/queries/0_stateless/01306_benchmark_json.reference b/tests/queries/0_stateless/01306_benchmark_json.reference
new file mode 100644
index 00000000000..d00491fd7e5
--- /dev/null
+++ b/tests/queries/0_stateless/01306_benchmark_json.reference
@@ -0,0 +1 @@
+1
diff --git a/tests/queries/0_stateless/01306_benchmark_json.sh b/tests/queries/0_stateless/01306_benchmark_json.sh
new file mode 100755
index 00000000000..3b9a9b93180
--- /dev/null
+++ b/tests/queries/0_stateless/01306_benchmark_json.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+. $CURDIR/../shell_config.sh
+
+set -e
+
+$CLICKHOUSE_BENCHMARK --iterations 10 --json ${CLICKHOUSE_TMP}/out.json <<< "SELECT 1" 2>/dev/null && cat ${CLICKHOUSE_TMP}/out.json |
+    $CLICKHOUSE_LOCAL --input-format JSONAsString --structure "s String" --query "SELECT isValidJSON(s) FROM table"