You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by bh...@apache.org on 2020/12/19 18:07:18 UTC
[ozone] branch HDDS-2939 updated: HDDS-4596. Directory table,
fileTable and openFile Table is missing from the OM DB Definition.
(#1724)
This is an automated email from the ASF dual-hosted git repository.
bharat pushed a commit to branch HDDS-2939
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/HDDS-2939 by this push:
new 17297ec HDDS-4596. Directory table, fileTable and openFile Table is missing from the OM DB Definition. (#1724)
17297ec is described below
commit 17297ecb7dfaa3c48babcef419b967c1af746b6a
Author: Mukul Kumar Singh <ms...@apache.org>
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 1161fd0..3d2b29f 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
@@ -31,6 +31,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;
@@ -150,6 +151,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() {
@@ -166,7 +194,8 @@ public class OMDBDefinition implements DBDefinition {
return new DBColumnFamilyDefinition[] {DELETED_TABLE, USER_TABLE,
VOLUME_TABLE, S3_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: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org