Skip to content

Commit f3b63f7

Browse files
committed
adjust tests
1 parent efbd918 commit f3b63f7

14 files changed

Lines changed: 61 additions & 43 deletions

tests/queries/0_stateless/01173_transaction_control_queries.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
-- Tags: no-ordinary-database, no-encrypted-storage
22

3+
set async_insert=0;
4+
35
drop table if exists mt1;
46
drop table if exists mt2;
57

tests/queries/0_stateless/01413_rows_events.sql

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
DROP TABLE IF EXISTS rows_events_test;
66
CREATE TABLE rows_events_test (k UInt32, v UInt32) ENGINE = MergeTree ORDER BY k SETTINGS add_minmax_index_for_numeric_columns=0;
77

8-
INSERT INTO /* test 01413, query 1 */ rows_events_test VALUES (1,1);
8+
INSERT INTO /* test 01413, query 1 */ rows_events_test SETTINGS async_insert=0 VALUES (1,1);
99
SYSTEM FLUSH LOGS query_log;
1010

1111
SELECT written_rows FROM system.query_log WHERE current_database = currentDatabase() AND query LIKE 'INSERT INTO /* test 01413, query 1 */ rows_events_test%' AND type = 2 AND event_date >= yesterday() ORDER BY event_time DESC LIMIT 1;
1212

1313
SELECT ProfileEvents['InsertedRows'] as value FROM system.query_log WHERE current_database = currentDatabase() AND query LIKE 'INSERT INTO /* test 01413, query 1 */ rows_events_test%' AND type = 2 AND event_date >= yesterday() ORDER BY event_time DESC LIMIT 1;
1414

1515

16-
INSERT INTO /* test 01413, query 2 */ rows_events_test VALUES (2,2), (3,3);
16+
INSERT INTO /* test 01413, query 2 */ rows_events_test SETTINGS async_insert=0 VALUES (2,2), (3,3);
1717
SYSTEM FLUSH LOGS query_log;
1818

1919
SELECT written_rows FROM system.query_log WHERE current_database = currentDatabase() AND query LIKE 'INSERT INTO /* test 01413, query 2 */ rows_events_test%' AND type = 2 AND event_date >= yesterday() ORDER BY event_time DESC LIMIT 1;

tests/queries/0_stateless/02124_insert_deduplication_token_multiple_blocks.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
55

66
QUERY_COUNT_ORIGIN_BLOCKS="SELECT COUNT(*) FROM system.parts WHERE database = currentDatabase() AND table = 'block_dedup_token' AND min_block_number == max_block_number;"
77
QUERY_SELECT_FROM_TABLE_ORDERED="SELECT * FROM block_dedup_token ORDER BY id;"
8-
INSERT_BLOCK_SETTINGS="max_insert_block_size=1&min_insert_block_size_rows=0&min_insert_block_size_bytes=0"
8+
INSERT_BLOCK_SETTINGS="async_insert=0&max_insert_block_size=1&min_insert_block_size_rows=0&min_insert_block_size_bytes=0"
99

1010
$CLICKHOUSE_CLIENT --query="DROP TABLE IF EXISTS block_dedup_token SYNC"
1111
$CLICKHOUSE_CLIENT --query="CREATE TABLE block_dedup_token (id Int32) ENGINE=MergeTree() ORDER BY id SETTINGS non_replicated_deduplication_window=0xFFFFFFFF;"

tests/queries/0_stateless/02306_part_types_profile_events.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
-- no-async-insert: 1 part is inserted with async inserts
33
DROP TABLE IF EXISTS t_parts_profile_events;
44

5+
SET async_insert = 0;
6+
57
CREATE TABLE t_parts_profile_events (a UInt32)
68
ENGINE = MergeTree ORDER BY tuple()
79
SETTINGS min_rows_for_wide_part = 10, min_bytes_for_wide_part = 0;

tests/queries/0_stateless/02310_profile_events_insert.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
66
. "$CURDIR"/../shell_config.sh
77

