Skip to content
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

Jump to bottom

HDDS-10752. OmBucketInfo/OmMultipartKeyInfo/OmPrefixInfo should implement CopyObject. #6590

Merged
merged 1 commit into from
Apr 25, 2024
Merged

HDDS-10752. OmBucketInfo/OmMultipartKeyInfo/OmPrefixInfo should implement CopyObject. #6590

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
9 changes: 4 additions & 5 deletions hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
import org.apache.hadoop.hdds.client.DefaultReplicationConfig;
import org.apache.hadoop.hdds.protocol.StorageType;
import org.apache.hadoop.hdds.utils.db.Codec;
import org.apache.hadoop.hdds.utils.db.CopyObject;
import org.apache.hadoop.hdds.utils.db.DelegatedCodec;
import org.apache.hadoop.hdds.utils.db.Proto2Codec;
import org.apache.hadoop.ozone.OzoneAcl;
Expand All @@ -42,7 +43,7 @@
/**
* A class that encapsulates Bucket Info.
*/
public final class OmBucketInfo extends WithObjectID implements Auditable {
public final class OmBucketInfo extends WithObjectID implements Auditable, CopyObject<OmBucketInfo> {
private static final Codec<OmBucketInfo> CODEC = new DelegatedCodec<>(
Proto2Codec.get(BucketInfo.getDefaultInstance()),
OmBucketInfo::getFromProtobuf,
Expand Down Expand Up @@ -104,7 +105,7 @@ public static Codec<OmBucketInfo> getCodec() {
/**
* Bucket Layout.
*/
private BucketLayout bucketLayout;
private final BucketLayout bucketLayout;

private String owner;

Expand Down Expand Up @@ -340,9 +341,7 @@ public Map<String, String> toAuditMap() {
return auditMap;
}

/**
* Return a new copy of the object.
*/
@Override
public OmBucketInfo copyObject() {
Builder builder = toBuilder();

Expand Down
4 changes: 3 additions & 1 deletion hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartKeyInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import org.apache.hadoop.hdds.client.ECReplicationConfig;
import org.apache.hadoop.hdds.client.ReplicationConfig;
import org.apache.hadoop.hdds.utils.db.Codec;
import org.apache.hadoop.hdds.utils.db.CopyObject;
import org.apache.hadoop.hdds.utils.db.DelegatedCodec;
import org.apache.hadoop.hdds.utils.db.Proto2Codec;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.MultipartKeyInfo;
Expand All @@ -37,7 +38,7 @@
* This class represents multipart upload information for a key, which holds
* upload part information of the key.
*/
public final class OmMultipartKeyInfo extends WithObjectID {
public final class OmMultipartKeyInfo extends WithObjectID implements CopyObject<OmMultipartKeyInfo> {
private static final Codec<OmMultipartKeyInfo> CODEC = new DelegatedCodec<>(
Proto2Codec.get(MultipartKeyInfo.getDefaultInstance()),
OmMultipartKeyInfo::getFromProto,
Expand Down Expand Up @@ -355,6 +356,7 @@ public int hashCode() {
return uploadID.hashCode();
}

@Override
public OmMultipartKeyInfo copyObject() {
return new OmMultipartKeyInfo(this);
}
Expand Down
2 changes: 1 addition & 1 deletion ...ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmMultipartKeyInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
public class TestOmMultipartKeyInfo {

@Test
public void copyObject() {
public void testCopyObject() {
for (ReplicationConfig param : replicationConfigs().collect(toList())) {
testCopyObject(param);
}
Expand Down
7 changes: 3 additions & 4 deletions ...zone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/helpers/OmPrefixInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import com.google.common.base.Preconditions;
import org.apache.hadoop.hdds.utils.db.Codec;
import org.apache.hadoop.hdds.utils.db.CopyObject;
import org.apache.hadoop.hdds.utils.db.DelegatedCodec;
import org.apache.hadoop.hdds.utils.db.Proto2Codec;
import org.apache.hadoop.ozone.OzoneAcl;
Expand All @@ -36,7 +37,7 @@
* can be extended for other OzFS optimizations in future.
*/
// TODO: support Auditable interface
public final class OmPrefixInfo extends WithObjectID {
public final class OmPrefixInfo extends WithObjectID implements CopyObject<OmPrefixInfo> {
private static final Codec<OmPrefixInfo> CODEC = new DelegatedCodec<>(
Proto2Codec.get(PersistedPrefixInfo.getDefaultInstance()),
OmPrefixInfo::getFromProtobuf,
Expand Down Expand Up @@ -230,9 +231,7 @@ public String toString() {
'}';
}

/**
* Return a new copy of the object.
*/
@Override
public OmPrefixInfo copyObject() {
return toBuilder().build();
}
Expand Down