From 3bcd0b559d8eb1bd3e1d9aadbbbb5e886992adb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=87=8C=E6=B6=9B?= Date: Wed, 11 Oct 2023 16:32:03 +0800 Subject: [PATCH] fix tests --- .../02884_getHttpHeaderFunction.sh | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/tests/queries/0_stateless/02884_getHttpHeaderFunction.sh b/tests/queries/0_stateless/02884_getHttpHeaderFunction.sh index 54e3f8715d7..cb1c22ea4b0 100755 --- a/tests/queries/0_stateless/02884_getHttpHeaderFunction.sh +++ b/tests/queries/0_stateless/02884_getHttpHeaderFunction.sh @@ -15,11 +15,11 @@ echo "SELECT getHttpHeader('X-Clickhouse-User'), getHttpHeader('key1'), getHttpH echo "SELECT getHttpHeader('X-' || 'Clickhouse' || '-User'), getHttpHeader('key1'), getHttpHeader('key2')" | curl -s -H 'X-Clickhouse-User: default' \ -H 'X-ClickHouse-Key: ' -H 'key1: value1' -H 'key2: value2' 'http://localhost:8123/' -d @- -$CLICKHOUSE_CLIENT -q "CREATE DATABASE IF NOT EXISTS test" -$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS 02884_get_http_header" +db_name=db_$(echo $RANDOM |md5sum |cut -c 1-4) -$CLICKHOUSE_CLIENT -q " - CREATE TABLE IF NOT EXISTS test.02884_get_http_header +$CLICKHOUSE_CLIENT -q "CREATE DATABASE IF NOT EXISTS ${db_name};" + +$CLICKHOUSE_CLIENT -q "CREATE TABLE ${db_name}.02884_get_http_header (id UInt32, http_user String DEFAULT getHttpHeader('X-Clickhouse-User'), http_key1 String DEFAULT getHttpHeader('http_header_key1'), @@ -34,7 +34,7 @@ $CLICKHOUSE_CLIENT -q " ORDER BY id" #Insert data via http request -echo "INSERT INTO test.02884_get_http_header (id) values (1)" | curl -s -H 'X-ClickHouse-User: default' -H 'X-ClickHouse-Key: ' \ +echo "INSERT INTO ${db_name}.02884_get_http_header (id) values (1)" | curl -s -H 'X-ClickHouse-User: default' -H 'X-ClickHouse-Key: ' \ -H 'http_header_key1: row1_value1'\ -H 'http_header_key2: row1_value2'\ -H 'http_header_key3: row1_value3'\ @@ -43,7 +43,7 @@ echo "INSERT INTO test.02884_get_http_header (id) values (1)" | curl -s -H 'X-Cl -H 'http_header_key6: row1_value6'\ -H 'http_header_key7: row1_value7' 'http://localhost:8123/' -d @- -echo "INSERT INTO test.02884_get_http_header (id) values (2)" | curl -s -H 'X-ClickHouse-User: default' -H 'X-ClickHouse-Key: ' \ +echo "INSERT INTO ${db_name}.02884_get_http_header (id) values (2)" | curl -s -H 'X-ClickHouse-User: default' -H 'X-ClickHouse-Key: ' \ -H 'http_header_key1: row2_value1'\ -H 'http_header_key2: row2_value2'\ -H 'http_header_key3: row2_value3'\ @@ -52,21 +52,19 @@ echo "INSERT INTO test.02884_get_http_header (id) values (2)" | curl -s -H 'X-Cl -H 'http_header_key6: row2_value6'\ -H 'http_header_key7: row2_value7' 'http://localhost:8123/' -d @- -$CLICKHOUSE_CLIENT -q "SELECT id, http_user, http_key1, http_key2, http_key3, http_key4, http_key5, http_key6, http_key7 FROM test.02884_get_http_header ORDER BY id;" +$CLICKHOUSE_CLIENT -q "SELECT id, http_user, http_key1, http_key2, http_key3, http_key4, http_key5, http_key6, http_key7 FROM ${db_name}.02884_get_http_header ORDER BY id;" #Insert data via tcp client -$CLICKHOUSE_CLIENT -q "INSERT INTO test.02884_get_http_header (id) values (3)" -$CLICKHOUSE_CLIENT -q "SELECT * FROM test.02884_get_http_header where id = 3" -echo "SELECT getHttpHeader('key_from_query_1'), getHttpHeader('key_from_query_2'), getHttpHeader('key_from_query_3'), * FROM test.02884_get_http_header ORDER BY id" | curl -s -H 'X-Clickhouse-User: default' \ +$CLICKHOUSE_CLIENT --param_db="$db_name" -q "INSERT INTO ${db_name}.02884_get_http_header (id) values (3)" +$CLICKHOUSE_CLIENT --param_db="$db_name" -q "SELECT * FROM ${db_name}.02884_get_http_header where id = 3" +echo "SELECT getHttpHeader('key_from_query_1'), getHttpHeader('key_from_query_2'), getHttpHeader('key_from_query_3'), * FROM ${db_name}.02884_get_http_header ORDER BY id" | curl -s -H 'X-Clickhouse-User: default' \ -H 'X-ClickHouse-Key: ' -H 'key_from_query_1: value_from_query_1' -H 'key_from_query_2: value_from_query_2' -H 'key_from_query_3: value_from_query_3' 'http://localhost:8123/' -d @- -$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS test.02884_get_http_header" +$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS ${db_name}.02884_get_http_header" -$CLICKHOUSE_CLIENT -q "CREATE TABLE IF NOT EXISTS test.02884_header_from_table (header_name String) Engine=Memory" -$CLICKHOUSE_CLIENT -q "INSERT INTO test.02884_header_from_table values ('X-Clickhouse-User'), ('http_key1'), ('http_key2')" +$CLICKHOUSE_CLIENT -q "CREATE TABLE IF NOT EXISTS ${db_name}.02884_header_from_table (header_name String) Engine=Memory" +$CLICKHOUSE_CLIENT -q "INSERT INTO ${db_name}.02884_header_from_table values ('X-Clickhouse-User'), ('http_key1'), ('http_key2')" -echo "SELECT getHttpHeader(header_name) as value from (select * FROM test.02884_header_from_table) order by value" | curl -s -H 'X-Clickhouse-User: default' \ +echo "SELECT getHttpHeader(header_name) as value from (select * FROM ${db_name}.02884_header_from_table) order by value" | curl -s -H 'X-Clickhouse-User: default' \ -H 'X-ClickHouse-Key: ' -H 'http_key1: http_value1' -H 'http_key2: http_value2' 'http://localhost:8123/' -d @- -$CLICKHOUSE_CLIENT -q "DROP TABLE IF EXISTS test.02884_header_from_table" - - +$CLICKHOUSE_CLIENT -q "DROP DATABASE ${db_name}"