Merge

dbms/include/DB/Storages/MergeTree/MergeTreeReadPool.h

@@ -411,7 +411,7 @@ public:
 
 	std::vector<ThreadTask> threads_tasks;
 
-	std::unordered_set<std::size_t> remaining_thread_tasks;
+	std::set<std::size_t> remaining_thread_tasks;
 
 	mutable std::mutex mutex;
 };

dbms/src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp

@@ -392,9 +392,9 @@ BlockInputStreams MergeTreeDataSelectExecutor::spreadMarkRangesAmongThreads(
 		for (std::size_t i = 0; i < threads; ++i)
 		{
 			res.emplace_back(new MergeTreeThreadBlockInputStream{
-					i, pool, min_marks_for_concurrent_read, max_block_size, data, use_uncompressed_cache,
-					prewhere_actions,
-					prewhere_column, settings, virt_columns
+				i, pool, min_marks_for_concurrent_read, max_block_size, data, use_uncompressed_cache,
+				prewhere_actions,
+				prewhere_column, settings, virt_columns
 			});