From 08073903ed10aa15d1fbddea6d90929d7f9e4619 Mon Sep 17 00:00:00 2001
From: Alexander Tokmakov <avtokmakov@yandex-team.ru>
Date: Wed, 10 Jun 2020 17:24:42 +0300
Subject: [PATCH] fix query_id of http queries

---
 src/Interpreters/Context.cpp                     |  2 ++
 .../0_stateless/01194_http_query_id.reference    |  1 +
 tests/queries/0_stateless/01194_http_query_id.sh | 16 ++++++++++++++++
 3 files changed, 19 insertions(+)
 create mode 100644 tests/queries/0_stateless/01194_http_query_id.reference
 create mode 100755 tests/queries/0_stateless/01194_http_query_id.sh

diff --git a/src/Interpreters/Context.cpp b/src/Interpreters/Context.cpp
index cbf00836103..7b636b84c68 100644
--- a/src/Interpreters/Context.cpp
+++ b/src/Interpreters/Context.cpp
@@ -166,6 +166,8 @@ public:
         if (!session.unique())
             throw Exception("Session is locked by a concurrent client.", ErrorCodes::SESSION_IS_LOCKED);
 
+        session->context.client_info = context.client_info;
+
         return session;
     }
 
diff --git a/tests/queries/0_stateless/01194_http_query_id.reference b/tests/queries/0_stateless/01194_http_query_id.reference
new file mode 100644
index 00000000000..b8626c4cff2
--- /dev/null
+++ b/tests/queries/0_stateless/01194_http_query_id.reference
@@ -0,0 +1 @@
+4
diff --git a/tests/queries/0_stateless/01194_http_query_id.sh b/tests/queries/0_stateless/01194_http_query_id.sh
new file mode 100755
index 00000000000..381ae67f88f
--- /dev/null
+++ b/tests/queries/0_stateless/01194_http_query_id.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+. $CURDIR/../shell_config.sh
+
+url="http://${CLICKHOUSE_HOST}:${CLICKHOUSE_PORT_HTTP}/?session_id=test_01194"
+rnd=$RANDOM
+
+${CLICKHOUSE_CURL} -sS "$url&query=SELECT+$rnd,1" > /dev/null
+${CLICKHOUSE_CURL} -sS "$url&query=SELECT+$rnd,2" > /dev/null
+${CLICKHOUSE_CURL} -sS "$url" --data "SELECT $rnd,3" > /dev/null
+${CLICKHOUSE_CURL} -sS "$url" --data "SELECT $rnd,4" > /dev/null
+
+${CLICKHOUSE_CURL} -sS "$url" --data "SYSTEM FLUSH LOGS"
+
+${CLICKHOUSE_CURL} -sS "$url&query=SELECT+count(DISTINCT+query_id)+FROM+system.query_log+WHERE+query+LIKE+'SELECT+$rnd%25'"