Skip to content

HDDS-2458. Avoid list copy in ChecksumData #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nandakumar131 merged 1 commit into from
Nov 13, 2019
Merged

HDDS-2458. Avoid list copy in ChecksumData #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/Checksum.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,9 @@ public ChecksumData computeChecksum(ByteBuffer data)
data = data.asReadOnlyBuffer();
}

final ChecksumData checksumData = new ChecksumData(
checksumType, bytesPerChecksum);
if (checksumType == ChecksumType.NONE) {
// Since type is set to NONE, we do not need to compute the checksums
return checksumData;
return new ChecksumData(checksumType, bytesPerChecksum);
}

final Function<ByteBuffer, ByteString> function;
Expand All @@ -188,9 +186,7 @@ public ChecksumData computeChecksum(ByteBuffer data)
for (int index = 0; index < numChecksums; index++) {
checksumList.add(computeChecksum(data, function, bytesPerChecksum));
}
checksumData.setChecksums(checksumList);

return checksumData;
return new ChecksumData(checksumType, bytesPerChecksum, checksumList);
}

/**
Expand Down
28 changes: 7 additions & 21 deletions hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChecksumData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
*/
package org.apache.hadoop.ozone.common;

import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;

import java.util.Collections;
import java.util.List;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
Expand All @@ -40,7 +40,7 @@ public class ChecksumData {
private final List<ByteString> checksums;

public ChecksumData(ChecksumType checksumType, int bytesPerChecksum) {
this(checksumType, bytesPerChecksum, Lists.newArrayList());
this(checksumType, bytesPerChecksum, Collections.emptyList());
}

public ChecksumData(ChecksumType checksumType, int bytesPerChecksum,
Expand All @@ -67,20 +67,10 @@ public int getBytesPerChecksum() {
/**
* Getter method for checksums.
*/
@VisibleForTesting
public List<ByteString> getChecksums() {
return this.checksums;
}

/**
* Setter method for checksums.
* @param checksumList list of checksums
*/
public void setChecksums(List<ByteString> checksumList) {
this.checksums.clear();
this.checksums.addAll(checksumList);
}

/**
* Construct the Checksum ProtoBuf message.
* @return Checksum ProtoBuf message
Expand All @@ -105,14 +95,10 @@ public static ChecksumData getFromProtoBuf(
ContainerProtos.ChecksumData checksumDataProto) {
Preconditions.checkNotNull(checksumDataProto);

ChecksumData checksumData = new ChecksumData(
checksumDataProto.getType(), checksumDataProto.getBytesPerChecksum());

if (checksumDataProto.getChecksumsCount() != 0) {
checksumData.setChecksums(checksumDataProto.getChecksumsList());
}

return checksumData;
return new ChecksumData(
checksumDataProto.getType(),
checksumDataProto.getBytesPerChecksum(),
checksumDataProto.getChecksumsList());
}

/**
Expand Down