Fix more tests

amosbird · amosbird · commit e3a48c0de6d1 · 2025-09-09T09:56:50.000+08:00
diff --git a/src/Analyzer/Passes/CountDistinctPass.cpp b/src/Analyzer/Passes/CountDistinctPass.cpp
@@ -12,6 +12,7 @@
 #include <Analyzer/Utils.h>
 
 #include <Core/Settings.h>
+#include <Storages/IStorage.h>
 
 namespace DB
 {
@@ -35,10 +36,6 @@ class CountDistinctVisitor : public InDepthQueryTreeVisitorWithContext<CountDist
         if (!getSettings()[Setting::count_distinct_optimization])
             return;
 
-        /// TODO(amos): find a better way to resolve this setting confliction
-        // if (getSettings()[Setting::optimize_distributed_group_by_sharding_key])
-        //     return;
-
         auto * query_node = node->as<QueryNode>();
 
         /// Check that query has only SELECT clause
@@ -52,6 +49,13 @@ class CountDistinctVisitor : public InDepthQueryTreeVisitorWithContext<CountDist
         if (join_tree_node_type == QueryTreeNodeType::JOIN || join_tree_node_type == QueryTreeNodeType::CROSS_JOIN || join_tree_node_type == QueryTreeNodeType::ARRAY_JOIN)
             return;
 
+        /// Check only local table
+        if (auto * table_node = query_node->getJoinTree()->as<TableNode>())
+        {
+            if (table_node->getStorage()->isRemote())
+                return;
+        }
+
         /// Check that query has only single node in projection
         auto & projection_nodes = query_node->getProjection().getNodes();
         if (projection_nodes.size() != 1)
diff --git a/src/Processors/QueryPlan/Optimizations/optimizeOrderByLimit.cpp b/src/Processors/QueryPlan/Optimizations/optimizeOrderByLimit.cpp
@@ -59,7 +59,7 @@ size_t tryPushDownOrderByLimit(QueryPlan::Node * parent_node, QueryPlan::Nodes &
         return 0;
 
     const auto & sort_column = sorting_step->getInputHeaders().front()->getByName(sort_description.front().column_name);
-    if (!sort_column.type->isValueRepresentedByNumber() && read_from_mergetree_step->getPrewhereInfo())
+    if (!sort_column.type->isValueRepresentedByNumber() || read_from_mergetree_step->getPrewhereInfo())
         return 0;
 
     const auto * sort_column_from_read
diff --git a/tests/queries/0_stateless/00944_minmax_nan.sql b/tests/queries/0_stateless/00944_minmax_nan.sql
@@ -2,6 +2,7 @@ SET parallel_replicas_local_plan = 1;
 
 -- Force using skip indexes in planning to proper test `force_data_skipping_indices` setting.
 SET use_skip_indexes_on_data_read = 0;
+SET use_query_condition_cache = 0;
 
 -- Test for issue #75523
 
diff --git a/tests/queries/0_stateless/03100_lwu_36_json_skip_indexes.sql b/tests/queries/0_stateless/03100_lwu_36_json_skip_indexes.sql
@@ -3,6 +3,7 @@
 
 -- Force using skip indexes in planning to proper test `force_data_skipping_indices` setting.
 SET use_skip_indexes_on_data_read = 0;
+SET use_query_condition_cache = 0;
 
 DROP TABLE IF EXISTS test;
 
diff --git a/tests/queries/0_stateless/03443_index_match_alternatives.sql b/tests/queries/0_stateless/03443_index_match_alternatives.sql
@@ -1,5 +1,6 @@
 -- Force using skip indexes in planning to proper test with EXPLAIN indexes = 1.
 SET use_skip_indexes_on_data_read = 0;
+SET use_query_condition_cache = 0;
 
 DROP TABLE IF EXISTS 03443_data;
 
