Merge branch 'master' into filesystemCacheSizeLimitMetric

docs/ru/development/build-osx.md

@@ -68,7 +68,7 @@ $ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/
  $ rm -rf build
  $ mkdir build
  $ cd build
- $ cmake -DCMAKE_C_COMPILER=$(brew --prefix llvm)/bin/clang -DCMAKE_CXX_COMPILER==$(brew --prefix llvm)/bin/clang++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_JEMALLOC=OFF ..
+ $ cmake -DCMAKE_C_COMPILER=$(brew --prefix llvm)/bin/clang -DCMAKE_CXX_COMPILER=$(brew --prefix llvm)/bin/clang++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_JEMALLOC=OFF ..
  $ cmake -DCMAKE_C_COMPILER=$(brew --prefix llvm)/bin/clang -DCMAKE_CXX_COMPILER=$(brew --prefix llvm)/bin/clang++ -DCMAKE_BUILD_TYPE=RelWithDebInfo -DENABLE_JEMALLOC=OFF ..
  $ cmake --build . --config RelWithDebInfo
  $ cd ..

src/Processors/QueryPlan/Optimizations/optimizeTree.cpp

@@ -114,6 +114,10 @@ void optimizeTreeSecondPass(const QueryPlanOptimizationSettings & optimization_s
 
  while (!stack.empty())
  {
+ /// NOTE: optimizePrewhere can modify the stack.
+ optimizePrewhere(stack, nodes);
+ optimizePrimaryKeyCondition(stack);
+
  {
  /// NOTE: frame cannot be safely used after stack was modified.
  auto & frame = stack.back();
@@ -125,6 +129,7 @@ void optimizeTreeSecondPass(const QueryPlanOptimizationSettings & optimization_s
  if (optimization_settings.read_in_order)
  optimizeReadInOrder(*frame.node, nodes);
 
+ /// Projection optimization relies on PK optimization
  if (optimization_settings.optimize_projection)
  num_applied_projection
  += optimizeUseAggregateProjections(*frame.node, nodes, optimization_settings.optimize_use_implicit_projections);
@@ -148,6 +153,7 @@ void optimizeTreeSecondPass(const QueryPlanOptimizationSettings & optimization_s
 
  if (optimization_settings.optimize_projection)
  {
+ /// Projection optimization relies on PK optimization
  if (optimizeUseNormalProjections(stack, nodes))
  {
  ++num_applied_projection;
@@ -164,9 +170,6 @@ void optimizeTreeSecondPass(const QueryPlanOptimizationSettings & optimization_s
  }
  }
 
- /// NOTE: optimizePrewhere can modify the stack.
- optimizePrewhere(stack, nodes);
- optimizePrimaryKeyCondition(stack);
  enableMemoryBoundMerging(*stack.back().node, nodes);
 
  stack.pop_back();

src/Processors/QueryPlan/Optimizations/projectionsCommon.cpp

@@ -131,7 +131,8 @@ bool QueryDAG::buildImpl(QueryPlan::Node & node, ActionsDAG::NodeRawConstPtrs &
  if (prewhere_info->prewhere_actions)
  {
  appendExpression(prewhere_info->prewhere_actions);
- if (const auto * filter_expression = findInOutputs(*dag, prewhere_info->prewhere_column_name, prewhere_info->remove_prewhere_column))
+ if (const auto * filter_expression
+ = findInOutputs(*dag, prewhere_info->prewhere_column_name, prewhere_info->remove_prewhere_column))
  filter_nodes.push_back(filter_expression);
  else
  return false;

src/Processors/QueryPlan/Optimizations/projectionsCommon.h

@@ -38,7 +38,6 @@ std::shared_ptr<PartitionIdToMaxBlock> getMaxAddedBlocks(ReadFromMergeTree * rea
 
 /// This is a common DAG which is a merge of DAGs from Filter and Expression steps chain.
 /// Additionally, for all the Filter steps, we collect filter conditions into filter_nodes.
-/// Flag remove_last_filter_node is set in case if the last step is a Filter step and it should remove filter column.
 struct QueryDAG
 {
  ActionsDAGPtr dag;

tests/queries/0_stateless/01710_normal_projection_with_query_plan_optimization.reference

@@ -0,0 +1 @@
+1

tests/queries/0_stateless/01710_normal_projection_with_query_plan_optimization.sql

@@ -0,0 +1,11 @@
+drop table if exists t;
+
+CREATE TABLE t (id UInt64, id2 UInt64, id3 UInt64, PROJECTION t_reverse (SELECT id, id2, id3 ORDER BY id2, id, id3)) ENGINE = MergeTree ORDER BY (id) settings index_granularity = 4;
+
+insert into t SELECT number, -number, number FROM numbers(10000);
+
+set max_rows_to_read = 4;
+
+select count() from t where id = 3;
+
+drop table t;