thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Chack time limit sending data for global in.

Browse Source
This commit is contained in:
Nikolai Kochetov 2021-11-25 18:41:50 +03:00
parent 99cbf64044
commit 8a92202c55
3 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/QueryPipeline/RemoteQueryExecutor.cpp
View File

@ -9,6 +9,7 @@
#include "Core/Protocol.h"
#include <QueryPipeline/Pipe.h>
#include <Processors/Sources/SourceFromSingleChunk.h>
#include <Processors/Transforms/LimitsCheckingTransform.h>
#include <Storages/IStorage.h>
#include <Storages/SelectQueryInfo.h>
#include <Interpreters/castColumn.h>
@ -494,6 +495,12 @@ void RemoteQueryExecutor::sendExternalTables()
external_tables_data.clear();
external_tables_data.reserve(count);
StreamLocalLimits limits;
const auto & settings = context->getSettingsRef();
limits.mode = LimitsMode::LIMITS_TOTAL;
limits.speed_limits.max_execution_time = settings.max_execution_time;
limits.timeout_overflow_mode = settings.timeout_overflow_mode;
for (size_t i = 0; i < count; ++i)
{
ExternalTablesData res;
@ -503,7 +510,7 @@ void RemoteQueryExecutor::sendExternalTables()
auto data = std::make_unique<ExternalTableData>();
data->table_name = table.first;
data->creating_pipe_callback = [cur, context = this->context]()
data->creating_pipe_callback = [cur, limits, context = this->context]()
{
SelectQueryInfo query_info;
auto metadata_snapshot = cur->getInMemoryMetadataPtr();
@ -519,6 +526,8 @@ void RemoteQueryExecutor::sendExternalTables()
return std::make_unique<Pipe>(
std::make_shared<SourceFromSingleChunk>(metadata_snapshot->getSampleBlock(), Chunk()));
pipe.addTransform(std::make_shared<LimitsCheckingTransform>(pipe.getHeader(), limits));
return std::make_unique<Pipe>(std::move(pipe));
};

0
tests/queries/0_stateless/02116_global_in_time_limit.reference Normal file
View File

16
tests/queries/0_stateless/02116_global_in_time_limit.sh Executable file
View File

@ -0,0 +1,16 @@
#!/usr/bin/env bash
CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
# shellcheck source=../shell_config.sh
. "$CURDIR"/../shell_config.sh
# This test is pretty depend on query execution time
# In release, it works about 14 seconds with no timeout.
function run
{
${CLICKHOUSE_CLIENT} -q "select number from remote('127.0.0.2', numbers(10)) where number global in (select number + 9 from numbers(400000000)) settings max_execution_time=3" 2>&1 | echo > /dev/null
}
export -f run
timeout 6 bash -c run