This is an automated email from the ASF dual-hosted git repository. rakeshr pushed a commit to branch HDDS-2939 in repository https://gitbox.apache.org/repos/asf/ozone.git
commit 93cef78f6e0311935f79d801e6775ddebe0c3f8a Author: Mukul Kumar Singh <[email protected]> AuthorDate: Sat Dec 19 23:36:59 2020 +0530 HDDS-4596. Directory table, fileTable and openFile Table is missing from the OM DB Definition. (#1724) --- .../ozone/om/codec/OmDirectoryInfoCodec.java | 0 .../hadoop/ozone/om/codec/OMDBDefinition.java | 31 +++++++++++++++++++++- 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/OmDirectoryInfoCodec.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OmDirectoryInfoCodec.java similarity index 100% rename from hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/codec/OmDirectoryInfoCodec.java rename to hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/codec/OmDirectoryInfoCodec.java 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 b1c5096..d025948 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 @@ -32,6 +32,7 @@ import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo; import org.apache.hadoop.ozone.om.helpers.OmMultipartKeyInfo; import org.apache.hadoop.ozone.om.helpers.OmPrefixInfo; import org.apache.hadoop.ozone.om.helpers.S3SecretValue; +import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo; import org.apache.hadoop.ozone.om.ratis.OMTransactionInfo; import org.apache.hadoop.ozone.security.OzoneTokenIdentifier; @@ -142,6 +143,33 @@ public class OMDBDefinition implements DBDefinition { OMTransactionInfo.class, new OMTransactionInfoCodec()); + public static final DBColumnFamilyDefinition<String, OmDirectoryInfo> + DIRECTORY_TABLE = + new DBColumnFamilyDefinition<>( + OmMetadataManagerImpl.DIRECTORY_TABLE, + String.class, + new StringCodec(), + OmDirectoryInfo.class, + new OmDirectoryInfoCodec()); + + public static final DBColumnFamilyDefinition<String, OmKeyInfo> + FILE_TABLE = + new DBColumnFamilyDefinition<>( + OmMetadataManagerImpl.FILE_TABLE, + String.class, + new StringCodec(), + OmKeyInfo.class, + new OmKeyInfoCodec(true)); + + public static final DBColumnFamilyDefinition<String, OmKeyInfo> + OPEN_FILE_TABLE = + new DBColumnFamilyDefinition<>( + OmMetadataManagerImpl.OPEN_FILE_TABLE, + String.class, + new StringCodec(), + OmKeyInfo.class, + new OmKeyInfoCodec(true)); + @Override public String getName() { return OzoneConsts.OM_DB_NAME; @@ -157,7 +185,8 @@ public class OMDBDefinition implements DBDefinition { return new DBColumnFamilyDefinition[] {DELETED_TABLE, USER_TABLE, VOLUME_TABLE, OPEN_KEY_TABLE, KEY_TABLE, BUCKET_TABLE, MULTIPART_INFO_TABLE, PREFIX_TABLE, DTOKEN_TABLE, - S3_SECRET_TABLE, TRANSACTION_INFO_TABLE}; + S3_SECRET_TABLE, TRANSACTION_INFO_TABLE, DIRECTORY_TABLE, + FILE_TABLE, OPEN_FILE_TABLE}; } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
