Merge pull request ClickHouse#52576 from ClickHouse/revert-52004-rewr…

…ite_uniq_to_count Revert "Rewrite uniq to count"
amit-git · Jul 25, 2023 · 4c2b37b · 4c2b37b
2 parents 85082ad + 11016d4
commit 4c2b37b
Show file tree

Hide file tree

Showing 9 changed files with 0 additions and 558 deletions.
diff --git a/src/Analyzer/Passes/UniqToCountPass.cpp b/src/Analyzer/Passes/UniqToCountPass.cpp
diff --git a/src/Analyzer/Passes/UniqToCountPass.h b/src/Analyzer/Passes/UniqToCountPass.h
diff --git a/src/Analyzer/QueryTreePassManager.cpp b/src/Analyzer/QueryTreePassManager.cpp
@@ -18,7 +18,6 @@
 #include <Analyzer/Utils.h>
 #include <Analyzer/Passes/QueryAnalysisPass.h>
 #include <Analyzer/Passes/CountDistinctPass.h>
-#include <Analyzer/Passes/UniqToCountPass.h>
 #include <Analyzer/Passes/FunctionToSubcolumnsPass.h>
 #include <Analyzer/Passes/RewriteAggregateFunctionWithIfPass.h>
 #include <Analyzer/Passes/SumIfToCountIfPass.h>
@@ -247,7 +246,6 @@ void addQueryTreePasses(QueryTreePassManager & manager)
  manager.addPass(std::make_unique<ConvertLogicalExpressionToCNFPass>());
 
  manager.addPass(std::make_unique<CountDistinctPass>());
- manager.addPass(std::make_unique<UniqToCountPass>());
  manager.addPass(std::make_unique<RewriteAggregateFunctionWithIfPass>());
  manager.addPass(std::make_unique<SumIfToCountIfPass>());
  manager.addPass(std::make_unique<RewriteArrayExistsToHasPass>());

diff --git a/src/Core/Settings.h b/src/Core/Settings.h
@@ -776,7 +776,6 @@ class IColumn;
  M(Bool, keeper_map_strict_mode, false, "Enforce additional checks during operations on KeeperMap. E.g. throw an exception on an insert for already existing key", 0) \
  M(UInt64, extract_kvp_max_pairs_per_row, 1000, "Max number pairs that can be produced by extractKeyValuePairs function. Used to safeguard against consuming too much memory.", 0) \
  M(Timezone, session_timezone, "", "This setting can be removed in the future due to potential caveats. It is experimental and is not suitable for production usage. The default timezone for current session or query. The server default timezone if empty.", 0) \
- M(Bool, optimize_uniq_to_count, false, "Rewrite uniq and its variants(except uniqUpTo) to count if subquery has distinct or group by clause.", 0) \
  M(Bool, allow_create_index_without_type, false, "Allow CREATE INDEX query without TYPE. Query will be ignored. Made for SQL compatibility tests.", 0)\
  // End of COMMON_SETTINGS
  // Please add settings related to formats into the FORMAT_FACTORY_SETTINGS and move obsolete settings to OBSOLETE_SETTINGS.

diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp
@@ -39,7 +39,6 @@
 #include <Interpreters/QueryLog.h>
 #include <Interpreters/replaceAliasColumnsInQuery.h>
 #include <Interpreters/RewriteCountDistinctVisitor.h>
-#include <Interpreters/RewriteUniqToCountVisitor.h>
 #include <Interpreters/getCustomKeyFilterForParallelReplicas.h>
 
 #include <QueryPipeline/Pipe.h>
@@ -427,12 +426,6 @@ InterpreterSelectQuery::InterpreterSelectQuery(
  RewriteCountDistinctFunctionVisitor(data_rewrite_countdistinct).visit(query_ptr);
  }
 
- if (settings.optimize_uniq_to_count)
- {
- RewriteUniqToCountMatcher::Data data_rewrite_uniq_count;
- RewriteUniqToCountVisitor(data_rewrite_uniq_count).visit(query_ptr);
- }
-
  JoinedTables joined_tables(getSubqueryContext(context), getSelectQuery(), options.with_all_cols, options_.is_create_parameterized_view);
 
  bool got_storage_from_query = false;