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

Merge

Browse Source
This commit is contained in:
Evgeniy Gatov 2014-09-26 20:14:16 +04:00
commit 95d5904b41
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dbms/src/Parsers/ExpressionElementParsers.cpp
View File

@ -133,6 +133,10 @@ bool ParserIdentifier::parseImpl(Pos & pos, Pos end, ASTPtr & node, Expected & e
ReadBuffer buf(const_cast<char *>(pos), end - pos, 0);
String s;
readBackQuotedString(s, buf);
if (s.empty()) /// Не разрешены идентификаторы "пустая строка".
return false;
pos += buf.count();
node = new ASTIdentifier(StringRange(begin, pos), s);
return true;

2
dbms/src/Storages/MergeTree/MergeTreeData.cpp
View File

@ -843,7 +843,7 @@ MergeTreeData::DataPartsVector MergeTreeData::getDataPartsVector()
{
Poco::ScopedLock<Poco::FastMutex> lock(data_parts_mutex);
return {std::begin(data_parts), std::end(data_parts)};
return DataPartsVector(std::begin(data_parts), std::end(data_parts));
}
MergeTreeData::DataParts MergeTreeData::getAllDataParts()