thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-30 05:30:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

build checker fix (style) and change comments

Browse Source
This commit is contained in:
Alexandra Latysheva 2020-10-05 20:30:50 +00:00
parent 2be62bbd1b
commit 41e0148d72
3 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Storages/MergeTree/ReplicatedMergeTreePartHeader.cpp
View File

@ -37,11 +37,11 @@ ReplicatedMergeTreePartHeader ReplicatedMergeTreePartHeader::fromColumnsAndCheck
ReplicatedMergeTreePartHeader ReplicatedMergeTreePartHeader::fromColumnsChecksumsBlockID(
const NamesAndTypesList & columns,
const MergeTreeDataPartChecksums & full_checksums,
const String & block_id_)
const String & block_id_name)
{
MinimalisticDataPartChecksums checksums;
checksums.computeTotalChecksums(full_checksums);
return ReplicatedMergeTreePartHeader(getSipHash(columns.toString()), std::move(checksums), block_id_);
return ReplicatedMergeTreePartHeader(getSipHash(columns.toString()), std::move(checksums), block_id_name);
}
void ReplicatedMergeTreePartHeader::read(ReadBuffer & in)
@ -52,9 +52,9 @@ void ReplicatedMergeTreePartHeader::read(ReadBuffer & in)
if (!in.eof())
{
String block_id_;
in >> "\nblock_id: " >> block_id_;
block_id = block_id_;
String new_block_id;
in >> "\nblock_id: " >> new_block_id;
block_id = new_block_id;
}
}

2
src/Storages/MergeTree/ReplicatedMergeTreePartHeader.h
View File

@ -30,7 +30,7 @@ public:
const NamesAndTypesList & columns, const MergeTreeDataPartChecksums & full_checksums);
static ReplicatedMergeTreePartHeader fromColumnsChecksumsBlockID(
const NamesAndTypesList & columns, const MergeTreeDataPartChecksums & full_checksums, const String & block_id_);
const NamesAndTypesList & columns, const MergeTreeDataPartChecksums & full_checksums, const String & block_id_name);
void read(ReadBuffer & in);
static ReplicatedMergeTreePartHeader fromString(const String & str);

10
src/Storages/StorageReplicatedMergeTree.cpp
View File

@ -1180,12 +1180,7 @@ void StorageReplicatedMergeTree::checkPartChecksumsAndAddCommitOps(const zkutil:
}
else
{
/// ALEXELEX
/// is this a valid format or an old one?
/// discovered that minimalistic-format is new and is the default.
/// should we support old format for quorum parallel inserts?
/// if yes, let's use blocks/.../status ? hope no, it's too many if-else otherwise :)
/// but if so, how about this?
/// alexelex: if (local_part_header.getBlockID()) throw or skip it?
ops.emplace_back(zkutil::makeCreateRequest(
part_path, "", zkutil::CreateMode::Persistent));
ops.emplace_back(zkutil::makeCreateRequest(
@ -5740,8 +5735,7 @@ void StorageReplicatedMergeTree::getCommitPartOps(
}
else
{
/// ALEXELEX
/// also. should we support it?
/// alexelex: if (!block_id.empty()) throw or skip it?
ops.emplace_back(zkutil::makeCreateRequest(
replica_path + "/parts/" + part->name,
"",