Skip to content

HDDS-4983. Display key offset for each block in command key info #2051

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
elek merged 9 commits into from
Apr 29, 2021
Merged

HDDS-4983. Display key offset for each block in command key info #2051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
321e071
Display key offset for each block in command key info
cchenax Mar 16, 2021
28cf22f
Display key offset for each block in command key info
cchenax Mar 25, 2021
781743b
Display key offset for each block in command key info
cchenax Mar 25, 2021
72056ca
HDDS-4983. Display key offset for each block in command key info
Apr 20, 2021
54bb64a
HDDS-4983. Display key offset for each block in command key info
Apr 20, 2021
6909fc9
HDDS-4983. Display key offset for each block in command key info
Apr 20, 2021
06f279d
HDDS-4983. Display key offset for each block in command key info
Apr 20, 2021
97f22ae
Update hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/clie…
cchenax Apr 26, 2021
6611f67
retrigger build with empty commit
elek Apr 29, 2021
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
15 changes: 13 additions & 2 deletions hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneKeyLocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,20 @@ public class OzoneKeyLocation {
* Offset of this key.
*/
private final long offset;

/**
* KeyOffset of this key.
*/
private final long keyOffset;
/**
* Constructs OzoneKeyLocation.
*/
public OzoneKeyLocation(long containerID, long localID,
long length, long offset) {
long length, long offset, long keyOffset) {
this.containerID = containerID;
this.localID = localID;
this.length = length;
this.offset = offset;
this.keyOffset = keyOffset;
}

/**
Expand Down Expand Up @@ -79,4 +83,11 @@ public long getOffset() {
return offset;
}

/**
* Returns the KeyOffset of this Key.
*/
public long getKeyOffset() {
return keyOffset;
}

}
13 changes: 10 additions & 3 deletions hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@
import org.apache.hadoop.ozone.om.helpers.OmDeleteKeys;
import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
import org.apache.hadoop.ozone.om.helpers.OmMultipartInfo;
import org.apache.hadoop.ozone.om.helpers.OmMultipartUploadCompleteInfo;
import org.apache.hadoop.ozone.om.helpers.OmMultipartUploadCompleteList;
Expand Down Expand Up @@ -858,9 +859,15 @@ public OzoneKeyDetails getKeyDetails(
OmKeyInfo keyInfo = ozoneManagerClient.lookupKey(keyArgs);

List<OzoneKeyLocation> ozoneKeyLocations = new ArrayList<>();
keyInfo.getLatestVersionLocations().getBlocksLatestVersionOnly().forEach(
(a) -> ozoneKeyLocations.add(new OzoneKeyLocation(a.getContainerID(),
a.getLocalID(), a.getLength(), a.getOffset())));
long lastKeyOffset = 0L;
List<OmKeyLocationInfo> omKeyLocationInfos = keyInfo
.getLatestVersionLocations().getBlocksLatestVersionOnly();
for (OmKeyLocationInfo info: omKeyLocationInfos) {
ozoneKeyLocations.add(new OzoneKeyLocation(info.getContainerID(),
info.getLocalID(), info.getLength(), info.getOffset(),
lastKeyOffset));
lastKeyOffset += info.getLength();
}
return new OzoneKeyDetails(keyInfo.getVolumeName(), keyInfo.getBucketName(),
keyInfo.getKeyName(), keyInfo.getDataSize(), keyInfo.getCreationTime(),
keyInfo.getModificationTime(), ozoneKeyLocations, ReplicationType
Expand Down