errose28 commented on code in PR #8402:
URL: https://github.com/apache/ozone/pull/8402#discussion_r2080068556
##########
hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/checksum/ContainerMerkleTreeWriter.java:
##########
@@ -49,21 +49,67 @@ public class ContainerMerkleTreeWriter {
public static final Supplier<ChecksumByteBuffer> CHECKSUM_BUFFER_SUPPLIER =
ChecksumByteBufferFactory::crc32CImpl;
/**
- * Constructs an empty Container merkle tree object.
+ * Constructs a writer for an initially empty container merkle tree.
*/
public ContainerMerkleTreeWriter() {
id2Block = new TreeMap<>();
}
+ /**
+ * Constructs a writer for a container merkle tree which initially contains
all the information from the specified
+ * proto.
+ */
+ public ContainerMerkleTreeWriter(ContainerProtos.ContainerMerkleTree
fromTree) {
+ id2Block = new TreeMap<>();
+ for (ContainerProtos.BlockMerkleTree blockTree:
fromTree.getBlockMerkleTreeList()) {
+ long blockID = blockTree.getBlockID();
+ addBlock(blockID);
+ for (ContainerProtos.ChunkMerkleTree chunkTree:
blockTree.getChunkMerkleTreeList()) {
+ addChunks(blockID, chunkTree);
+ }
+ }
+ }
+
/**
* Adds chunks to a block in the tree. The block entry will be created if it
is the first time adding chunks to it.
* If the block entry already exists, the chunks will be added to the
existing chunks for that block.
*
* @param blockID The ID of the block that these chunks belong to.
+ * @param healthy True if there were no errors detected with these chunks.
False indicates that all the chunks
+ * being added had errors.
* @param chunks A list of chunks to add to this block. The chunks will be
sorted internally by their offset.
*/
- public void addChunks(long blockID, Collection<ContainerProtos.ChunkInfo>
chunks) {
- id2Block.computeIfAbsent(blockID,
BlockMerkleTreeWriter::new).addChunks(chunks);
+ public void addChunks(long blockID, boolean healthy,
Collection<ContainerProtos.ChunkInfo> chunks) {
+ for (ContainerProtos.ChunkInfo chunk: chunks) {
+ addChunks(blockID, healthy, chunk);
+ }
+ }
+
+ public void addChunks(long blockID, boolean healthy,
ContainerProtos.ChunkInfo... chunks) {
+ for (ContainerProtos.ChunkInfo chunk: chunks) {
+ addChunks(blockID, new ChunkMerkleTreeWriter(chunk, healthy));
+ }
+ }
+
+
+ public void addChunks(long blockID, ContainerProtos.ChunkMerkleTree...
chunks) {
+ for (ContainerProtos.ChunkMerkleTree chunkTree: chunks) {
+ addChunks(blockID, new ChunkMerkleTreeWriter(chunkTree));
+ }
+ }
+
+ private void addChunks(long blockID, ChunkMerkleTreeWriter chunkWriter) {
+ id2Block.computeIfAbsent(blockID,
BlockMerkleTreeWriter::new).addChunks(chunkWriter);
+ }
+
+ /**
+ * Adds an empty block to the tree. This method is not a pre-requisite to
{@code addChunks}.
+ * If the block entry already exists, it will not be modified.
+ *
+ * @param blockID The ID of the empty block to add to the tree
+ */
+ public void addBlock(long blockID) {
Review Comment:
This got broken when moving the changes from #7490 to here. I'll fix it in
the next commit. The test `testBuildTreeWithEmptyBlock` in #7490 would have
caught this.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
