提交 28ff4749 编写于 作者: M Michael Kolupaev

Fixes. [#METR-10202]

上级 4e975b43
......@@ -687,7 +687,7 @@ MergeTreeData::DataPartsVector MergeTreeData::renameTempPartAndReplace(MutableDa
if (increment)
part->left = part->right = increment->get(false);
part->name = getPartName(part->left_date, part->right_date, part->left, part->right, 0);
part->name = getPartName(part->left_date, part->right_date, part->left, part->right, part->level);
if (data_parts.count(part))
throw Exception("Part " + part->name + " already exists", ErrorCodes::DUPLICATE_DATA_PART);
......@@ -705,7 +705,10 @@ MergeTreeData::DataPartsVector MergeTreeData::renameTempPartAndReplace(MutableDa
{
--it;
if (!part->contains(**it))
{
++it;
break;
}
res.push_back(*it);
data_parts.erase(it++); /// Да, ++, а не --.
}
......
......@@ -317,14 +317,14 @@ void StorageReplicatedMergeTree::pullLogsToQueue()
if (zookeeper.tryGet(replica_path + "/log_pointers/" + replica, index_str))
{
index = Poco::NumberParser::parseUnsigned64(index_str);
index = parse<UInt64>(index_str);
}
else
{
/// Если у нас еще нет указателя на лог этой реплики, поставим указатель на первую запись в нем.
Strings entries = zookeeper.getChildren(zookeeper_path + "/replicas/" + replica + "/log");
std::sort(entries.begin(), entries.end());
index = entries.empty() ? 0 : Poco::NumberParser::parseUnsigned64(entries[0].substr(strlen("log-")));
index = entries.empty() ? 0 : parse<UInt64>(entries[0].substr(strlen("log-")));
zookeeper.create(replica_path + "/log_pointers/" + replica, toString(index), zkutil::CreateMode::Persistent);
}
......@@ -929,10 +929,11 @@ void StorageReplicatedMergeTree::LogEntry::readText(ReadBuffer & in)
String type_str;
assertString("format version: 1\n", in);
readString(type_str, in);
assertString("\nsource replica: ", in);
assertString("source replica: ", in);
readString(source_replica, in);
assertString("\n", in);
readString(type_str, in);
assertString("\n", in);
if (type_str == "get")
{
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册