From 20d673a20645740d7b805e03521c300c829557a2 Mon Sep 17 00:00:00 2001
From: Nikolai Kochetov <nk@clickhouse.com>
Date: Mon, 10 Jun 2024 17:02:26 +0000
Subject: [PATCH] Fix more tests.

---
 src/Storages/StorageMerge.cpp                 | 37 ++++---------------
 ..._optimize_count_for_merge_tables.reference |  9 +++--
 2 files changed, 14 insertions(+), 32 deletions(-)

diff --git a/src/Storages/StorageMerge.cpp b/src/Storages/StorageMerge.cpp
index b42a8ed90ed..f05618f8488 100644
--- a/src/Storages/StorageMerge.cpp
+++ b/src/Storages/StorageMerge.cpp
@@ -1215,35 +1215,14 @@ QueryPlan ReadFromMerge::createPlanForTable(
         if (real_column_names.empty())
             real_column_names.push_back(ExpressionActions::getSmallestColumn(storage_snapshot_->metadata->getColumns().getAllPhysical()).name);
 
-        StorageView * view = dynamic_cast<StorageView *>(storage.get());
-        if (!view || allow_experimental_analyzer)
-        {
-            storage->read(plan,
-                real_column_names,
-                storage_snapshot_,
-                modified_query_info,
-                modified_context,
-                processed_stage,
-                max_block_size,
-                UInt32(streams_num));
-        }
-        else
-        {
-            /// For view storage, we need to rewrite the `modified_query_info.view_query` to optimize read.
-            /// The most intuitive way is to use InterpreterSelectQuery.
-
-            /// Intercept the settings
-            modified_context->setSetting("max_threads", streams_num);
-            modified_context->setSetting("max_streams_to_max_threads_ratio", 1);
-            modified_context->setSetting("max_block_size", max_block_size);
-
-            InterpreterSelectQuery interpreter(modified_query_info.query,
-                modified_context,
-                storage,
-                view->getInMemoryMetadataPtr(),
-                SelectQueryOptions(processed_stage));
-            interpreter.buildQueryPlan(plan);
-        }
+        storage->read(plan,
+            real_column_names,
+            storage_snapshot_,
+            modified_query_info,
+            modified_context,
+            processed_stage,
+            max_block_size,
+            UInt32(streams_num));
 
         if (!plan.isInitialized())
             return {};
diff --git a/tests/queries/0_stateless/02918_optimize_count_for_merge_tables.reference b/tests/queries/0_stateless/02918_optimize_count_for_merge_tables.reference
index 786a6b3bf25..7278018f1d6 100644
--- a/tests/queries/0_stateless/02918_optimize_count_for_merge_tables.reference
+++ b/tests/queries/0_stateless/02918_optimize_count_for_merge_tables.reference
@@ -7,6 +7,9 @@ Expression ((Projection + Before ORDER BY))
   Aggregating
     Expression (Before GROUP BY)
       ReadFromMerge
-        ReadFromMergeTree (default.mt1)
-        ReadFromMergeTree (default.mt2)
-        ReadFromStorage (TinyLog)
+        Expression
+          ReadFromMergeTree (default.mt1)
+        Expression
+          ReadFromMergeTree (default.mt2)
+        Expression
+          ReadFromStorage (TinyLog)