Merge

dbms/src/Storages/MergeTree/MergeTreeDataMerger.cpp

@@ -250,7 +250,7 @@ bool MergeTreeDataMerger::selectPartsToMerge(MergeTreeData::DataPartsVector & pa
 /// parts должны быть отсортированы.
 MergeTreeData::DataPartPtr MergeTreeDataMerger::mergeParts(const MergeTreeData::DataPartsVector & parts, const String & merged_name)
 {
-	LOG_DEBUG(log, "Merging " << parts.size() << " parts: from " << parts.front()->name << " to " << parts.back()->name);
+	LOG_DEBUG(log, "Merging " << parts.size() << " parts: from " << parts.front()->name << " to " << parts.back()->name << " into " << merged_name);
 
 	Names all_column_names;
 	NamesAndTypesList columns_list = data.getColumnsList();

dbms/src/Storages/MergeTree/MergeTreeDataWriter.cpp

@@ -89,13 +89,9 @@ MergeTreeData::MutableDataPartPtr MergeTreeDataWriter::writeTempPart(BlockWithDa
 
 	Poco::File(part_tmp_path).createDirectories();
 
-	LOG_TRACE(log, "Calculating primary expression.");
-
 	/// Если для сортировки надо вычислить некоторые столбцы - делаем это.
 	data.getPrimaryExpression()->execute(block);
 
-	LOG_TRACE(log, "Sorting by primary key.");
-
 	SortDescription sort_descr = data.getSortDescription();
 
 	/// Сортируем.

dbms/src/Storages/StorageReplicatedMergeTree.cpp

@@ -1114,6 +1114,11 @@ bool StorageReplicatedMergeTree::canMergeParts(const MergeTreeData::DataPartPtr
 		virtual_parts.getContainingPart(right->name) != right->name)
 		return false;
 
+	/// Если о каком-то из кусков нет информации в ZK, не будем сливать.
+	if (!zookeeper->exists(replica_path + "/parts/" + left->name) ||
+		!zookeeper->exists(replica_path + "/parts/" + right->name))
+		return false;
+
 	String month_name = left->name.substr(0, 6);
 
 	/// Можно слить куски, если все номера между ними заброшены - не соответствуют никаким блокам.
@@ -1193,7 +1198,7 @@ void StorageReplicatedMergeTree::fetchPart(const String & part_name, const Strin
 
 	ProfileEvents::increment(ProfileEvents::ReplicatedPartFetches);
 
-	LOG_DEBUG(log, "Fetched part");
+	LOG_DEBUG(log, "Fetched part " << part_name << " from " << replica_name);
 }
 
 void StorageReplicatedMergeTree::shutdown()