diff --git a/docker/test/fasttest/run.sh b/docker/test/fasttest/run.sh index 51185fd0d17..9500a7854ba 100755 --- a/docker/test/fasttest/run.sh +++ b/docker/test/fasttest/run.sh @@ -337,7 +337,7 @@ function run_tests secure sha256 xz - + # Not sure why these two fail even in sequential mode. Disabled for now # to make some progress. 00646_url_engine @@ -368,7 +368,7 @@ function run_tests 01666_blnsi # Depends on AWS - 01801_s3_distributed.sh + 01801_s3_distributed ) (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" diff --git a/src/DataStreams/RemoteQueryExecutor.h b/src/DataStreams/RemoteQueryExecutor.h index 5a0c2713623..e0748474c37 100644 --- a/src/DataStreams/RemoteQueryExecutor.h +++ b/src/DataStreams/RemoteQueryExecutor.h @@ -88,7 +88,7 @@ public: /// Set the query_id. For now, used by performance test to later find the query /// in the server query_log. Must be called before sending the query to the server. - void setQueryId(const std::string& query_id_) { assert(!sent_query); std::cout << query_id_ << std::endl; query_id = query_id_; } + void setQueryId(const std::string& query_id_) { assert(!sent_query); query_id = query_id_; } /// Specify how we allocate connections on a shard. void setPoolMode(PoolMode pool_mode_) { pool_mode = pool_mode_; } diff --git a/src/Storages/StorageS3Distributed.cpp b/src/Storages/StorageS3Distributed.cpp index f41e87ef892..fab2b204027 100644 --- a/src/Storages/StorageS3Distributed.cpp +++ b/src/Storages/StorageS3Distributed.cpp @@ -137,8 +137,6 @@ Pipe StorageS3Distributed::read( auto task_identifier = toString(UUIDHelpers::generateV4()); - std::cout << "Generated UUID : " << task_identifier << std::endl; - /// Register resolver, which will give other nodes a task std::make_unique context.getTaskSupervisor()->registerNextTaskResolver( std::make_unique(task_identifier, std::move(callback))); diff --git a/src/Storages/StorageS3Distributed.h b/src/Storages/StorageS3Distributed.h index c4927d68681..283b7f2ac65 100644 --- a/src/Storages/StorageS3Distributed.h +++ b/src/Storages/StorageS3Distributed.h @@ -87,11 +87,7 @@ private: std::optional next() override { - std::cout << "DistributedFileIterator" << std::endl; - std::cout << identifier << std::endl; - auto answer = callback(identifier); - std::cout << answer << std::endl; - return answer; + return callback(identifier); } }; }; diff --git a/tests/queries/0_stateless/01801_s3_distributed.sh b/tests/queries/0_stateless/01801_s3_distributed.sh index 1c82eaac5f1..05710a21214 100755 --- a/tests/queries/0_stateless/01801_s3_distributed.sh +++ b/tests/queries/0_stateless/01801_s3_distributed.sh @@ -8,10 +8,5 @@ CUR_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) . "$CUR_DIR"/../shell_config.sh -echo $S3_ACCESS_KEY_ID -echo $S3_SECRET_ACCESS - -printenv - ${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;" diff --git a/tests/queries/0_stateless/arcadia_skip_list.txt b/tests/queries/0_stateless/arcadia_skip_list.txt index c8a0971bb28..0af6f1b72c1 100644 --- a/tests/queries/0_stateless/arcadia_skip_list.txt +++ b/tests/queries/0_stateless/arcadia_skip_list.txt @@ -229,3 +229,4 @@ 01791_dist_INSERT_block_structure_mismatch 01801_distinct_group_by_shard 01804_dictionary_decimal256_type +01801_s3_distributed