thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 15:12:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

dbms: development [#CONV-2944].

Browse Source
This commit is contained in:
Alexey Milovidov 2011-08-28 00:48:51 +00:00
parent b67b8d8b54
commit a9228f798a
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbms/src/DataStreams/tests/filter_stream_hitlog.cpp
View File

@ -132,7 +132,7 @@ int main(int argc, char ** argv)
DB::ParserSelectQuery parser;
DB::ASTPtr ast;
std::string input = "SELECT UniqID, URL, CounterID, IsLink, URL = 'http://mail.yandex.ru/neo2/#inbox'";
std::string input = "SELECT UniqID, URL, CounterID, IsLink WHERE URL = 'http://mail.yandex.ru/neo2/#inbox'";
std::string expected;
const char * begin = input.data();

22
dbms/src/Interpreters/Expression.cpp
View File

@ -196,22 +196,16 @@ Block Expression::projectResult(ASTPtr ast, Block & block)
void Expression::collectFinalColumns(ASTPtr ast, Block & src, Block & dst)
{
if (ASTExpressionList * node = dynamic_cast<ASTExpressionList *>(&*ast))
{
for (ASTs::iterator it = node->children.begin(); it != node->children.end(); ++it)
{
if (ASTIdentifier * ident = dynamic_cast<ASTIdentifier *>(&**it))
dst.insert(src.getByName(ident->name));
else if (ASTFunction * func = dynamic_cast<ASTFunction *>(&**it))
for (ColumnNumbers::const_iterator jt = func->return_column_numbers.begin(); jt != func->return_column_numbers.end(); ++jt)
dst.insert(src.getByPosition(*jt));
else
dst.insert(src.getByName((*it)->getTreeID()));
}
}
if (ASTIdentifier * ident = dynamic_cast<ASTIdentifier *>(&*ast))
dst.insert(src.getByName(ident->name));
else if (dynamic_cast<ASTLiteral *>(&*ast))
dst.insert(src.getByName(ast->getTreeID()));
else if (ASTFunction * func = dynamic_cast<ASTFunction *>(&*ast))
for (ColumnNumbers::const_iterator jt = func->return_column_numbers.begin(); jt != func->return_column_numbers.end(); ++jt)
dst.insert(src.getByPosition(*jt));
else
for (ASTs::iterator it = ast->children.begin(); it != ast->children.end(); ++it)
collectFinalColumns(*it, src, dst);
collectFinalColumns(*it, src, dst);
}