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

Merge

Browse Source
This commit is contained in:
Vyacheslav Alipov 2013-04-24 12:52:49 +00:00
parent fb180683c1
commit cff712858a
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dbms/include/DB/Parsers/IParserBase.h
View File

@ -23,12 +23,7 @@ public:
Pos begin = pos;
bool res = parseImpl(pos, end, node, expected);
if (res)
{
String s(begin, pos - begin);
//std::cerr << getName() << ": " << s << std::endl;
}
return res;
}
protected:

3
dbms/src/Storages/StorageChunkMerger.cpp
View File

@ -320,7 +320,6 @@ void StorageChunkMerger::mergeChunks(const Storages & chunks)
LOG_TRACE(log, "Will merge " << chunks.size() << " chunks: from " << chunks[0]->getTableName() << " to " << chunks.back()->getTableName() << " to new table " << new_table_name << ".");
/// Уроним Chunks таблицу с таким именем, если она есть. Она могла остаться в результате прерванного слияния той же группы чанков.
std::string drop_query = "DROP TABLE IF EXISTS " + destination_database + "." + new_table_name;
ASTDropQuery * drop_ast = new ASTDropQuery;
ASTPtr drop_ptr = drop_ast;
drop_ast->database = destination_database;
@ -369,7 +368,7 @@ void StorageChunkMerger::mergeChunks(const Storages & chunks)
Names src_column_names;
ASTSelectQuery * select_query = new ASTSelectQuery;
ASTPtr select_query_ptr;
ASTPtr select_query_ptr = select_query;
/// Запрос, вынимающий нужные столбцы.
ASTPtr select_expression_list;