88
echo client
9-
$CLICKHOUSE_CLIENT --print-profile-events --profile-events-delay-ms=-1 -q "insert into function null('foo Int') values (1)" |& grep -o 'InsertedRows: .*'
9+
$CLICKHOUSE_CLIENT --async_insert=0 --print-profile-events --profile-events-delay-ms=-1 -q "insert into function null('foo Int') values (1)" |& grep -o 'InsertedRows: .*'
1010

1111
echo local
12-
$CLICKHOUSE_LOCAL --print-profile-events --profile-events-delay-ms=-1 -q "insert into function null('foo Int') values (1)" |& grep -o 'InsertedRows: .*'
12+
$CLICKHOUSE_LOCAL --async_insert=0 --print-profile-events --profile-events-delay-ms=-1 -q "insert into function null('foo Int') values (1)" |& grep -o 'InsertedRows: .*'
1313

1414
exit 0

tests/queries/0_stateless/02361_fsync_profile_events.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ret=1
2929
for i in {1..100}; do
3030
query_id="insert-$i-$CLICKHOUSE_DATABASE"
3131

32-
$CLICKHOUSE_CLIENT --query_id "$query_id" -q "insert into data_fsync_pe values (1)"
32+
$CLICKHOUSE_CLIENT --query_id "$query_id" --async_insert=0 -q "insert into data_fsync_pe values (1)"
3333

3434
read -r FileSync FileOpen DirectorySync FileSyncElapsedMicroseconds DirectorySyncElapsedMicroseconds <<<"$(
3535
$CLICKHOUSE_CLIENT -m --param_query_id "$query_id" -q "

tests/queries/0_stateless/02423_insert_stats_behaviour.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ $CLICKHOUSE_CLIENT -q "CREATE MATERIALIZED VIEW floats_to_target TO target_1 AS
1515
$CLICKHOUSE_CLIENT -q "CREATE MATERIALIZED VIEW floats_to_target_2 TO target_2 AS SELECT v FROM floats, numbers(2) n"
1616

1717
# Insertions into table without MVs
18-
$CLICKHOUSE_CLIENT -q "INSERT into target_1 FORMAT CSV 1.0"
19-
$CLICKHOUSE_LOCAL -q "SELECT number::Float64 AS v FROM numbers(10)" --format Native | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=INSERT+INTO+target_1+FORMAT+Native" --data-binary @-
20-
$CLICKHOUSE_LOCAL -q "SELECT number::Float64 AS v FROM numbers(10)" --format RowBinary | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=INSERT+INTO+target_1+FORMAT+RowBinary" --data-binary @-
18+
$CLICKHOUSE_CLIENT --async_insert=0 -q "INSERT into target_1 FORMAT CSV 1.0"
19+
$CLICKHOUSE_LOCAL -q "SELECT number::Float64 AS v FROM numbers(10)" --format Native | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&async_insert=0&query=INSERT+INTO+target_1+FORMAT+Native" --data-binary @-
20+
$CLICKHOUSE_LOCAL -q "SELECT number::Float64 AS v FROM numbers(10)" --format RowBinary | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&async_insert=0&query=INSERT+INTO+target_1+FORMAT+RowBinary" --data-binary @-
2121

2222
# Insertions into table without 2 MVs (1:1 and 1:2 rows)
23-
$CLICKHOUSE_CLIENT -q "INSERT into floats FORMAT CSV 1.0"
24-
$CLICKHOUSE_LOCAL -q "SELECT number::Float64 AS v FROM numbers(10)" --format Native | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=INSERT+INTO+floats+FORMAT+Native" --data-binary @-
25-
$CLICKHOUSE_LOCAL -q "SELECT number::Float64 AS v FROM numbers(10)" --format RowBinary | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&query=INSERT+INTO+floats+FORMAT+RowBinary" --data-binary @-
23+
$CLICKHOUSE_CLIENT --async_insert=0 -q "INSERT into floats FORMAT CSV 1.0"
24+
$CLICKHOUSE_LOCAL -q "SELECT number::Float64 AS v FROM numbers(10)" --format Native | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&async_insert=0&query=INSERT+INTO+floats+FORMAT+Native" --data-binary @-
25+
$CLICKHOUSE_LOCAL -q "SELECT number::Float64 AS v FROM numbers(10)" --format RowBinary | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&async_insert=0&query=INSERT+INTO+floats+FORMAT+RowBinary" --data-binary @-
2626

