Skip to content

Commit e53a0bc

Browse files
Backport ClickHouse#92175 to 25.8: release request stream in insert select
1 parent db02b20 commit e53a0bc

File tree

3 files changed

+29
-0
lines changed

3 files changed

+29
-0
lines changed

src/Interpreters/executeQuery.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,6 +1336,8 @@ static BlockIO executeQueryImpl(
13361336
input_storage.setPipe(std::move(pipe));
13371337
}
13381338
}
1339+
1340+
insert_query->tail.reset();
13391341
}
13401342
else
13411343
{

tests/queries/0_stateless/03760_keep_alive_insert_select.reference

Whitespace-only changes.
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
#!/usr/bin/env bash
2+
3+
CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
4+
# shellcheck source=../shell_config.sh
5+
. "$CURDIR"/../shell_config.sh
6+
7+
CLICKHOUSE_URL="${CLICKHOUSE_URL}&http_wait_end_of_query=1"
8+
9+
${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -H 'Accept-Encoding: gzip' \
10+
-d 'DROP TABLE IF EXISTS insert_number_table'
11+
${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -H 'Accept-Encoding: gzip' \
12+
-d 'CREATE TABLE insert_number_table (record UInt32) Engine = Memory'
13+
14+
query_id=$(
15+
${CLICKHOUSE_CURL} -vsS "${CLICKHOUSE_URL}&max_block_size=1&http_headers_progress_interval_ms=10&send_progress_in_http_headers=1" \
16+
-d 'INSERT INTO insert_number_table (record) SELECT number FROM system.numbers LIMIT 10' 2>&1 \
17+
| grep -F '< X-ClickHouse-Query-Id:' | sed 's/< X-ClickHouse-Query-Id: //' | tr -d '\n\t\r' | xargs
18+
)
19+
20+
${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" \
21+
-d "system flush logs text_log"
22+
23+
${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" \
24+
-d "SELECT message FROM system.text_log WHERE level='Error' AND query_id='${query_id}' AND message LIKE '%Request stream is shared by multiple threads. HTTP keep alive is not possible.%'"
25+
26+
${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}" -H 'Accept-Encoding: gzip' \
27+
-d 'DROP TABLE insert_number_table'

0 commit comments

Comments
 (0)