This is an automated email from the ASF dual-hosted git repository.
weichiu 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 d3f232396a HDDS-7748. Rename OMFileRequest.addToOpenFileTable() to
avoid misuse. (#4176)
d3f232396a is described below
commit d3f232396a77edfd9547516c12a338762fbcf934
Author: Tsz-Wo Nicholas Sze <[email protected]>
AuthorDate: Fri Jan 20 04:47:34 2023 +0800
HDDS-7748. Rename OMFileRequest.addToOpenFileTable() to avoid misuse.
(#4176)
---
.../hadoop/ozone/om/request/file/OMFileRequest.java | 15 ++++++++-------
.../S3InitiateMultipartUploadResponseWithFSO.java | 3 ++-
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
index 88ffee1a6e..f7b36f5246 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
@@ -283,10 +283,10 @@ public final class OMFileRequest {
* the directory search result code.
*/
public static class OMPathInfoWithFSO extends OMPathInfo {
- private String leafNodeName;
+ private final String leafNodeName;
+ private final String fileExistsInPath;
private long lastKnownParentId;
private long leafNodeObjectId;
- private String fileExistsInPath;
public OMPathInfoWithFSO(String leafNodeName, long lastKnownParentId,
List missingParents, OMDirectoryResult result,
@@ -335,9 +335,9 @@ public final class OMFileRequest {
* the directory search result code.
*/
public static class OMPathInfo {
- private OMDirectoryResult directoryResult;
- private List<String> missingParents;
- private List<OzoneAcl> acls;
+ private final OMDirectoryResult directoryResult;
+ private final List<String> missingParents;
+ private final List<OzoneAcl> acls;
public OMPathInfo(List missingParents, OMDirectoryResult result,
List<OzoneAcl> aclList) {
@@ -346,7 +346,7 @@ public final class OMFileRequest {
this.acls = aclList;
}
- public List getMissingParents() {
+ public List<String> getMissingParents() {
return missingParents;
}
@@ -567,7 +567,8 @@ public final class OMFileRequest {
* @return multipartFileKey
* @throws IOException DB failure
*/
- public static String addToOpenFileTable(OMMetadataManager omMetadataMgr,
+ public static String addToOpenFileTableForMultipart(
+ OMMetadataManager omMetadataMgr,
BatchOperation batchOp, OmKeyInfo omFileInfo, String uploadID,
long volumeId, long bucketId) throws IOException {
diff --git
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseWithFSO.java
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseWithFSO.java
index a380980dfa..e92a886bae 100644
---
a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseWithFSO.java
+++
b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseWithFSO.java
@@ -101,7 +101,8 @@ public class S3InitiateMultipartUploadResponseWithFSO
extends
bucketKey, omBucketInfo);
}
- OMFileRequest.addToOpenFileTable(omMetadataManager, batchOperation,
+ OMFileRequest.addToOpenFileTableForMultipart(omMetadataManager,
+ batchOperation,
getOmKeyInfo(), getOmMultipartKeyInfo().getUploadID(), volumeId,
bucketId);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
