thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-26 17:41:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbms: removed debug output [#METR-11370].

Browse Source
This commit is contained in:
Alexey Milovidov 2014-07-16 06:13:26 +04:00
parent 35e8a15092
commit 80f163eb08
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/include/DB/Common/ExternalTable.h
View File

@ -72,7 +72,7 @@ protected:
} }
/// Функция для отладочного вывода информации /// Функция для отладочного вывода информации
virtual void write() void write()
{ {
std::cerr << "file " << file << std::endl; std::cerr << "file " << file << std::endl;
std::cerr << "name " << name << std::endl; std::cerr << "name " << name << std::endl;

4
dbms/src/Interpreters/ExpressionActions.cpp
View File

@ -151,8 +151,6 @@ void ExpressionAction::prepare(Block & sample_block)
{ {
for (const auto & col : columns_added_by_join) for (const auto & col : columns_added_by_join)
sample_block.insert(ColumnWithNameAndType(col.type->createColumn(), col.type, col.name)); sample_block.insert(ColumnWithNameAndType(col.type->createColumn(), col.type, col.name));
std::cerr << sample_block.dumpNames() << std::endl;
} }
else if (type == ADD_COLUMN) else if (type == ADD_COLUMN)
{ {
@ -264,8 +262,6 @@ void ExpressionAction::execute(Block & block) const
{ {
Block new_block; Block new_block;
//std::cerr << block.dumpNames() << std::endl;
for (size_t i = 0; i < projection.size(); ++i) for (size_t i = 0; i < projection.size(); ++i)
{ {
const std::string & name = projection[i].first; const std::string & name = projection[i].first;

10
dbms/src/Interpreters/ExpressionAnalyzer.cpp
View File

@ -1245,8 +1245,8 @@ bool ExpressionAnalyzer::appendJoin(ExpressionActionsChain & chain, bool only_ty
Names join_key_names_right(join_key_names_right_set.begin(), join_key_names_right_set.end()); Names join_key_names_right(join_key_names_right_set.begin(), join_key_names_right_set.end());
JoinPtr join = new Join(join_key_names_left, join_key_names_right, settings.limits, ast_join.kind, ast_join.strictness); JoinPtr join = new Join(join_key_names_left, join_key_names_right, settings.limits, ast_join.kind, ast_join.strictness);
for (const auto & name_type : columns_added_by_join) /* for (const auto & name_type : columns_added_by_join)
std::cerr << "! Column added by JOIN: " << name_type.name << std::endl; std::cerr << "! Column added by JOIN: " << name_type.name << std::endl;*/
Names required_joined_columns(join_key_names_right.begin(), join_key_names_right.end()); Names required_joined_columns(join_key_names_right.begin(), join_key_names_right.end());
for (const auto & name_type : columns_added_by_join) for (const auto & name_type : columns_added_by_join)
@ -1596,8 +1596,6 @@ void ExpressionAnalyzer::collectJoinedColumns(NameSet & joined_columns, NamesAnd
if (!select_query || !select_query->join) if (!select_query || !select_query->join)
return; return;
std::cerr << "collectJoinedColumns" << std::endl;
auto & node = typeid_cast<ASTJoin &>(*select_query->join); auto & node = typeid_cast<ASTJoin &>(*select_query->join);
auto & keys = typeid_cast<ASTExpressionList &>(*node.using_expr_list); auto & keys = typeid_cast<ASTExpressionList &>(*node.using_expr_list);
auto & table = node.table->children.at(0); /// TODO: поддержка идентификаторов. auto & table = node.table->children.at(0); /// TODO: поддержка идентификаторов.
@ -1626,14 +1624,14 @@ void ExpressionAnalyzer::collectJoinedColumns(NameSet & joined_columns, NamesAnd
} }
} }
for (const auto & name : join_key_names_left_set) /* for (const auto & name : join_key_names_left_set)
std::cerr << "JOIN key (left): " << name << std::endl; std::cerr << "JOIN key (left): " << name << std::endl;
for (const auto & name : join_key_names_right_set) for (const auto & name : join_key_names_right_set)
std::cerr << "JOIN key (right): " << name << std::endl; std::cerr << "JOIN key (right): " << name << std::endl;
std::cerr << std::endl; std::cerr << std::endl;
for (const auto & name : joined_columns) for (const auto & name : joined_columns)
std::cerr << "JOINed column: " << name << std::endl; std::cerr << "JOINed column: " << name << std::endl;
std::cerr << std::endl; std::cerr << std::endl;*/
} }
Names ExpressionAnalyzer::getRequiredColumns() Names ExpressionAnalyzer::getRequiredColumns()