thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

better renaming

Browse Source
This commit is contained in:
Nikita Mikhaylov 2021-04-13 00:52:16 +03:00
parent 09a62e713a
commit a15757a9c9
14 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/test/fasttest/run.sh
View File

@ -368,7 +368,7 @@ function run_tests
01666_blns 01666_blns
# Depends on AWS # Depends on AWS
01801_s3_distributed 01801_s3_cluster
) )
(time clickhouse-test --hung-check -j 8 --order=random --use-skip-list --no-long --testname --shard --zookeeper --skip "${TESTS_TO_SKIP[@]}" -- "$FASTTEST_FOCUS" 2>&1 ||:) | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/test_log.txt" (time clickhouse-test --hung-check -j 8 --order=random --use-skip-list --no-long --testname --shard --zookeeper --skip "${TESTS_TO_SKIP[@]}" -- "$FASTTEST_FOCUS" 2>&1 ||:) | ts '%Y-%m-%d %H:%M:%S' | tee "$FASTTEST_OUTPUT/test_log.txt"

0
src/Storages/StorageS3Distributed.cpp → src/Storages/StorageS3Cluster.cpp
View File

0
src/Storages/StorageS3Distributed.h → src/Storages/StorageS3Cluster.h
View File

0
src/TableFunctions/TableFunctionS3Distributed.cpp → src/TableFunctions/TableFunctionS3Cluster.cpp
View File

0
src/TableFunctions/TableFunctionS3Distributed.h → src/TableFunctions/TableFunctionS3Cluster.h
View File

0
tests/integration/test_s3_distributed/__init__.py → tests/integration/test_s3_cluster/__init__.py
View File

0
tests/integration/test_s3_distributed/configs/cluster.xml → tests/integration/test_s3_cluster/configs/cluster.xml
View File

0
tests/integration/test_s3_distributed/data/clickhouse/part1.csv → tests/integration/test_s3_cluster/data/clickhouse/part1.csv
View File

0
tests/integration/test_s3_distributed/data/clickhouse/part123.csv → tests/integration/test_s3_cluster/data/clickhouse/part123.csv
View File

0
tests/integration/test_s3_distributed/data/database/part2.csv → tests/integration/test_s3_cluster/data/database/part2.csv
View File

0
tests/integration/test_s3_distributed/data/database/partition675.csv → tests/integration/test_s3_cluster/data/database/partition675.csv
View File

12
tests/integration/test_s3_distributed/test.py → tests/integration/test_s3_cluster/test.py
View File

@ -48,7 +48,7 @@ def test_select_all(started_cluster):
ORDER BY (name, value, polygon)""") ORDER BY (name, value, polygon)""")
# print(pure_s3) # print(pure_s3)
s3_distibuted = node.query(""" s3_distibuted = node.query("""
SELECT * from s3Distributed( SELECT * from s3Cluster(
'cluster_simple', 'cluster_simple',
'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV',
'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') ORDER BY (name, value, polygon)""") 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') ORDER BY (name, value, polygon)""")
@ -66,7 +66,7 @@ def test_count(started_cluster):
'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')""") 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')""")
# print(pure_s3) # print(pure_s3)
s3_distibuted = node.query(""" s3_distibuted = node.query("""
SELECT count(*) from s3Distributed( SELECT count(*) from s3Cluster(
'cluster_simple', 'http://minio1:9001/root/data/{clickhouse,database}/*', 'cluster_simple', 'http://minio1:9001/root/data/{clickhouse,database}/*',
'minio', 'minio123', 'CSV', 'minio', 'minio123', 'CSV',
'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')""") 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')""")
@ -96,12 +96,12 @@ def test_union_all(started_cluster):
s3_distibuted = node.query(""" s3_distibuted = node.query("""
SELECT * FROM SELECT * FROM
( (
SELECT * from s3Distributed( SELECT * from s3Cluster(
'cluster_simple', 'cluster_simple',
'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV',
'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
UNION ALL UNION ALL
SELECT * from s3Distributed( SELECT * from s3Cluster(
'cluster_simple', 'cluster_simple',
'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV', 'http://minio1:9001/root/data/{clickhouse,database}/*', 'minio', 'minio123', 'CSV',
'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
@ -116,12 +116,12 @@ def test_union_all(started_cluster):
def test_wrong_cluster(started_cluster): def test_wrong_cluster(started_cluster):
node = started_cluster.instances['s0_0_0'] node = started_cluster.instances['s0_0_0']
error = node.query_and_get_error(""" error = node.query_and_get_error("""
SELECT count(*) from s3Distributed( SELECT count(*) from s3Cluster(
'non_existent_cluster', 'non_existent_cluster',
'http://minio1:9001/root/data/{clickhouse,database}/*', 'http://minio1:9001/root/data/{clickhouse,database}/*',
'minio', 'minio123', 'CSV', 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))') 'minio', 'minio123', 'CSV', 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')
UNION ALL UNION ALL
SELECT count(*) from s3Distributed( SELECT count(*) from s3Cluster(
'non_existent_cluster', 'non_existent_cluster',
'http://minio1:9001/root/data/{clickhouse,database}/*', 'http://minio1:9001/root/data/{clickhouse,database}/*',
'minio', 'minio123', 'CSV', 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')""") 'minio', 'minio123', 'CSV', 'name String, value UInt32, polygon Array(Array(Tuple(Float64, Float64)))')""")

0
tests/queries/0_stateless/01801_s3_distributed.reference → tests/queries/0_stateless/01801_s3_cluster.reference
View File

2
tests/queries/0_stateless/01801_s3_distributed.sh → tests/queries/0_stateless/01801_s3_cluster.sh
View File

@ -9,4 +9,4 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
${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 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 s3Distributed('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;" ${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;"