apache · adoroszlai · Oct 13, 2024 · Oct 10, 2024
diff --git a/...c/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaOneDBDefinition.java b/...c/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaOneDBDefinition.java
@@ -51,27 +51,21 @@ public class DatanodeSchemaOneDBDefinition
       BLOCK_DATA =
       new DBColumnFamilyDefinition<>(
           StringUtils.bytes2String(DEFAULT_COLUMN_FAMILY),
-          String.class,
           SchemaOneKeyCodec.get(),
-          BlockData.class,
           BlockData.getCodec());
 
   public static final DBColumnFamilyDefinition<String, Long>
         METADATA =
         new DBColumnFamilyDefinition<>(
             StringUtils.bytes2String(DEFAULT_COLUMN_FAMILY),
-            String.class,
             SchemaOneKeyCodec.get(),
-            Long.class,
             LongCodec.get());
 
   public static final DBColumnFamilyDefinition<String, ChunkInfoList>
         DELETED_BLOCKS =
         new DBColumnFamilyDefinition<>(
             StringUtils.bytes2String(DEFAULT_COLUMN_FAMILY),
-            String.class,
             SchemaOneKeyCodec.get(),
-            ChunkInfoList.class,
             SchemaOneChunkInfoListCodec.get());
 
   private static final Map<String, List<DBColumnFamilyDefinition<?, ?>>>

diff --git a/...main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaThreeDBDefinition.java b/...main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaThreeDBDefinition.java
@@ -59,45 +59,35 @@ public class DatanodeSchemaThreeDBDefinition
       BLOCK_DATA =
       new DBColumnFamilyDefinition<>(
           "block_data",
-          String.class,
           FixedLengthStringCodec.get(),
-          BlockData.class,
           BlockData.getCodec());
 
   public static final DBColumnFamilyDefinition<String, Long>
       METADATA =
       new DBColumnFamilyDefinition<>(
           "metadata",
-          String.class,
           FixedLengthStringCodec.get(),
-          Long.class,
           LongCodec.get());
 
   public static final DBColumnFamilyDefinition<String, DeletedBlocksTransaction>
       DELETE_TRANSACTION =
       new DBColumnFamilyDefinition<>(
           "delete_txns",
-          String.class,
           FixedLengthStringCodec.get(),
-          DeletedBlocksTransaction.class,
           Proto2Codec.get(DeletedBlocksTransaction.getDefaultInstance()));
 
   public static final DBColumnFamilyDefinition<String, Long>
       FINALIZE_BLOCKS =
       new DBColumnFamilyDefinition<>(
           "finalize_blocks",
-          String.class,
           FixedLengthStringCodec.get(),
-          Long.class,
           LongCodec.get());
 
   public static final DBColumnFamilyDefinition<String, BlockData>
       LAST_CHUNK_INFO =
       new DBColumnFamilyDefinition<>(
           "last_chunk_info",
-          String.class,
           FixedLengthStringCodec.get(),
-          BlockData.class,
           BlockData.getCodec());
 
   private static String separator = "";

diff --git a/...c/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaTwoDBDefinition.java b/...c/main/java/org/apache/hadoop/ozone/container/metadata/DatanodeSchemaTwoDBDefinition.java
@@ -18,7 +18,6 @@
 package org.apache.hadoop.ozone.container.metadata;
 
 import org.apache.hadoop.hdds.conf.ConfigurationSource;
-import org.apache.hadoop.hdds.protocol.proto.StorageContainerDatanodeProtocolProtos;
 import org.apache.hadoop.hdds.utils.db.DBColumnFamilyDefinition;
 import org.apache.hadoop.hdds.utils.db.DBDefinition;
 import org.apache.hadoop.hdds.utils.db.FixedLengthStringCodec;