2727
# Wait for all 6 insert queries to appear in query_log.
2828
# There is a race between HTTP response being sent and the query_log entry being written,

tests/queries/0_stateless/02423_insert_summary_behaviour.sh

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ $CLICKHOUSE_CLIENT -q "CREATE MATERIALIZED VIEW floats_to_target TO target_1 AS
1111
$CLICKHOUSE_CLIENT -q "CREATE MATERIALIZED VIEW floats_to_target_2 TO target_2 AS SELECT v FROM floats, numbers(2) n"
1212

1313
echo "No materialized views"
14-
${CLICKHOUSE_CURL} "${CLICKHOUSE_URL}&http_wait_end_of_query=1&query=INSERT+INTO+target_1" -d "VALUES(1.0)" -v 2>&1 | grep 'X-ClickHouse-Summary' | sed 's/,\"elapsed_ns[^}]*//'
15-
$CLICKHOUSE_LOCAL -q "SELECT number::Float64 AS v FROM numbers(10)" --format Native | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&http_wait_end_of_query=1&query=INSERT+INTO+target_1+FORMAT+Native" --data-binary @- -v 2>&1 | grep 'X-ClickHouse-Summary' | sed 's/,\"elapsed_ns[^}]*//'
16-
$CLICKHOUSE_LOCAL -q "SELECT number::Float64 AS v FROM numbers(10)" --format RowBinary | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&http_wait_end_of_query=1&query=INSERT+INTO+target_1+FORMAT+RowBinary" --data-binary @- -v 2>&1 | grep 'X-ClickHouse-Summary' | sed 's/,\"elapsed_ns[^}]*//'
14+
${CLICKHOUSE_CURL} "${CLICKHOUSE_URL}&async_insert=0&http_wait_end_of_query=1&query=INSERT+INTO+target_1" -d "VALUES(1.0)" -v 2>&1 | grep 'X-ClickHouse-Summary' | sed 's/,\"elapsed_ns[^}]*//'
15+
$CLICKHOUSE_LOCAL -q "SELECT number::Float64 AS v FROM numbers(10)" --format Native | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&async_insert=0&http_wait_end_of_query=1&query=INSERT+INTO+target_1+FORMAT+Native" --data-binary @- -v 2>&1 | grep 'X-ClickHouse-Summary' | sed 's/,\"elapsed_ns[^}]*//'
16+
$CLICKHOUSE_LOCAL -q "SELECT number::Float64 AS v FROM numbers(10)" --format RowBinary | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&async_insert=0&http_wait_end_of_query=1&query=INSERT+INTO+target_1+FORMAT+RowBinary" --data-binary @- -v 2>&1 | grep 'X-ClickHouse-Summary' | sed 's/,\"elapsed_ns[^}]*//'
1717

