This is an automated email from the ASF dual-hosted git repository.
swamirishi 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 422df39669 HDDS-8649. Remove duplicate helper methods
getDBMultipartOpenKey() (#6057)
422df39669 is described below
commit 422df39669f424d62e98de061be6b90190907e91
Author: Chandrakant Vankayalapati <[email protected]>
AuthorDate: Tue Jan 23 12:53:57 2024 -0800
HDDS-8649. Remove duplicate helper methods getDBMultipartOpenKey() (#6057)
---
.../rpc/TestOzoneClientMultipartUploadWithFSO.java | 33 ++--------------------
.../apache/hadoop/ozone/om/OMMetadataManager.java | 13 +++++++++
.../org/apache/hadoop/ozone/om/KeyManagerImpl.java | 11 ++------
.../hadoop/ozone/om/OmMetadataManagerImpl.java | 15 ++++++++++
.../om/request/key/OMKeyCreateRequestWithFSO.java | 14 +--------
.../S3MultipartUploadCompleteRequestWithFSO.java | 17 +----------
.../om/request/util/OMMultipartUploadUtils.java | 32 ++-------------------
7 files changed, 36 insertions(+), 99 deletions(-)
diff --git
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadWithFSO.java
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadWithFSO.java
index 4867be4906..2de5e83a4e 100644
---
a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadWithFSO.java
+++
b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/TestOzoneClientMultipartUploadWithFSO.java
@@ -58,7 +58,6 @@ import static
org.apache.hadoop.hdds.client.ReplicationFactor.THREE;
import org.apache.hadoop.ozone.om.helpers.QuotaUtil;
import org.apache.hadoop.ozone.om.request.OMRequestTestUtils;
-import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeEach;
@@ -568,8 +567,7 @@ public class TestOzoneClientMultipartUploadWithFSO {
bucket.abortMultipartUpload(keyName, uploadID);
String multipartOpenKey =
- getMultipartOpenKey(uploadID, volumeName, bucketName, keyName,
- metadataMgr);
+ metadataMgr.getMultipartKeyFSO(volumeName, bucketName, keyName,
uploadID);
OmKeyInfo omKeyInfo =
metadataMgr.getOpenKeyTable(bucketLayout).get(multipartOpenKey);
OmMultipartKeyInfo omMultipartKeyInfo =
@@ -853,8 +851,7 @@ public class TestOzoneClientMultipartUploadWithFSO {
ozoneManager.getMetadataManager().getBucketTable().get(buckKey);
BucketLayout bucketLayout = buckInfo.getBucketLayout();
String multipartOpenKey =
- getMultipartOpenKey(uploadID, volumeName, bucketName, keyName,
- metadataMgr);
+ metadataMgr.getMultipartKeyFSO(volumeName, bucketName, keyName,
uploadID);
String multipartKey = metadataMgr.getMultipartKey(volumeName, bucketName,
keyName, uploadID);
@@ -881,32 +878,6 @@ public class TestOzoneClientMultipartUploadWithFSO {
return multipartKey;
}
- private String getMultipartOpenKey(String multipartUploadID,
- String volName, String buckName, String
kName,
- OMMetadataManager omMetadataManager)
throws IOException {
-
- String fileName = OzoneFSUtils.getFileName(kName);
- final long volumeId = omMetadataManager.getVolumeId(volName);
- final long bucketId = omMetadataManager.getBucketId(volName,
- buckName);
- long parentID = getParentID(volName, buckName, kName,
- omMetadataManager);
-
- String multipartKey = omMetadataManager.getMultipartKey(volumeId, bucketId,
- parentID, fileName, multipartUploadID);
-
- return multipartKey;
- }
-
- private long getParentID(String volName, String buckName,
- String kName, OMMetadataManager omMetadataManager)
throws IOException {
- final long volumeId = omMetadataManager.getVolumeId(volName);
- final long bucketId = omMetadataManager.getBucketId(volName,
- buckName);
- return OMFileRequest.getParentID(volumeId, bucketId,
- kName, omMetadataManager);
- }
-
private String initiateMultipartUpload(OzoneBucket oBucket, String kName,
ReplicationType replicationType,
ReplicationFactor replicationFactor)
throws IOException {
diff --git
a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
index 68c5cf758e..9651c16175 100644
---
a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
+++
b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
@@ -391,6 +391,19 @@ public interface OMMetadataManager extends
DBStoreHAManager {
String getMultipartKey(String volume, String bucket, String key, String
uploadId);
+ /**
+ * Returns the DB key name of a multipart upload key in OM metadata store
+ * for FSO-enabled buckets.
+ *
+ * @param volume - volume name
+ * @param bucket - bucket name
+ * @param key - key name
+ * @param uploadId - the upload id for this key
+ * @return bytes of DB key.
+ */
+ String getMultipartKeyFSO(String volume, String bucket, String key, String
+ uploadId) throws IOException;
+
/**
* Gets the multipart info table which holds the information about
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
index cac2aa53f6..18cfa8010c 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
@@ -806,8 +806,8 @@ public class KeyManagerImpl implements KeyManager {
//if there are no parts, use the replicationType from the open key.
if (isBucketFSOptimized(volumeName, bucketName)) {
multipartKey =
- getMultipartOpenKeyFSO(volumeName, bucketName, keyName,
- uploadID);
+ OMMultipartUploadUtils.getMultipartOpenKey(volumeName,
bucketName, keyName, uploadID,
+ metadataManager,
BucketLayout.FILE_SYSTEM_OPTIMIZED);
}
OmKeyInfo omKeyInfo =
metadataManager.getOpenKeyTable(bucketLayout)
@@ -877,13 +877,6 @@ public class KeyManagerImpl implements KeyManager {
return partName;
}
- private String getMultipartOpenKeyFSO(String volumeName, String bucketName,
- String keyName, String uploadID) throws IOException {
- OMMetadataManager metaMgr = metadataManager;
- return OMMultipartUploadUtils.getMultipartOpenKeyFSO(
- volumeName, bucketName, keyName, uploadID, metaMgr);
- }
-
/**
* Returns list of ACLs for given Ozone object.
*
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 1f8c3ba3cd..c3ed18d254 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
@@ -86,6 +86,7 @@ import org.apache.hadoop.ozone.om.lock.OmReadOnlyLock;
import org.apache.hadoop.ozone.om.lock.OzoneManagerLock;
import org.apache.hadoop.hdds.utils.TransactionInfo;
import
org.apache.hadoop.ozone.om.protocolPB.OzoneManagerProtocolClientSideTranslatorPB;
+import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
import org.apache.hadoop.ozone.om.request.util.OMMultipartUploadUtils;
import org.apache.hadoop.ozone.om.snapshot.ReferenceCounted;
import org.apache.hadoop.ozone.om.snapshot.SnapshotCache;
@@ -863,6 +864,20 @@ public class OmMetadataManagerImpl implements
OMMetadataManager,
return OmMultipartUpload.getDbKey(volume, bucket, key, uploadId);
}
+ @Override
+ public String getMultipartKeyFSO(String volume, String bucket, String key,
String uploadId) throws IOException {
+ final long volumeId = getVolumeId(volume);
+ final long bucketId = getBucketId(volume,
+ bucket);
+ long parentId =
+ OMFileRequest.getParentID(volumeId, bucketId, key, this);
+
+ String fileName = OzoneFSUtils.getFileName(key);
+
+ return getMultipartKey(volumeId, bucketId, parentId,
+ fileName, uploadId);
+ }
+
/**
* Returns the OzoneManagerLock used on Metadata DB.
*
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
index 65a485305d..0dec9fa459 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
@@ -29,7 +29,6 @@ import org.apache.hadoop.ozone.om.exceptions.OMException;
import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
-import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
import org.apache.hadoop.ozone.om.request.file.OMDirectoryCreateRequestWithFSO;
@@ -54,7 +53,6 @@ import static
org.apache.hadoop.ozone.om.exceptions.OMException.ResultCodes.NOT_
import static
org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_LOCK;
import static
org.apache.hadoop.ozone.om.request.file.OMFileRequest.OMDirectoryResult.DIRECTORY_EXISTS;
import static
org.apache.hadoop.ozone.om.request.file.OMFileRequest.OMDirectoryResult.FILE_EXISTS_IN_GIVENPATH;
-import static
org.apache.hadoop.ozone.om.request.file.OMFileRequest.getParentId;
/**
* Handles CreateKey request layout version1.
@@ -253,16 +251,6 @@ public class OMKeyCreateRequestWithFSO extends
OMKeyCreateRequest {
String keyName, String uploadID,
OMMetadataManager omMetadataManager)
throws IOException {
-
- final long volumeId = omMetadataManager.getVolumeId(volumeName);
- final long bucketId = omMetadataManager.getBucketId(volumeName,
- bucketName);
- long parentId =
- getParentId(omMetadataManager, volumeName, bucketName, keyName);
-
- String fileName = OzoneFSUtils.getFileName(keyName);
-
- return omMetadataManager.getMultipartKey(volumeId, bucketId, parentId,
- fileName, uploadID);
+ return omMetadataManager.getMultipartKeyFSO(volumeName, bucketName,
keyName, uploadID);
}
}
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestWithFSO.java
index 35867bb84e..c224786b10 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/s3/multipart/S3MultipartUploadCompleteRequestWithFSO.java
@@ -130,22 +130,7 @@ public class S3MultipartUploadCompleteRequestWithFSO
protected String getDBMultipartOpenKey(String volumeName, String bucketName,
String keyName, String uploadID, OMMetadataManager omMetadataManager)
throws IOException {
-
- long parentId =
- getParentId(omMetadataManager, volumeName, bucketName, keyName);
-
- String fileName = keyName;
- Path filePath = Paths.get(keyName).getFileName();
- if (filePath != null) {
- fileName = filePath.toString();
- }
-
- final long volumeId = omMetadataManager.getVolumeId(volumeName);
- final long bucketId = omMetadataManager.getBucketId(volumeName,
- bucketName);
-
- return omMetadataManager.getMultipartKey(volumeId, bucketId,
- parentId, fileName, uploadID);
+ return omMetadataManager.getMultipartKeyFSO(volumeName, bucketName,
keyName, uploadID);
}
@Override
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/util/OMMultipartUploadUtils.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/util/OMMultipartUploadUtils.java
index 4d8e466fd3..42c6518878 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/util/OMMultipartUploadUtils.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/util/OMMultipartUploadUtils.java
@@ -23,8 +23,6 @@ import org.apache.hadoop.hdds.utils.UniqueId;
import org.apache.hadoop.ozone.om.OMMetadataManager;
import org.apache.hadoop.ozone.om.helpers.BucketLayout;
import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
-import org.apache.hadoop.ozone.om.helpers.OzoneFSUtils;
-import org.apache.hadoop.ozone.om.request.file.OMFileRequest;
import java.io.IOException;
import java.util.UUID;
@@ -93,38 +91,12 @@ public final class OMMultipartUploadUtils {
OMMetadataManager omMetadataManager, BucketLayout bucketLayout)
throws IOException {
if (bucketLayout == BucketLayout.FILE_SYSTEM_OPTIMIZED) {
- return getMultipartOpenKeyFSO(volumeName, bucketName,
- keyName, multipartUploadId, omMetadataManager);
+ return omMetadataManager.getMultipartKeyFSO(volumeName, bucketName,
keyName, multipartUploadId);
} else {
- return getMultipartOpenKey(volumeName, bucketName,
- keyName, multipartUploadId, omMetadataManager);
+ return omMetadataManager.getMultipartKey(volumeName, bucketName,
keyName, multipartUploadId);
}
}
- public static String getMultipartOpenKey(String volumeName,
- String bucketName, String keyName, String multipartUploadId,
- OMMetadataManager omMetadataManager) {
- return omMetadataManager.getMultipartKey(
- volumeName, bucketName, keyName, multipartUploadId);
- }
-
- public static String getMultipartOpenKeyFSO(String volumeName,
- String bucketName, String keyName, String uploadID,
- OMMetadataManager metaMgr) throws IOException {
- String fileName = OzoneFSUtils.getFileName(keyName);
-
- final long volumeId = metaMgr.getVolumeId(volumeName);
- final long bucketId = metaMgr.getBucketId(volumeName, bucketName);
- long parentID =
- OMFileRequest.getParentID(volumeId, bucketId,
- keyName, metaMgr);
-
- String multipartKey = metaMgr.getMultipartKey(volumeId, bucketId,
- parentID, fileName, uploadID);
-
- return multipartKey;
- }
-
/**
* Check whether key's isMultipartKey flag is set.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
