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

Merge pull request #6080 from abyss7/issue-6071

Browse Source 
Check background_task_handle before use
This commit is contained in:
alexey-milovidov 2019-07-25 04:16:47 +03:00 committed by GitHub
commit 56131a7fe7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dbms/src/Storages/MergeTree/MergeTreeBlockOutputStream.cpp
View File

@ -27,7 +27,8 @@ void MergeTreeBlockOutputStream::write(const Block & block)
PartLog::addNewPart(storage.global_context, part, watch.elapsed());
/// Initiate async merge - it will be done if it's good time for merge and if there are space in 'background_pool'.
storage.background_task_handle->wake();
if (storage.background_task_handle)
storage.background_task_handle->wake();
}
}

1
dbms/tests/integration/test_storage_kafka/test.py
View File

@ -174,6 +174,7 @@ def test_kafka_settings_new_syntax(kafka_cluster):
result += instance.query('SELECT * FROM test.kafka')
if kafka_check_result(result):
break
print result
kafka_check_result(result, True)