Merge

dbms/include/DB/Storages/MergeTree/MergeTreeData.h

@@ -299,8 +299,8 @@ public:
 			if (!Poco::File(path).exists())
 				return false;
 			ReadBufferFromFile file(path, std::min(static_cast<size_t>(DBMS_DEFAULT_BUFFER_SIZE), Poco::File(path).getSize()));
-			checksums.readText(file);
-			assertEOF(file);
+			if (checksums.readText(file))
+				assertEOF(file);
 			return true;
 		}
 	};

dbms/src/Storages/MergeTree/MergeTreeData.cpp

@@ -877,7 +877,7 @@ bool MergeTreeData::DataPart::Checksums::readText(ReadBuffer & in)
 		throw Exception("Bad checksums format version: " + DB::toString(format_version), ErrorCodes::UNKNOWN_FORMAT);
 	if (format_version == 1)
 		return false;
-	DB::assertString("\n",in);
+	DB::assertString("\n", in);
 	DB::readText(count, in);
 	DB::assertString(" files:\n", in);