diff --git a/src/Interpreters/InterpreterSelectQuery.cpp b/src/Interpreters/InterpreterSelectQuery.cpp index 826be1e5143..2d6a22cce2f 100644 --- a/src/Interpreters/InterpreterSelectQuery.cpp +++ b/src/Interpreters/InterpreterSelectQuery.cpp @@ -106,10 +106,6 @@ namespace ErrorCodes /// Assumes `storage` is set and the table filter (row-level security) is not empty. String InterpreterSelectQuery::generateFilterActions(ActionsDAGPtr & actions, const Names & prerequisite_columns) const { - // std::cerr << "----- InterpreterSelectQuery::generateFilterActions\n"; - // for (const auto & name : prerequisite_columns) - // std::cerr << name << std::endl; - const auto & db_name = table_id.getDatabaseName(); const auto & table_name = table_id.getTableName(); @@ -144,7 +140,6 @@ String InterpreterSelectQuery::generateFilterActions(ActionsDAGPtr & actions, co auto syntax_result = TreeRewriter(*context).analyzeSelect(query_ast, TreeRewriterResult({}, storage, metadata_snapshot)); SelectQueryExpressionAnalyzer analyzer(query_ast, syntax_result, *context, metadata_snapshot); actions = analyzer.simpleSelectActions(); - //std::cerr << actions-> return expr_list->children.at(0)->getColumnName(); } @@ -527,10 +522,6 @@ void InterpreterSelectQuery::buildQueryPlan(QueryPlan & query_plan) { executeImpl(query_plan, input, std::move(input_pipe)); - // WriteBufferFromOwnString buf; - // query_plan.explainPlan(buf, {.header = true, .actions = true}); - // std::cerr << buf.str(); - /// We must guarantee that result structure is the same as in getSampleBlock() if (!blocksHaveEqualStructure(query_plan.getCurrentDataStream().header, result_header)) { @@ -826,7 +817,6 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu const bool does_storage_support_prewhere = !input && !input_pipe && storage && storage->supportsPrewhere(); if (does_storage_support_prewhere && settings.optimize_move_to_prewhere) { - // std::cerr << "----- Moving row level filter to prewhere\n"; /// Execute row level filter in prewhere as a part of "move to prewhere" optimization. expressions.prewhere_info = std::make_shared( std::move(expressions.filter_info->actions), @@ -839,7 +829,6 @@ void InterpreterSelectQuery::executeImpl(QueryPlan & query_plan, const BlockInpu else { /// Add row level security actions to prewhere. - // std::cerr << expressions.filter_info->actions->dumpDAG() << std::endl; expressions.prewhere_info->row_level_filter_actions = std::move(expressions.filter_info->actions); expressions.prewhere_info->row_level_column_name = std::move(expressions.filter_info->column_name); expressions.prewhere_info->row_level_filter_actions->projectInput(false); @@ -1658,7 +1647,6 @@ void InterpreterSelectQuery::executeFetchColumns(QueryProcessingStage::Enum proc if (prewhere_info) { - // std::cerr << "-------- filling prewhere info \n"; query_info.prewhere_info = std::make_shared(); query_info.prewhere_info->prewhere_actions = std::make_shared(prewhere_info->prewhere_actions); diff --git a/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp b/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp index 90da45cc6d8..4911f9982d5 100644 --- a/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp +++ b/src/Storages/MergeTree/MergeTreeBaseSelectProcessor.cpp @@ -334,13 +334,9 @@ void MergeTreeBaseSelectProcessor::executePrewhereActions(Block & block, const P { if (prewhere_info) { - // std::cerr << "0: " << block.dumpStructure() << std::endl; - if (prewhere_info->alias_actions) prewhere_info->alias_actions->execute(block); - // std::cerr << "1: " << block.dumpStructure() << std::endl; - if (prewhere_info->row_level_filter) { prewhere_info->row_level_filter->execute(block); @@ -351,13 +347,10 @@ void MergeTreeBaseSelectProcessor::executePrewhereActions(Block & block, const P ErrorCodes::LOGICAL_ERROR); } } - // std::cerr << "2: " << block.dumpStructure() << std::endl; if (prewhere_info->prewhere_actions) prewhere_info->prewhere_actions->execute(block); - // std::cerr << "3: " << block.dumpStructure() << std::endl; - auto & prewhere_column = block.getByName(prewhere_info->prewhere_column_name); if (!prewhere_column.type->canBeUsedInBooleanContext()) { @@ -372,8 +365,6 @@ void MergeTreeBaseSelectProcessor::executePrewhereActions(Block & block, const P auto & ctn = block.getByName(prewhere_info->prewhere_column_name); ctn.column = ctn.type->createColumnConst(block.rows(), 1u)->convertToFullColumnIfConst(); } - - // std::cerr << "4: " << block.dumpStructure() << std::endl; } }