From 4a88e5f281746ed642c7afbc2de72a79dd837e13 Mon Sep 17 00:00:00 2001 From: Nikita Mikhaylov Date: Fri, 27 Aug 2021 13:12:19 +0000 Subject: [PATCH] Better --- docker/test/stateless/setup_minio.sh | 13 ++++++++-- .../0_stateless/01801_s3_cluster.reference | 24 +++++++++++++++++++ tests/queries/0_stateless/01801_s3_cluster.sh | 21 ---------------- .../queries/0_stateless/01801_s3_cluster.sql | 2 ++ .../02012_settings_clause_for_s3.reference | 3 +++ .../02012_settings_clause_for_s3.sql | 14 ++++------- tests/queries/0_stateless/data_minio/a.tsv | 4 ++++ tests/queries/0_stateless/data_minio/b.tsv | 4 ++++ tests/queries/0_stateless/data_minio/c.tsv | 4 ++++ .../data_minio/tsv_with_header.tsv | 4 ++++ 10 files changed, 60 insertions(+), 33 deletions(-) delete mode 100755 tests/queries/0_stateless/01801_s3_cluster.sh create mode 100755 tests/queries/0_stateless/01801_s3_cluster.sql create mode 100644 tests/queries/0_stateless/data_minio/a.tsv create mode 100644 tests/queries/0_stateless/data_minio/b.tsv create mode 100644 tests/queries/0_stateless/data_minio/c.tsv create mode 100644 tests/queries/0_stateless/data_minio/tsv_with_header.tsv diff --git a/docker/test/stateless/setup_minio.sh b/docker/test/stateless/setup_minio.sh index 0b224a64ac8..ad8bb2975f2 100755 --- a/docker/test/stateless/setup_minio.sh +++ b/docker/test/stateless/setup_minio.sh @@ -15,5 +15,14 @@ chmod +x ./mc ./mc admin policy set clickminio readwrite user=test ./mc mb clickminio/test -echo -e "a b c\na b c\na b c\n" > a.txt -./mc cp a.txt clickminio/test + +# Upload data to Minio. By default after unpacking all tests will in +# /usr/share/clickhouse-test/queries + +cd /usr/share/clickhouse-test/queries/0_stateless/test_minio + +FILES=$(ls .) +for FILE in $FILES; do + echo $FILE; + ./mc cp $FILE myminio/test/$FILE; +done diff --git a/tests/queries/0_stateless/01801_s3_cluster.reference b/tests/queries/0_stateless/01801_s3_cluster.reference index e69de29bb2d..d0f628ad09a 100644 --- a/tests/queries/0_stateless/01801_s3_cluster.reference +++ b/tests/queries/0_stateless/01801_s3_cluster.reference @@ -0,0 +1,24 @@ +0 0 0 +0 0 0 +0 0 0 +1 2 3 +4 5 6 +7 8 9 +10 11 12 +13 14 15 +16 17 18 +20 21 22 +23 24 25 +26 27 28 +0 0 0 +0 0 0 +0 0 0 +1 2 3 +4 5 6 +7 8 9 +10 11 12 +13 14 15 +16 17 18 +20 21 22 +23 24 25 +26 27 28 diff --git a/tests/queries/0_stateless/01801_s3_cluster.sh b/tests/queries/0_stateless/01801_s3_cluster.sh deleted file mode 100755 index 460f3856a2f..00000000000 --- a/tests/queries/0_stateless/01801_s3_cluster.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env bash - -# NOTE: this is a partial copy of the 01683_dist_INSERT_block_structure_mismatch, -# but this test also checks the log messages - -CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) -# shellcheck source=../shell_config.sh -. "$CUR_DIR"/../shell_config.sh - -if [[ -z $S3_ACCESS_KEY_ID ]]; then - echo "@@SKIP@@: Missing \$S3_ACCESS_KEY_ID" - exit 0 -fi - -if [[ -z $S3_SECRET_ACCESS ]]; then - echo "@@SKIP@@: Missing \$S3_SECRET_ACCESS" - exit 0 -fi - -${CLICKHOUSE_CLIENT_BINARY} --send_logs_level="none" -q "SELECT * FROM s3('https://s3.mds.yandex.net/clickhouse-test-reports/*/*/functional_stateless_tests_(ubsan)/test_results.tsv', '$S3_ACCESS_KEY_ID', '$S3_SECRET_ACCESS', 'LineAsString', 'line String') limit 100 FORMAT Null;" -${CLICKHOUSE_CLIENT_BINARY} --send_logs_level="none" -q "SELECT * FROM s3Cluster('test_cluster_two_shards', 'https://s3.mds.yandex.net/clickhouse-test-reports/*/*/functional_stateless_tests_(ubsan)/test_results.tsv', '$S3_ACCESS_KEY_ID', '$S3_SECRET_ACCESS', 'LineAsString', 'line String') limit 100 FORMAT Null;" diff --git a/tests/queries/0_stateless/01801_s3_cluster.sql b/tests/queries/0_stateless/01801_s3_cluster.sql new file mode 100755 index 00000000000..9c13c257249 --- /dev/null +++ b/tests/queries/0_stateless/01801_s3_cluster.sql @@ -0,0 +1,2 @@ +select * from s3('http://localhost:11111/test/{a,b,c}.tsv', 'test', 'testtest', 'TSV', 'a UInt64, b UInt64, c UInt64') ORDER BY a, b, c; +select * from s3Cluster('test_cluster_two_shards', 'http://localhost:11111/test/{a,b,c}.tsv', 'test', 'testtest', 'TSV', 'a UInt64, b UInt64, c UInt64') ORDER BY a, b, c; diff --git a/tests/queries/0_stateless/02012_settings_clause_for_s3.reference b/tests/queries/0_stateless/02012_settings_clause_for_s3.reference index e69de29bb2d..c382944ffce 100644 --- a/tests/queries/0_stateless/02012_settings_clause_for_s3.reference +++ b/tests/queries/0_stateless/02012_settings_clause_for_s3.reference @@ -0,0 +1,3 @@ +ClickHouse 1 +Hello 2 +Hedhehog 3 diff --git a/tests/queries/0_stateless/02012_settings_clause_for_s3.sql b/tests/queries/0_stateless/02012_settings_clause_for_s3.sql index 79ccff14166..716d6faf0b3 100644 --- a/tests/queries/0_stateless/02012_settings_clause_for_s3.sql +++ b/tests/queries/0_stateless/02012_settings_clause_for_s3.sql @@ -1,13 +1,7 @@ --- DROP TABLE IF EXISTS table_with_range; +DROP TABLE IF EXISTS table_with_range; --- CREATE TABLE table_with_range --- ( --- `name` String, --- `value` UInt32 --- ) --- ENGINE = S3('https://storage.yandexcloud.net/my-test-bucket-768/{some,another}_prefix/some_file_{1..3}', 'CSV') --- SETTINGS input_format_with_names_use_header = 0; +CREATE TABLE table_with_range(`name` String,`number` UInt32)　ENGINE = S3('http://localhost:11111/test/tsv_with_header.tsv', 'lapa', 'lapalapa', 'TSVWithNames')　SETTINGS input_format_with_names_use_header = 1; -select * from s3('http://localhost:11111/test/a.txt', 'test', 'testtest', 'LineAsString', 'line String'); +select * from table_with_range; --- DROP TABLE IF EXISTS table_with_range; +DROP TABLE IF EXISTS table_with_range; diff --git a/tests/queries/0_stateless/data_minio/a.tsv b/tests/queries/0_stateless/data_minio/a.tsv new file mode 100644 index 00000000000..acd7c60768b --- /dev/null +++ b/tests/queries/0_stateless/data_minio/a.tsv @@ -0,0 +1,4 @@ +1 2 3 +4 5 6 +7 8 9 +0 0 0 diff --git a/tests/queries/0_stateless/data_minio/b.tsv b/tests/queries/0_stateless/data_minio/b.tsv new file mode 100644 index 00000000000..a32392250a7 --- /dev/null +++ b/tests/queries/0_stateless/data_minio/b.tsv @@ -0,0 +1,4 @@ +10 11 12 +13 14 15 +16 17 18 +0 0 0 diff --git a/tests/queries/0_stateless/data_minio/c.tsv b/tests/queries/0_stateless/data_minio/c.tsv new file mode 100644 index 00000000000..c935e93430c --- /dev/null +++ b/tests/queries/0_stateless/data_minio/c.tsv @@ -0,0 +1,4 @@ +20 21 22 +23 24 25 +26 27 28 +0 0 0 diff --git a/tests/queries/0_stateless/data_minio/tsv_with_header.tsv b/tests/queries/0_stateless/data_minio/tsv_with_header.tsv new file mode 100644 index 00000000000..d93a8c9ba0c --- /dev/null +++ b/tests/queries/0_stateless/data_minio/tsv_with_header.tsv @@ -0,0 +1,4 @@ +number name +1 ClickHouse +2 Hello +3 Hedhehog