This is an automated email from the ASF dual-hosted git repository.
peterxcli 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 c477957732f HDDS-15349. Remove the non-ignorePipeline codec from
OmKeyInfo. (#10361)
c477957732f is described below
commit c477957732f7eb5469413886292223ec5ef9d270
Author: Bolin Lin <[email protected]>
AuthorDate: Tue May 26 21:18:29 2026 -0400
HDDS-15349. Remove the non-ignorePipeline codec from OmKeyInfo. (#10361)
---
.../apache/hadoop/ozone/om/helpers/OmKeyInfo.java | 12 +++++-------
.../hadoop/ozone/om/helpers/TestOmKeyInfoCodec.java | 20 +++-----------------
.../apache/hadoop/ozone/om/codec/OMDBDefinition.java | 10 +++++-----
3 files changed, 13 insertions(+), 29 deletions(-)
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 da6c46f9b6c..dcb4b1baafb 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
@@ -59,8 +59,7 @@ public final class OmKeyInfo extends WithParentObjectId
implements CopyObject<OmKeyInfo>, WithTags {
private static final Logger LOG = LoggerFactory.getLogger(OmKeyInfo.class);
- private static final Codec<OmKeyInfo> CODEC_TRUE = newCodec(true);
- private static final Codec<OmKeyInfo> CODEC_FALSE = newCodec(false);
+ private static final Codec<OmKeyInfo> CODEC = newCodec();
/**
* Metadata key flag to indicate whether a deleted key was a committed key.
* The flag is set when a committed key is deleted from AOS but still held in
@@ -131,17 +130,16 @@ private OmKeyInfo(Builder b) {
this.expectedDataGeneration = b.expectedDataGeneration;
}
- private static Codec<OmKeyInfo> newCodec(boolean ignorePipeline) {
+ private static Codec<OmKeyInfo> newCodec() {
return new DelegatedCodec<>(
Proto2Codec.get(KeyInfo.getDefaultInstance()),
OmKeyInfo::getFromProtobuf,
- k -> k.getProtobuf(ignorePipeline, ClientVersion.CURRENT_VERSION),
+ k -> k.getProtobuf(true, ClientVersion.CURRENT_VERSION),
OmKeyInfo.class);
}
- public static Codec<OmKeyInfo> getCodec(boolean ignorePipeline) {
- LOG.debug("OmKeyInfo.getCodec ignorePipeline = {}", ignorePipeline);
- return ignorePipeline ? CODEC_TRUE : CODEC_FALSE;
+ public static Codec<OmKeyInfo> getCodec() {
+ return CODEC;
}
public String getVolumeName() {
diff --git
a/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmKeyInfoCodec.java
b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmKeyInfoCodec.java
index a22f9992a1e..bc568eea837 100644
---
a/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmKeyInfoCodec.java
+++
b/hadoop-ozone/interface-storage/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmKeyInfoCodec.java
@@ -39,7 +39,7 @@
import org.junit.jupiter.api.Test;
/**
- * Test {@link OmKeyInfo#getCodec(boolean)} .
+ * Test {@link OmKeyInfo#getCodec()} .
*/
public class TestOmKeyInfoCodec extends Proto2CodecTestBase<OmKeyInfo> {
private static final String VOLUME = "hadoop";
@@ -51,7 +51,7 @@ public class TestOmKeyInfoCodec extends
Proto2CodecTestBase<OmKeyInfo> {
@Override
public Codec<OmKeyInfo> getCodec() {
- return OmKeyInfo.getCodec(false);
+ return OmKeyInfo.getCodec();
}
private static FileChecksum createEmptyChecksum() {
@@ -96,13 +96,11 @@ private OmKeyInfo getKeyInfo(int chunkNum) {
public void test() throws IOException {
testOmKeyInfoCodecWithoutPipeline(1);
testOmKeyInfoCodecWithoutPipeline(2);
- testOmKeyInfoCodecCompatibility(1);
- testOmKeyInfoCodecCompatibility(2);
}
public void testOmKeyInfoCodecWithoutPipeline(int chunkNum)
throws IOException {
- final Codec<OmKeyInfo> codec = OmKeyInfo.getCodec(true);
+ final Codec<OmKeyInfo> codec = OmKeyInfo.getCodec();
OmKeyInfo originKey = getKeyInfo(chunkNum);
byte[] rawData = codec.toPersistedFormat(originKey);
OmKeyInfo key = codec.fromPersistedFormat(rawData);
@@ -113,16 +111,4 @@ public void testOmKeyInfoCodecWithoutPipeline(int chunkNum)
assertNotNull(key.getFileChecksum());
assertEquals(key.getFileChecksum(), checksum);
}
-
- public void testOmKeyInfoCodecCompatibility(int chunkNum) throws IOException
{
- final Codec<OmKeyInfo> codecWithoutPipeline = OmKeyInfo.getCodec(true);
- final Codec<OmKeyInfo> codecWithPipeline = OmKeyInfo.getCodec(false);
- OmKeyInfo originKey = getKeyInfo(chunkNum);
- byte[] rawData = codecWithPipeline.toPersistedFormat(originKey);
- OmKeyInfo key = codecWithoutPipeline.fromPersistedFormat(rawData);
- System.out.println("Chunk number = " + chunkNum +
- ", Serialized key size with pipeline = " + rawData.length);
- assertNotNull(key.getLatestVersionLocations().getLocationList().get(0)
- .getPipeline());
- }
}
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 323f11926af..e41a7b15445 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
@@ -208,7 +208,7 @@ public final class OMDBDefinition extends
DBDefinition.WithMap {
public static final DBColumnFamilyDefinition<String, OmKeyInfo> KEY_TABLE_DEF
= new DBColumnFamilyDefinition<>(KEY_TABLE,
StringCodec.get(),
- OmKeyInfo.getCodec(true));
+ OmKeyInfo.getCodec());
public static final String DELETED_TABLE = "deletedTable";
/** deletedTable: /volume/bucket/key :- RepeatedKeyInfo. */
@@ -222,7 +222,7 @@ public final class OMDBDefinition extends
DBDefinition.WithMap {
public static final DBColumnFamilyDefinition<String, OmKeyInfo>
OPEN_KEY_TABLE_DEF
= new DBColumnFamilyDefinition<>(OPEN_KEY_TABLE,
StringCodec.get(),
- OmKeyInfo.getCodec(true));
+ OmKeyInfo.getCodec());
public static final String MULTIPART_INFO_TABLE = "multipartInfoTable";
/** multipartInfoTable: /volume/bucket/key/uploadId :- parts. */
@@ -245,14 +245,14 @@ public final class OMDBDefinition extends
DBDefinition.WithMap {
public static final DBColumnFamilyDefinition<String, OmKeyInfo>
FILE_TABLE_DEF
= new DBColumnFamilyDefinition<>(FILE_TABLE,
StringCodec.get(),
- OmKeyInfo.getCodec(true));
+ OmKeyInfo.getCodec());
public static final String OPEN_FILE_TABLE = "openFileTable";
/** openFileTable: /volumeId/bucketId/parentId/fileName/id :- KeyInfo. */
public static final DBColumnFamilyDefinition<String, OmKeyInfo>
OPEN_FILE_TABLE_DEF
= new DBColumnFamilyDefinition<>(OPEN_FILE_TABLE,
StringCodec.get(),
- OmKeyInfo.getCodec(true));
+ OmKeyInfo.getCodec());
public static final String DIRECTORY_TABLE = "directoryTable";
/** directoryTable: /volumeId/bucketId/parentId/dirName :- DirInfo. */
@@ -266,7 +266,7 @@ public final class OMDBDefinition extends
DBDefinition.WithMap {
public static final DBColumnFamilyDefinition<String, OmKeyInfo>
DELETED_DIR_TABLE_DEF
= new DBColumnFamilyDefinition<>(DELETED_DIR_TABLE,
StringCodec.get(),
- OmKeyInfo.getCodec(true));
+ OmKeyInfo.getCodec());
//---------------------------------------------------------------------------
// S3 Multi-Tenancy Tables
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