@@ -44,45 +43,35 @@ public class DatanodeSchemaTwoDBDefinition
           BLOCK_DATA =
           new DBColumnFamilyDefinition<>(
                   "block_data",
-                  String.class,
                   StringCodec.get(),
-                  BlockData.class,
                   BlockData.getCodec());
 
   public static final DBColumnFamilyDefinition<String, Long>
           METADATA =
           new DBColumnFamilyDefinition<>(
           "metadata",
-          String.class,
           StringCodec.get(),
-          Long.class,
           LongCodec.get());
 
   public static final DBColumnFamilyDefinition<Long, DeletedBlocksTransaction>
       DELETE_TRANSACTION =
       new DBColumnFamilyDefinition<>(
           "delete_txns",
-          Long.class,
           LongCodec.get(),
-          StorageContainerDatanodeProtocolProtos.DeletedBlocksTransaction.class,
           Proto2Codec.get(DeletedBlocksTransaction.getDefaultInstance()));
 
   public static final DBColumnFamilyDefinition<String, Long>
       FINALIZE_BLOCKS =
       new DBColumnFamilyDefinition<>(
           "finalize_blocks",
-          String.class,
           FixedLengthStringCodec.get(),
-          Long.class,
           LongCodec.get());
 
   public static final DBColumnFamilyDefinition<String, BlockData>
       LAST_CHUNK_INFO =
       new DBColumnFamilyDefinition<>(
           "last_chunk_info",
-          String.class,
           FixedLengthStringCodec.get(),
-          BlockData.class,
           BlockData.getCodec());
 
   public DatanodeSchemaTwoDBDefinition(String dbPath,

diff --git a/...dds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBColumnFamilyDefinition.java b/...dds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBColumnFamilyDefinition.java
@@ -54,48 +54,37 @@ public class DBColumnFamilyDefinition<KEY, VALUE> {
 
   private final String tableName;
 
-  private final Class<KEY> keyType;
-
   private final Codec<KEY> keyCodec;
 
-  private final Class<VALUE> valueType;
-
   private final Codec<VALUE> valueCodec;
 
-  private ManagedColumnFamilyOptions cfOptions;
+  private volatile ManagedColumnFamilyOptions cfOptions;
 
-  public DBColumnFamilyDefinition(
-      String tableName,
-      Class<KEY> keyType,
-      Codec<KEY> keyCodec,
-      Class<VALUE> valueType,
-      Codec<VALUE> valueCodec) {
+  public DBColumnFamilyDefinition(String tableName, Codec<KEY> keyCodec, Codec<VALUE> valueCodec) {
     this.tableName = tableName;
-    this.keyType = keyType;
     this.keyCodec = keyCodec;
-    this.valueType = valueType;
     this.valueCodec = valueCodec;
     this.cfOptions = null;
   }
 
   public Table<KEY, VALUE> getTable(DBStore db) throws IOException {
-    return db.getTable(tableName, keyType, valueType);
+    return db.getTable(tableName, getKeyType(), getValueType());
   }
 
   public String getName() {
     return tableName;
   }
 
   public Class<KEY> getKeyType() {
-    return keyType;
+    return keyCodec.getTypeClass();
   }
 
   public Codec<KEY> getKeyCodec() {
     return keyCodec;
   }
 
   public Class<VALUE> getValueType() {
-    return valueType;
+    return valueCodec.getTypeClass();
   }
 
   public Codec<VALUE> getValueCodec() {

diff --git a/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestDBStoreBuilder.java b/hadoop-hdds/framework/src/test/java/org/apache/hadoop/hdds/utils/db/TestDBStoreBuilder.java
@@ -179,7 +179,7 @@ public void builderWithColumnFamilyOptions(@TempDir Path tempDir)
     String sampleTableName = "sampleTable";
     final DBColumnFamilyDefinition<String, Long> sampleTable =
         new DBColumnFamilyDefinition<>(sampleTableName,
-            String.class, StringCodec.get(), Long.class, LongCodec.get());
+            StringCodec.get(), LongCodec.get());
     final DBDefinition sampleDB = new DBDefinition.WithMap(
         DBColumnFamilyDefinition.newUnmodifiableMap(sampleTable)) {
       {
@@ -250,8 +250,8 @@ public void testIfAutoCompactionDisabled(boolean disableAutoCompaction,
 
     String sampleTableName = "sampleTable";
     final DBColumnFamilyDefinition<String, Long> sampleTable =
-        new DBColumnFamilyDefinition<>(sampleTableName, String.class,
-            StringCodec.get(), Long.class, LongCodec.get());
+        new DBColumnFamilyDefinition<>(sampleTableName,
+            StringCodec.get(), LongCodec.get());
     final DBDefinition sampleDB = new DBDefinition.WithMap(
         DBColumnFamilyDefinition.newUnmodifiableMap(sampleTable)) {
       @Override

diff --git a/...op-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMDBDefinition.java b/...op-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/metadata/SCMDBDefinition.java
@@ -53,73 +53,57 @@ protected SCMDBDefinition(Map<String, DBColumnFamilyDefinition<?, ?>> map) {
       DELETED_BLOCKS =
       new DBColumnFamilyDefinition<>(
           "deletedBlocks",
-          Long.class,
           LongCodec.get(),
-          DeletedBlocksTransaction.class,
           Proto2Codec.get(DeletedBlocksTransaction.getDefaultInstance()));
 
   public static final DBColumnFamilyDefinition<BigInteger, X509Certificate>
       VALID_CERTS =
       new DBColumnFamilyDefinition<>(
           "validCerts",
-          BigInteger.class,
           BigIntegerCodec.get(),
-          X509Certificate.class,
           X509CertificateCodec.get());
 
   public static final DBColumnFamilyDefinition<BigInteger, X509Certificate>
       VALID_SCM_CERTS =
       new DBColumnFamilyDefinition<>(
           "validSCMCerts",
-          BigInteger.class,
           BigIntegerCodec.get(),
-          X509Certificate.class,
           X509CertificateCodec.get());
 
   public static final DBColumnFamilyDefinition<PipelineID, Pipeline>
       PIPELINES =
       new DBColumnFamilyDefinition<>(
           "pipelines",
-          PipelineID.class,
           PipelineID.getCodec(),
-          Pipeline.class,
           Pipeline.getCodec());
 
   public static final DBColumnFamilyDefinition<ContainerID, ContainerInfo>
       CONTAINERS =
       new DBColumnFamilyDefinition<>(
           "containers",
-          ContainerID.class,
           ContainerID.getCodec(),
-          ContainerInfo.class,
           ContainerInfo.getCodec());
 
   public static final DBColumnFamilyDefinition<String, TransactionInfo>
       TRANSACTIONINFO =
       new DBColumnFamilyDefinition<>(
           "scmTransactionInfos",
-          String.class,
           StringCodec.get(),
-          TransactionInfo.class,
           TransactionInfo.getCodec());
 
   public static final DBColumnFamilyDefinition<String, Long>
       SEQUENCE_ID =
       new DBColumnFamilyDefinition<>(
           "sequenceId",
-          String.class,
           StringCodec.get(),
-          Long.class,
           LongCodec.get());
 
   public static final DBColumnFamilyDefinition<ContainerID,
       MoveDataNodePair>
       MOVE =
       new DBColumnFamilyDefinition<>(
           "move",
-          ContainerID.class,
           ContainerID.getCodec(),
-          MoveDataNodePair.class,
           MoveDataNodePair.getCodec());
 
   /**
@@ -129,18 +113,14 @@ protected SCMDBDefinition(Map<String, DBColumnFamilyDefinition<?, ?>> map) {
   public static final DBColumnFamilyDefinition<String, String>
       META = new DBColumnFamilyDefinition<>(
           "meta",
-          String.class,
           StringCodec.get(),
-          String.class,
           StringCodec.get());
 
   public static final DBColumnFamilyDefinition<String, ByteString>
       STATEFUL_SERVICE_CONFIG =
       new DBColumnFamilyDefinition<>(
           "statefulServiceConfig",
-          String.class,
           StringCodec.get(),
-          ByteString.class,
           ByteStringCodec.get());
 
   private static final Map<String, DBColumnFamilyDefinition<?, ?>>