Fix some tests.

src/Processors/QueryPlan/ReadFromMergeTree.cpp

@@ -91,7 +91,7 @@ Pipe ReadFromMergeTree::readFromPool()
 template<typename TSource>
 ProcessorPtr ReadFromMergeTree::createSource(const RangesInDataPart & part)
 {
-    return std::make_shared<MergeTreeSelectProcessor>(
+    return std::make_shared<TSource>(
             storage, metadata_snapshot, part.data_part, settings.max_block_size, settings.preferred_block_size_bytes,
             settings.preferred_max_column_in_block_size_bytes, required_columns, part.ranges, settings.use_uncompressed_cache,
             prewhere_info, true, settings.reader_settings, virt_column_names, part.part_index_in_query);

src/Storages/MergeTree/MergeTreeDataSelectExecutor.cpp

@@ -1017,9 +1017,6 @@ QueryPlanPtr MergeTreeDataSelectExecutor::spreadMarkRangesAmongStreams(
 
     if (num_streams > 1)
     {
-        /// Parallel query execution.
-        Pipes res;
-
         /// Reduce the number of num_streams if the data is small.
         if (sum_marks < num_streams * min_marks_for_concurrent_read && parts.size() < num_streams)
             num_streams = std::max((sum_marks + min_marks_for_concurrent_read - 1) / min_marks_for_concurrent_read, parts.size());

tests/queries/0_stateless/01551_mergetree_read_in_order_spread.reference

@@ -13,16 +13,16 @@ ExpressionTransform
                 (MergingSorted)
                   (Expression)
                   ExpressionTransform
-                    (ReadFromStorage)
+                    (ReadFromMergeTree)
                     MergeTree 0 → 1
                 (MergingSorted)
                 MergingSortedTransform 2 → 1
                   (Expression)
                   ExpressionTransform × 2
-                    (ReadFromStorage)
+                    (ReadFromMergeTree)
                     MergeTree × 2 0 → 1
                 (MergingSorted)
                   (Expression)
                   ExpressionTransform
-                    (ReadFromStorage)
+                    (ReadFromMergeTree)
                     MergeTree 0 → 1

tests/queries/0_stateless/01562_optimize_monotonous_functions_in_order_by.reference

@@ -11,7 +11,7 @@ Expression (Projection)
         PartialSorting (Sort each block for ORDER BY)
           Expression (Before ORDER BY)
             SettingQuotaAndLimits (Set limits and quota after reading from storage)
-              ReadFromStorage (MergeTree)
+              ReadFromMergeTree
 SELECT
     timestamp,
     key
@@ -23,7 +23,7 @@ Expression (Projection)
     FinishSorting
       Expression (Before ORDER BY)
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
-          ReadFromStorage (MergeTree with order)
+          ReadFromMergeTree
 SELECT
     timestamp,
     key
@@ -37,7 +37,7 @@ Expression (Projection)
     FinishSorting
       Expression (Before ORDER BY)
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
-          ReadFromStorage (MergeTree with order)
+          ReadFromMergeTree
 SELECT
     timestamp,
     key

tests/queries/0_stateless/01576_alias_column_rewrite.reference

@@ -28,47 +28,47 @@ Expression (Projection)
         PartialSorting (Sort each block for ORDER BY)
           Expression ((Before ORDER BY + Add table aliases))
             SettingQuotaAndLimits (Set limits and quota after reading from storage)
-              ReadFromStorage (MergeTree)
+              ReadFromMergeTree
 Expression (Projection)
   Limit (preliminary LIMIT)
     FinishSorting
       Expression ((Before ORDER BY + Add table aliases))
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           Union
-            ReadFromStorage (MergeTree with order)
-            ReadFromStorage (MergeTree with order)
-            ReadFromStorage (MergeTree with order)
+            ReadFromMergeTree
+            ReadFromMergeTree
+            ReadFromMergeTree
 Expression (Projection)
   Limit (preliminary LIMIT)
     FinishSorting
       Expression (Before ORDER BY)
         SettingQuotaAndLimits (Set limits and quota after reading from storage)
           Union
-            ReadFromStorage (MergeTree with order)
-            ReadFromStorage (MergeTree with order)
-            ReadFromStorage (MergeTree with order)
+            ReadFromMergeTree
+            ReadFromMergeTree
+            ReadFromMergeTree
 optimize_aggregation_in_order
 Expression ((Projection + Before ORDER BY))
   Aggregating
     Expression ((Before GROUP BY + Add table aliases))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
-        ReadFromStorage (MergeTree)
+        ReadFromMergeTree
 Expression ((Projection + Before ORDER BY))
   Aggregating
     Expression ((Before GROUP BY + Add table aliases))
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         Union
-          ReadFromStorage (MergeTree with order)
-          ReadFromStorage (MergeTree with order)
-          ReadFromStorage (MergeTree with order)
+          ReadFromMergeTree
+          ReadFromMergeTree
+          ReadFromMergeTree
 Expression ((Projection + Before ORDER BY))
   Aggregating
     Expression (Before GROUP BY)
       SettingQuotaAndLimits (Set limits and quota after reading from storage)
         Union
-          ReadFromStorage (MergeTree with order)
-          ReadFromStorage (MergeTree with order)
-          ReadFromStorage (MergeTree with order)
+          ReadFromMergeTree
+          ReadFromMergeTree
+          ReadFromMergeTree
 second-index
 1
 1