1818
echo "With materialized views"
19-
${CLICKHOUSE_CURL} "${CLICKHOUSE_URL}&http_wait_end_of_query=1&query=INSERT+INTO+floats" -d "VALUES(1.0)" -v 2>&1 | grep 'X-ClickHouse-Summary' | sed 's/,\"elapsed_ns[^}]*//'
20-
$CLICKHOUSE_LOCAL -q "SELECT number::Float64 AS v FROM numbers(10)" --format Native | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&http_wait_end_of_query=1&query=INSERT+INTO+floats+FORMAT+Native" --data-binary @- -v 2>&1 | grep 'X-ClickHouse-Summary' | sed 's/,\"elapsed_ns[^}]*//'
21-
$CLICKHOUSE_LOCAL -q "SELECT number::Float64 AS v FROM numbers(10)" --format RowBinary | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&http_wait_end_of_query=1&query=INSERT+INTO+floats+FORMAT+RowBinary" --data-binary @- -v 2>&1 | grep 'X-ClickHouse-Summary' | sed 's/,\"elapsed_ns[^}]*//'
19+
${CLICKHOUSE_CURL} "${CLICKHOUSE_URL}&async_insert=0&http_wait_end_of_query=1&query=INSERT+INTO+floats" -d "VALUES(1.0)" -v 2>&1 | grep 'X-ClickHouse-Summary' | sed 's/,\"elapsed_ns[^}]*//'
20+
$CLICKHOUSE_LOCAL -q "SELECT number::Float64 AS v FROM numbers(10)" --format Native | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&async_insert=0&http_wait_end_of_query=1&query=INSERT+INTO+floats+FORMAT+Native" --data-binary @- -v 2>&1 | grep 'X-ClickHouse-Summary' | sed 's/,\"elapsed_ns[^}]*//'
21+
$CLICKHOUSE_LOCAL -q "SELECT number::Float64 AS v FROM numbers(10)" --format RowBinary | ${CLICKHOUSE_CURL} -sS "${CLICKHOUSE_URL}&async_insert=0&http_wait_end_of_query=1&query=INSERT+INTO+floats+FORMAT+RowBinary" --data-binary @- -v 2>&1 | grep 'X-ClickHouse-Summary' | sed 's/,\"elapsed_ns[^}]*//'

tests/queries/0_stateless/02480_client_option_print_num_processed_rows.expect

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,23 +31,23 @@ send -- "\$CLICKHOUSE_CLIENT --query 'CREATE TABLE num_processed_rows_test_0 (va
3131
expect "bash) "
3232

3333
### When requested we should get the count on exit:
34-
send -- "\$CLICKHOUSE_CLIENT --processed-rows --query \"INSERT INTO num_processed_rows_test_0 VALUES (\'x\');\" \r"
34+
send -- "\$CLICKHOUSE_CLIENT --async_insert=0 --processed-rows --query \"INSERT INTO num_processed_rows_test_0 VALUES (\'x\');\" \r"
3535
expect "Processed rows: 1"
3636
expect "bash) "
3737

38-
send "yes | head -n7757 | \$CLICKHOUSE_CLIENT --processed-rows --query 'INSERT INTO num_processed_rows_test_0 format TSV\'\r"
38+
send "yes | head -n7757 | \$CLICKHOUSE_CLIENT --async_insert=0 --processed-rows --query 'INSERT INTO num_processed_rows_test_0 format TSV\'\r"
3939
expect "Processed rows: 7757"
4040
expect "bash) "
4141

4242

4343

4444
### By default it should not show up:
4545

46-
send -- "\$CLICKHOUSE_CLIENT --query \"INSERT INTO num_processed_rows_test_0 VALUES (\'x\');\" && echo OK\r"
46+
send -- "\$CLICKHOUSE_CLIENT --async_insert=0 --query \"INSERT INTO num_processed_rows_test_0 VALUES (\'x\');\" && echo OK\r"
4747
expect -exact "OK\r"
4848
expect "bash) "
4949

50-
send "yes | head -n7757 | \$CLICKHOUSE_CLIENT --query 'INSERT INTO num_processed_rows_test_0 format TSV\' && echo OK\r"
50+
send "yes | head -n7757 | \$CLICKHOUSE_CLIENT --async_insert=0 --query 'INSERT INTO num_processed_rows_test_0 format TSV\' && echo OK\r"
5151
expect -exact "OK\r"
5252
expect "bash) "
5353

tests/queries/0_stateless/03008_deduplication_insert_into_partitioned_table.reference

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,13 @@ mv_table is not deduplicated because the inserted blocks was different:
1111
2 B
1212
2 B
1313
2 C
14+
but partitioned_table is not deduplicated with async insert bacause async deduplication works in scope of one insertion:
15+
1 A
16+
1 A
17+
1 D
18+
2 B
19+
2 B
20+
2 C
1421
with user deduplication token
1522
partitioned_table is not deduplicated because different tokens:
1623
1 A

0 commit comments

Comments
 (0)