From cff712858ad760b40d0450b6f385b9a33d098958 Mon Sep 17 00:00:00 2001 From: Vyacheslav Alipov Date: Wed, 24 Apr 2013 12:52:49 +0000 Subject: [PATCH] Merge --- dbms/include/DB/Parsers/IParserBase.h | 7 +------ dbms/src/Storages/StorageChunkMerger.cpp | 3 +-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/dbms/include/DB/Parsers/IParserBase.h b/dbms/include/DB/Parsers/IParserBase.h index e02feeae4b4..44aa3206cbe 100644 --- a/dbms/include/DB/Parsers/IParserBase.h +++ b/dbms/include/DB/Parsers/IParserBase.h @@ -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: diff --git a/dbms/src/Storages/StorageChunkMerger.cpp b/dbms/src/Storages/StorageChunkMerger.cpp index 7616404c460..32a48cb3735 100644 --- a/dbms/src/Storages/StorageChunkMerger.cpp +++ b/dbms/src/Storages/StorageChunkMerger.cpp @@ -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;