thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-30 19:42:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix more tests

Browse Source
This commit is contained in:
Nikolai Kochetov 2021-09-20 22:07:33 +03:00
parent d391e3419e
commit 4e7d5191e3
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Interpreters/InterpreterDescribeQuery.cpp
View File

@ -16,7 +16,6 @@
#include <Parsers/ASTTablesInSelectQuery.h>
#include <Parsers/TablePropertiesQueriesASTs.h>
#include <DataTypes/NestedUtils.h>
#include <Processors/Sources/SourceFromSingleChunk.h>
namespace DB

9
src/Interpreters/ProcessList.cpp
View File

@ -305,13 +305,12 @@ CancellationCode QueryStatus::cancelQuery(bool)
if (is_killed.load())
return CancellationCode::CancelSent;
SCOPE_EXIT({
std::lock_guard lock(executors_mutex);
for (auto * e : executors)
e->cancel();
});
std::lock_guard lock(executors_mutex);
for (auto * e : executors)
e->cancel();
is_killed.store(true);
return CancellationCode::CancelSent;
}

2
src/Processors/Executors/CompletedPipelineExecutor.cpp
View File

@ -18,7 +18,7 @@ CompletedPipelineExecutor::CompletedPipelineExecutor(QueryPipeline & pipeline_)
void CompletedPipelineExecutor::execute()
{
PipelineExecutor executor(pipeline.processors);
PipelineExecutor executor(pipeline.processors, pipeline.process_list_element);
executor.execute(pipeline.getNumThreads());
}

2
src/Processors/Executors/PushingAsyncPipelineExecutor.cpp
View File

@ -163,7 +163,7 @@ void PushingAsyncPipelineExecutor::start()
started = true;
data = std::make_unique<Data>();
data->executor = std::make_shared<PipelineExecutor>(pipeline.processors);
data->executor = std::make_shared<PipelineExecutor>(pipeline.processors, pipeline.process_list_element);
data->source = pushing_source.get();
auto func = [&, thread_group = CurrentThread::getGroup()]()

2
src/Processors/Executors/PushingPipelineExecutor.cpp
View File

@ -85,7 +85,7 @@ void PushingPipelineExecutor::start()
return;
started = true;
executor = std::make_shared<PipelineExecutor>(pipeline.processors);
executor = std::make_shared<PipelineExecutor>(pipeline.processors, pipeline.process_list_element);
if (!executor->executeStep(&need_data_flag))
throw Exception(ErrorCodes::LOGICAL_ERROR,

2
src/Storages/StorageLog.cpp
View File

@ -465,7 +465,7 @@ void LogSink::writeMarks(MarksForColumns && marks)
StorageLog::~StorageLog()
{
std::cerr << "======================\n" << StackTrace().toString() << std::endl;
// std::cerr << "======================\n" << StackTrace().toString() << std::endl;
}
StorageLog::StorageLog(