This is an automated email from the ASF dual-hosted git repository.
szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 6d7ba130cf HDDS-9797. Pass defaultInstance instead of a class in
Proto2/3Codec. (#5695)
6d7ba130cf is described below
commit 6d7ba130cf5a660780aceb773bb17d738df33905
Author: Tsz-Wo Nicholas Sze <[email protected]>
AuthorDate: Wed Nov 29 09:46:03 2023 -0800
HDDS-9797. Pass defaultInstance instead of a class in Proto2/3Codec. (#5695)
---
.../apache/hadoop/hdds/protocol/DatanodeDetails.java | 13 +++++++------
.../hadoop/hdds/scm/container/ContainerInfo.java | 2 +-
.../org/apache/hadoop/hdds/scm/pipeline/Pipeline.java | 2 +-
.../org/apache/hadoop/hdds/utils/db/Proto2Codec.java | 19 +++++--------------
.../org/apache/hadoop/hdds/utils/db/Proto3Codec.java | 19 +++++--------------
.../ozone/container/common/helpers/BlockData.java | 2 +-
.../ozone/container/common/helpers/ChunkInfoList.java | 2 +-
.../metadata/DatanodeSchemaThreeDBDefinition.java | 2 +-
.../metadata/DatanodeSchemaTwoDBDefinition.java | 2 +-
.../container/common/helpers/MoveDataNodePair.java | 2 +-
.../hdds/security/x509/certificate/CertInfo.java | 2 +-
.../apache/hadoop/hdds/security/x509/crl/CRLInfo.java | 2 +-
.../apache/hadoop/hdds/utils/db/DBStoreBuilder.java | 4 ++--
.../ozone/compaction/log/CompactionLogEntry.java | 2 +-
.../hadoop/hdds/scm/metadata/SCMDBDefinition.java | 2 +-
.../apache/hadoop/ozone/om/helpers/OmBucketInfo.java | 2 +-
.../hadoop/ozone/om/helpers/OmDBAccessIdInfo.java | 2 +-
.../hadoop/ozone/om/helpers/OmDBTenantState.java | 13 ++++++-------
.../ozone/om/helpers/OmDBUserPrincipalInfo.java | 2 +-
.../hadoop/ozone/om/helpers/OmDirectoryInfo.java | 13 ++++++-------
.../org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java | 2 +-
.../hadoop/ozone/om/helpers/OmMultipartKeyInfo.java | 2 +-
.../apache/hadoop/ozone/om/helpers/OmVolumeArgs.java | 2 +-
.../hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java | 2 +-
.../apache/hadoop/ozone/om/helpers/S3SecretValue.java | 11 +++++------
.../apache/hadoop/ozone/om/helpers/SnapshotInfo.java | 3 ++-
.../ozone/snapshot/SnapshotDiffReportOzone.java | 2 +-
.../apache/hadoop/ozone/om/helpers/OmPrefixInfo.java | 2 +-
.../apache/hadoop/ozone/om/OmMetadataManagerImpl.java | 2 +-
.../apache/hadoop/ozone/om/codec/OMDBDefinition.java | 13 ++++++-------
.../ozone/recon/scm/ContainerReplicaHistoryList.java | 2 +-
31 files changed, 66 insertions(+), 86 deletions(-)
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/protocol/DatanodeDetails.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/protocol/DatanodeDetails.java
index fe79f27384..739f6ebd65 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/protocol/DatanodeDetails.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/protocol/DatanodeDetails.java
@@ -33,6 +33,7 @@ import org.apache.hadoop.hdds.annotation.InterfaceAudience;
import org.apache.hadoop.hdds.annotation.InterfaceStability;
import org.apache.hadoop.hdds.protocol.DatanodeDetails.Port.Name;
import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import
org.apache.hadoop.hdds.protocol.proto.HddsProtos.ExtendedDatanodeDetailsProto;
import org.apache.hadoop.hdds.scm.net.NetConstants;
import org.apache.hadoop.hdds.scm.net.NodeImpl;
@@ -69,7 +70,7 @@ public class DatanodeDetails extends NodeImpl implements
LoggerFactory.getLogger(DatanodeDetails.class);
private static final Codec<DatanodeDetails> CODEC = new DelegatedCodec<>(
- Proto2Codec.get(HddsProtos.ExtendedDatanodeDetailsProto.class),
+ Proto2Codec.get(ExtendedDatanodeDetailsProto.getDefaultInstance()),
DatanodeDetails::getFromProtoBuf,
DatanodeDetails::getExtendedProtoBufMessage);
@@ -392,7 +393,7 @@ public class DatanodeDetails extends NodeImpl implements
* @return DatanodeDetails
*/
public static DatanodeDetails getFromProtoBuf(
- HddsProtos.ExtendedDatanodeDetailsProto extendedDetailsProto) {
+ ExtendedDatanodeDetailsProto extendedDetailsProto) {
DatanodeDetails.Builder builder;
if (extendedDetailsProto.hasDatanodeDetails()) {
builder = newBuilder(extendedDetailsProto.getDatanodeDetails());
@@ -480,12 +481,12 @@ public class DatanodeDetails extends NodeImpl implements
/**
* Returns a ExtendedDatanodeDetails protobuf message from a datanode ID.
- * @return HddsProtos.ExtendedDatanodeDetailsProto
+ * @return ExtendedDatanodeDetailsProto
*/
@JsonIgnore
- public HddsProtos.ExtendedDatanodeDetailsProto getExtendedProtoBufMessage() {
- HddsProtos.ExtendedDatanodeDetailsProto.Builder extendedBuilder =
- HddsProtos.ExtendedDatanodeDetailsProto.newBuilder()
+ public ExtendedDatanodeDetailsProto getExtendedProtoBufMessage() {
+ final ExtendedDatanodeDetailsProto.Builder extendedBuilder
+ = ExtendedDatanodeDetailsProto.newBuilder()
.setDatanodeDetails(getProtoBufMessage());
if (!Strings.isNullOrEmpty(getVersion())) {
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerInfo.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerInfo.java
index 8bcc396142..b11428581e 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerInfo.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerInfo.java
@@ -44,7 +44,7 @@ public final class ContainerInfo implements
Comparable<ContainerInfo> {
= Comparator.comparingLong(info -> info.getLastUsed().toEpochMilli());
private static final Codec<ContainerInfo> CODEC = new DelegatedCodec<>(
- Proto2Codec.get(HddsProtos.ContainerInfoProto.class),
+ Proto2Codec.get(HddsProtos.ContainerInfoProto.getDefaultInstance()),
ContainerInfo::fromProtobuf,
ContainerInfo::getProtobuf);
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/pipeline/Pipeline.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/pipeline/Pipeline.java
index 486f6781f9..2a117de35b 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/pipeline/Pipeline.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/pipeline/Pipeline.java
@@ -62,7 +62,7 @@ public final class Pipeline {
* -- the creation time may change.
*/
private static final Codec<Pipeline> CODEC = new DelegatedCodec<>(
- Proto2Codec.get(HddsProtos.Pipeline.class),
+ Proto2Codec.get(HddsProtos.Pipeline.getDefaultInstance()),
Pipeline::getFromProtobufSetCreationTimestamp,
p -> p.getProtobufMessage(ClientVersion.CURRENT_VERSION),
DelegatedCodec.CopyType.UNSUPPORTED);
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/db/Proto2Codec.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/db/Proto2Codec.java
index bf3400a6e7..e6b8338d5d 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/db/Proto2Codec.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/db/Proto2Codec.java
@@ -41,25 +41,16 @@ public final class Proto2Codec<M extends MessageLite>
/**
* @return the {@link Codec} for the given class.
*/
- public static <T extends MessageLite> Codec<T> get(Class<T> clazz) {
- final Codec<?> codec = CODECS.computeIfAbsent(clazz, Proto2Codec::new);
+ public static <T extends MessageLite> Codec<T> get(T t) {
+ final Codec<?> codec = CODECS.computeIfAbsent(t.getClass(),
+ key -> new Proto2Codec<>(t));
return (Codec<T>) codec;
}
- private static <T extends MessageLite> Parser<T> getParser(Class<T> clazz) {
- final String name = "PARSER";
- try {
- return (Parser<T>) clazz.getField(name).get(null);
- } catch (Exception e) {
- throw new IllegalStateException(
- "Failed to get " + name + " field from " + clazz, e);
- }
- }
-
private final Parser<M> parser;
- private Proto2Codec(Class<M> clazz) {
- this.parser = getParser(clazz);
+ private Proto2Codec(M m) {
+ this.parser = (Parser<M>) m.getParserForType();
}
@Override
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/db/Proto3Codec.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/db/Proto3Codec.java
index dc0f13a750..d353a489d9 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/db/Proto3Codec.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/db/Proto3Codec.java
@@ -41,25 +41,16 @@ public final class Proto3Codec<M extends MessageLite>
/**
* @return the {@link Codec} for the given class.
*/
- public static <T extends MessageLite> Codec<T> get(Class<T> clazz) {
- final Codec<?> codec = CODECS.computeIfAbsent(clazz, Proto3Codec::new);
+ public static <T extends MessageLite> Codec<T> get(T t) {
+ final Codec<?> codec = CODECS.computeIfAbsent(t.getClass(),
+ key -> new Proto3Codec<>(t));
return (Codec<T>) codec;
}
- private static <T extends MessageLite> Parser<T> getParser(Class<T> clazz) {
- final String name = "PARSER";
- try {
- return (Parser<T>) clazz.getField(name).get(null);
- } catch (Exception e) {
- throw new IllegalStateException(
- "Failed to get " + name + " field from " + clazz, e);
- }
- }
-
private final Parser<M> parser;
- private Proto3Codec(Class<M> clazz) {
- this.parser = getParser(clazz);
+ private Proto3Codec(M m) {
+ this.parser = (Parser<M>) m.getParserForType();
}
@Override
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/BlockData.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/BlockData.java
index c38fb88ee9..8f89be3c11 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/BlockData.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/BlockData.java
@@ -36,7 +36,7 @@ import java.util.ArrayList;
*/
public class BlockData {
private static final Codec<BlockData> CODEC = new DelegatedCodec<>(
- Proto3Codec.get(ContainerProtos.BlockData.class),
+ Proto3Codec.get(ContainerProtos.BlockData.getDefaultInstance()),
BlockData::getFromProtoBuf,
BlockData::getProtoBufMessage);
diff --git
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ChunkInfoList.java
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ChunkInfoList.java
index 0254dfe6bd..6f31ee40c4 100644
---
a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ChunkInfoList.java
+++
b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ChunkInfoList.java
@@ -33,7 +33,7 @@ import java.util.List;
*/
public class ChunkInfoList {
private static final Codec<ChunkInfoList> CODEC = new DelegatedCodec<>(
- Proto3Codec.get(ContainerProtos.ChunkInfoList.class),
+ Proto3Codec.get(ContainerProtos.ChunkInfoList.getDefaultInstance()),
ChunkInfoList::getFromProtoBuf,
ChunkInfoList::getProtoBufMessage,
DelegatedCodec.CopyType.SHALLOW);
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaThreeDBDefinition.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaThreeDBDefinition.java
index 745e1153da..1d1c7faa69 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaThreeDBDefinition.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaThreeDBDefinition.java
@@ -90,7 +90,7 @@ public class DatanodeSchemaThreeDBDefinition
String.class,
FixedLengthStringCodec.get(),
DeletedBlocksTransaction.class,
- Proto2Codec.get(DeletedBlocksTransaction.class));
+ Proto2Codec.get(DeletedBlocksTransaction.getDefaultInstance()));
private static String separator = "";
diff --git
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaTwoDBDefinition.java
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaTwoDBDefinition.java
index 50e181147e..cc78aa6a92 100644
---
a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaTwoDBDefinition.java
+++
b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaTwoDBDefinition.java
@@ -74,7 +74,7 @@ public class DatanodeSchemaTwoDBDefinition
Long.class,
LongCodec.get(),
StorageContainerDatanodeProtocolProtos.DeletedBlocksTransaction.class,
- Proto2Codec.get(DeletedBlocksTransaction.class));
+ Proto2Codec.get(DeletedBlocksTransaction.getDefaultInstance()));
public DatanodeSchemaTwoDBDefinition(String dbPath,
ConfigurationSource config) {
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/container/common/helpers/MoveDataNodePair.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/container/common/helpers/MoveDataNodePair.java
index 20de146813..42e8f8202c 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/container/common/helpers/MoveDataNodePair.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/container/common/helpers/MoveDataNodePair.java
@@ -33,7 +33,7 @@ import java.util.Objects;
*/
public class MoveDataNodePair {
private static final Codec<MoveDataNodePair> CODEC = new DelegatedCodec<>(
- Proto2Codec.get(MoveDataNodePairProto.class),
+ Proto2Codec.get(MoveDataNodePairProto.getDefaultInstance()),
MoveDataNodePair::getFromProtobuf,
pair -> pair.getProtobufMessage(ClientVersion.CURRENT_VERSION),
DelegatedCodec.CopyType.SHALLOW);
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/CertInfo.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/CertInfo.java
index 88854f3302..3a1df1bd86 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/CertInfo.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/CertInfo.java
@@ -37,7 +37,7 @@ import java.util.Objects;
*/
public final class CertInfo implements Comparable<CertInfo>, Serializable {
private static final Codec<CertInfo> CODEC = new DelegatedCodec<>(
- Proto2Codec.get(CertInfoProto.class),
+ Proto2Codec.get(CertInfoProto.getDefaultInstance()),
CertInfo::fromProtobuf,
CertInfo::getProtobuf);
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfo.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfo.java
index 52545983c5..02a9d12ebd 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfo.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/crl/CRLInfo.java
@@ -41,7 +41,7 @@ public final class CRLInfo implements Comparator<CRLInfo>,
Comparable<CRLInfo> {
private static final Codec<CRLInfo> CODEC = new DelegatedCodec<>(
- Proto2Codec.get(CRLInfoProto.class),
+ Proto2Codec.get(CRLInfoProto.getDefaultInstance()),
proto -> fromProtobuf(proto, CRLCodec::toIOException),
CRLInfo::getProtobuf);
diff --git
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBStoreBuilder.java
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBStoreBuilder.java
index 1a2bc94a47..fe495e7b06 100644
---
a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBStoreBuilder.java
+++
b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBStoreBuilder.java
@@ -255,8 +255,8 @@ public final class DBStoreBuilder {
return this;
}
- public <T extends MessageLite> DBStoreBuilder addProto2Codec(Class<T> type) {
- return addCodec(type, Proto2Codec.get(type));
+ public <T extends MessageLite> DBStoreBuilder addProto2Codec(T type) {
+ return addCodec((Class<T>)type.getClass(), Proto2Codec.get(type));
}
public DBStoreBuilder setDBOptions(ManagedDBOptions option) {
diff --git
a/hadoop-hdds/rocksdb-checkpoint-differ/src/main/java/org/apache/ozone/compaction/log/CompactionLogEntry.java
b/hadoop-hdds/rocksdb-checkpoint-differ/src/main/java/org/apache/ozone/compaction/log/CompactionLogEntry.java
index 557aa9e399..bbd24d1fc3 100644
---
a/hadoop-hdds/rocksdb-checkpoint-differ/src/main/java/org/apache/ozone/compaction/log/CompactionLogEntry.java
+++
b/hadoop-hdds/rocksdb-checkpoint-differ/src/main/java/org/apache/ozone/compaction/log/CompactionLogEntry.java
@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
public final class CompactionLogEntry implements
CopyObject<CompactionLogEntry> {
private static final Codec<CompactionLogEntry> CODEC = new DelegatedCodec<>(
- Proto2Codec.get(CompactionLogEntryProto.class),
+ Proto2Codec.get(CompactionLogEntryProto.getDefaultInstance()),
CompactionLogEntry::getFromProtobuf,
CompactionLogEntry::getProtobuf);
diff --git
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMDBDefinition.java
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMDBDefinition.java
index 29fd467ea0..8b9b76df89 100644
---
a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMDBDefinition.java
+++
b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMDBDefinition.java
@@ -58,7 +58,7 @@ public class SCMDBDefinition extends DBDefinition.WithMap {
Long.class,
LongCodec.get(),
DeletedBlocksTransaction.class,
- Proto2Codec.get(DeletedBlocksTransaction.class));
+ Proto2Codec.get(DeletedBlocksTransaction.getDefaultInstance()));
public static final DBColumnFamilyDefinition<BigInteger, X509Certificate>
VALID_CERTS =
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketInfo.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketInfo.java
index cfef3693de..cc811053eb 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketInfo.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmBucketInfo.java
@@ -45,7 +45,7 @@ import com.google.common.base.Preconditions;
*/
public final class OmBucketInfo extends WithObjectID implements Auditable {
private static final Codec<OmBucketInfo> CODEC = new DelegatedCodec<>(
- Proto2Codec.get(BucketInfo.class),
+ Proto2Codec.get(BucketInfo.getDefaultInstance()),
OmBucketInfo::getFromProtobuf,
OmBucketInfo::getProtobuf);
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBAccessIdInfo.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBAccessIdInfo.java
index 53a1b7e291..8ca0054b34 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBAccessIdInfo.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBAccessIdInfo.java
@@ -31,7 +31,7 @@ import java.io.IOException;
*/
public final class OmDBAccessIdInfo {
private static final Codec<OmDBAccessIdInfo> CODEC = new DelegatedCodec<>(
- Proto2Codec.get(ExtendedUserAccessIdInfo.class),
+ Proto2Codec.get(ExtendedUserAccessIdInfo.getDefaultInstance()),
OmDBAccessIdInfo::getFromProtobuf,
OmDBAccessIdInfo::getProtobuf,
DelegatedCodec.CopyType.SHALLOW);
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBTenantState.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBTenantState.java
index 0c113aba85..bb356eafdd 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBTenantState.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBTenantState.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.ozone.om.helpers;
import org.apache.hadoop.hdds.utils.db.Codec;
import org.apache.hadoop.hdds.utils.db.DelegatedCodec;
import org.apache.hadoop.hdds.utils.db.Proto2Codec;
-import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
+import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.TenantState;
import java.util.Objects;
@@ -31,7 +31,7 @@ import java.util.Objects;
*/
public final class OmDBTenantState implements Comparable<OmDBTenantState> {
private static final Codec<OmDBTenantState> CODEC = new DelegatedCodec<>(
- Proto2Codec.get(OzoneManagerProtocolProtos.TenantState.class),
+ Proto2Codec.get(TenantState.getDefaultInstance()),
OmDBTenantState::getFromProtobuf,
OmDBTenantState::getProtobuf,
DelegatedCodec.CopyType.SHALLOW);
@@ -112,7 +112,7 @@ public final class OmDBTenantState implements
Comparable<OmDBTenantState> {
/**
* Returns the bucket namespace name. a.k.a. volume name.
- *
+ * <p>
* Note: This returns an empty string ("") if the tenant is somehow not
* associated with a volume. Should never return null.
*/
@@ -139,8 +139,8 @@ public final class OmDBTenantState implements
Comparable<OmDBTenantState> {
/**
* Convert OmDBTenantState to protobuf to be persisted to DB.
*/
- public OzoneManagerProtocolProtos.TenantState getProtobuf() {
- return OzoneManagerProtocolProtos.TenantState.newBuilder()
+ public TenantState getProtobuf() {
+ return TenantState.newBuilder()
.setTenantId(tenantId)
.setBucketNamespaceName(bucketNamespaceName)
.setUserRoleName(userRoleName)
@@ -153,8 +153,7 @@ public final class OmDBTenantState implements
Comparable<OmDBTenantState> {
/**
* Convert protobuf to OmDBTenantState.
*/
- public static OmDBTenantState getFromProtobuf(
- OzoneManagerProtocolProtos.TenantState proto) {
+ public static OmDBTenantState getFromProtobuf(TenantState proto) {
return new Builder()
.setTenantId(proto.getTenantId())
.setBucketNamespaceName(proto.getBucketNamespaceName())
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBUserPrincipalInfo.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBUserPrincipalInfo.java
index 273e5138ba..75b01a0417 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBUserPrincipalInfo.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDBUserPrincipalInfo.java
@@ -35,7 +35,7 @@ import java.util.Set;
public final class OmDBUserPrincipalInfo {
private static final Codec<OmDBUserPrincipalInfo> CODEC
= new DelegatedCodec<>(
- Proto2Codec.get(TenantUserPrincipalInfo.class),
+ Proto2Codec.get(TenantUserPrincipalInfo.getDefaultInstance()),
OmDBUserPrincipalInfo::getFromProtobuf,
OmDBUserPrincipalInfo::getProtobuf);
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDirectoryInfo.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDirectoryInfo.java
index 66f33cf5b4..3d1940bd7c 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDirectoryInfo.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmDirectoryInfo.java
@@ -23,7 +23,7 @@ import org.apache.hadoop.hdds.utils.db.CopyObject;
import org.apache.hadoop.hdds.utils.db.Proto2Codec;
import org.apache.hadoop.ozone.OzoneAcl;
import org.apache.hadoop.ozone.OzoneConsts;
-import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
+import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.DirectoryInfo;
import java.util.BitSet;
import java.util.HashMap;
@@ -40,7 +40,7 @@ import java.util.Objects;
public class OmDirectoryInfo extends WithParentObjectId
implements CopyObject<OmDirectoryInfo> {
private static final Codec<OmDirectoryInfo> CODEC = new DelegatedCodec<>(
- Proto2Codec.get(OzoneManagerProtocolProtos.DirectoryInfo.class),
+ Proto2Codec.get(DirectoryInfo.getDefaultInstance()),
OmDirectoryInfo::getFromProtobuf,
OmDirectoryInfo::getProtobuf);
@@ -191,9 +191,9 @@ public class OmDirectoryInfo extends WithParentObjectId
/**
* Creates DirectoryInfo protobuf from OmDirectoryInfo.
*/
- public OzoneManagerProtocolProtos.DirectoryInfo getProtobuf() {
- OzoneManagerProtocolProtos.DirectoryInfo.Builder pib =
- OzoneManagerProtocolProtos.DirectoryInfo.newBuilder().setName(name)
+ public DirectoryInfo getProtobuf() {
+ final DirectoryInfo.Builder pib =
+ DirectoryInfo.newBuilder().setName(name)
.setCreationTime(creationTime)
.setModificationTime(modificationTime)
.addAllMetadata(KeyValueUtil.toProtobuf(metadata))
@@ -211,8 +211,7 @@ public class OmDirectoryInfo extends WithParentObjectId
* @param dirInfo
* @return instance of OmDirectoryInfo
*/
- public static OmDirectoryInfo getFromProtobuf(
- OzoneManagerProtocolProtos.DirectoryInfo dirInfo) {
+ public static OmDirectoryInfo getFromProtobuf(DirectoryInfo dirInfo) {
OmDirectoryInfo.Builder opib = OmDirectoryInfo.newBuilder()
.setName(dirInfo.getName())
.setCreationTime(dirInfo.getCreationTime())
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
index b3be2306ec..c3a1a4a3d7 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
@@ -62,7 +62,7 @@ public final class OmKeyInfo extends WithParentObjectId
private static Codec<OmKeyInfo> newCodec(boolean ignorePipeline) {
return new DelegatedCodec<>(
- Proto2Codec.get(KeyInfo.class),
+ Proto2Codec.get(KeyInfo.getDefaultInstance()),
OmKeyInfo::getFromProtobuf,
k -> k.getProtobuf(ignorePipeline, ClientVersion.CURRENT_VERSION));
}
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartKeyInfo.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartKeyInfo.java
index 48ea18045e..4f57e075bd 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartKeyInfo.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmMultipartKeyInfo.java
@@ -39,7 +39,7 @@ import java.util.TreeMap;
*/
public final class OmMultipartKeyInfo extends WithObjectID {
private static final Codec<OmMultipartKeyInfo> CODEC = new DelegatedCodec<>(
- Proto2Codec.get(MultipartKeyInfo.class),
+ Proto2Codec.get(MultipartKeyInfo.getDefaultInstance()),
OmMultipartKeyInfo::getFromProto,
OmMultipartKeyInfo::getProto);
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmVolumeArgs.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmVolumeArgs.java
index 37673c4f7a..c5c8f5ca8e 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmVolumeArgs.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmVolumeArgs.java
@@ -44,7 +44,7 @@ import com.google.common.base.Preconditions;
public final class OmVolumeArgs extends WithObjectID
implements CopyObject<OmVolumeArgs>, Auditable {
private static final Codec<OmVolumeArgs> CODEC = new DelegatedCodec<>(
- Proto2Codec.get(VolumeInfo.class),
+ Proto2Codec.get(VolumeInfo.getDefaultInstance()),
OmVolumeArgs::getFromProtobuf,
OmVolumeArgs::getProtobuf);
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
index 2ee5420a4c..24c172ef8f 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
@@ -45,7 +45,7 @@ public class RepeatedOmKeyInfo implements
CopyObject<RepeatedOmKeyInfo> {
private static Codec<RepeatedOmKeyInfo> newCodec(boolean ignorePipeline) {
return new DelegatedCodec<>(
- Proto2Codec.get(RepeatedKeyInfo.class),
+ Proto2Codec.get(RepeatedKeyInfo.getDefaultInstance()),
RepeatedOmKeyInfo::getFromProto,
k -> k.getProto(ignorePipeline, ClientVersion.CURRENT_VERSION));
}
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/S3SecretValue.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/S3SecretValue.java
index 959f83a14f..e97adc0a50 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/S3SecretValue.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/S3SecretValue.java
@@ -20,7 +20,7 @@ package org.apache.hadoop.ozone.om.helpers;
import org.apache.hadoop.hdds.utils.db.Codec;
import org.apache.hadoop.hdds.utils.db.DelegatedCodec;
import org.apache.hadoop.hdds.utils.db.Proto2Codec;
-import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
+import
org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.S3Secret;
import java.util.Objects;
@@ -29,7 +29,7 @@ import java.util.Objects;
*/
public class S3SecretValue {
private static final Codec<S3SecretValue> CODEC = new DelegatedCodec<>(
- Proto2Codec.get(OzoneManagerProtocolProtos.S3Secret.class),
+ Proto2Codec.get(S3Secret.getDefaultInstance()),
S3SecretValue::fromProtobuf,
S3SecretValue::getProtobuf);
@@ -91,13 +91,12 @@ public class S3SecretValue {
this.transactionLogIndex = transactionLogIndex;
}
- public static S3SecretValue fromProtobuf(
- OzoneManagerProtocolProtos.S3Secret s3Secret) {
+ public static S3SecretValue fromProtobuf(S3Secret s3Secret) {
return new S3SecretValue(s3Secret.getKerberosID(),
s3Secret.getAwsSecret());
}
- public OzoneManagerProtocolProtos.S3Secret getProtobuf() {
- return OzoneManagerProtocolProtos.S3Secret.newBuilder()
+ public S3Secret getProtobuf() {
+ return S3Secret.newBuilder()
.setAwsSecret(this.awsSecret)
.setKerberosID(this.kerberosID)
.build();
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java
index a9065c03fe..8ee9c6ee1f 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java
@@ -55,7 +55,8 @@ import static
org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX;
*/
public final class SnapshotInfo implements Auditable, CopyObject<SnapshotInfo>
{
private static final Codec<SnapshotInfo> CODEC = new DelegatedCodec<>(
- Proto2Codec.get(OzoneManagerProtocolProtos.SnapshotInfo.class),
+ Proto2Codec.get(
+ OzoneManagerProtocolProtos.SnapshotInfo.getDefaultInstance()),
SnapshotInfo::getFromProtobuf,
SnapshotInfo::getProtobuf);
diff --git
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/snapshot/SnapshotDiffReportOzone.java
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/snapshot/SnapshotDiffReportOzone.java
index c04c09b219..aec0c6d12c 100644
---
a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/snapshot/SnapshotDiffReportOzone.java
+++
b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/snapshot/SnapshotDiffReportOzone.java
@@ -44,7 +44,7 @@ public class SnapshotDiffReportOzone
extends org.apache.hadoop.hdfs.protocol.SnapshotDiffReport {
private static final Codec<DiffReportEntry> CODEC = new DelegatedCodec<>(
- Proto2Codec.get(DiffReportEntryProto.class),
+ Proto2Codec.get(DiffReportEntryProto.getDefaultInstance()),
SnapshotDiffReportOzone::fromProtobufDiffReportEntry,
SnapshotDiffReportOzone::toProtobufDiffReportEntry,
DelegatedCodec.CopyType.SHALLOW);
diff --git
a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/helpers/OmPrefixInfo.java
b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/helpers/OmPrefixInfo.java
index cc8c36ed8b..4ec5b95270 100644
---
a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/helpers/OmPrefixInfo.java
+++
b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/helpers/OmPrefixInfo.java
@@ -40,7 +40,7 @@ import java.util.stream.Collectors;
// TODO: support Auditable interface
public final class OmPrefixInfo extends WithObjectID {
private static final Codec<OmPrefixInfo> CODEC = new DelegatedCodec<>(
- Proto2Codec.get(PersistedPrefixInfo.class),
+ Proto2Codec.get(PersistedPrefixInfo.getDefaultInstance()),
OmPrefixInfo::getFromProtobuf,
OmPrefixInfo::getProtobuf);
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
index 42179294e5..7a71011521 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
@@ -634,7 +634,7 @@ public class OmMetadataManagerImpl implements
OMMetadataManager,
.addCodec(RepeatedOmKeyInfo.class, RepeatedOmKeyInfo.getCodec(true))
.addCodec(OmBucketInfo.class, OmBucketInfo.getCodec())
.addCodec(OmVolumeArgs.class, OmVolumeArgs.getCodec())
- .addProto2Codec(PersistedUserVolumeInfo.class)
+ .addProto2Codec(PersistedUserVolumeInfo.getDefaultInstance())
.addCodec(OmMultipartKeyInfo.class, OmMultipartKeyInfo.getCodec())
.addCodec(S3SecretValue.class, S3SecretValue.getCodec())
.addCodec(OmPrefixInfo.class, OmPrefixInfo.getCodec())
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/OMDBDefinition.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/OMDBDefinition.java
index 056e1b015c..de567447ae 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/OMDBDefinition.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/OMDBDefinition.java
@@ -62,13 +62,12 @@ public class OMDBDefinition extends DBDefinition.WithMap {
RepeatedOmKeyInfo.getCodec(true));
public static final DBColumnFamilyDefinition<String, PersistedUserVolumeInfo>
- USER_TABLE =
- new DBColumnFamilyDefinition<>(
- OmMetadataManagerImpl.USER_TABLE,
- String.class,
- StringCodec.get(),
- PersistedUserVolumeInfo.class,
- Proto2Codec.get(PersistedUserVolumeInfo.class));
+ USER_TABLE = new DBColumnFamilyDefinition<>(
+ OmMetadataManagerImpl.USER_TABLE,
+ String.class,
+ StringCodec.get(),
+ PersistedUserVolumeInfo.class,
+ Proto2Codec.get(PersistedUserVolumeInfo.getDefaultInstance()));
public static final DBColumnFamilyDefinition<String, OmVolumeArgs>
VOLUME_TABLE =
diff --git
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ContainerReplicaHistoryList.java
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ContainerReplicaHistoryList.java
index 0640ef46fe..5895d3e133 100644
---
a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ContainerReplicaHistoryList.java
+++
b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/scm/ContainerReplicaHistoryList.java
@@ -36,7 +36,7 @@ import org.apache.hadoop.hdds.utils.db.Proto2Codec;
public class ContainerReplicaHistoryList {
private static final Codec<ContainerReplicaHistoryList> CODEC
= new DelegatedCodec<>(Proto2Codec.get(
- ContainerReplicaHistoryListProto.class),
+ ContainerReplicaHistoryListProto.getDefaultInstance()),
ContainerReplicaHistoryList::fromProto,
ContainerReplicaHistoryList::toProto);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
