Skip to content

HDDS-7748. Rename OMFileRequest.addToOpenFileTable() to avoid misuse. #4176

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jojochuang merged 1 commit into from
Jan 19, 2023
Merged

HDDS-7748. Rename OMFileRequest.addToOpenFileTable() to avoid misuse. #4176

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions ...ne/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,10 +283,10 @@ public static OMPathInfoWithFSO verifyDirectoryKeysInPath(
* 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,
Expand Down Expand Up @@ -335,9 +335,9 @@ public String getFileExistsInPath() {
* 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) {
Expand All @@ -346,7 +346,7 @@ public OMPathInfo(List missingParents, OMDirectoryResult result,
this.acls = aclList;
}

public List getMissingParents() {
public List<String> getMissingParents() {
return missingParents;
}

Expand Down Expand Up @@ -567,7 +567,8 @@ public static void addToOpenFileTable(OMMetadataManager omMetadataMgr,
* @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 {

Expand Down
3 changes: 2 additions & 1 deletion ...pache/hadoop/ozone/om/response/s3/multipart/S3InitiateMultipartUploadResponseWithFSO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ public void addToDBBatch(OMMetadataManager omMetadataManager,
bucketKey, omBucketInfo);
}

OMFileRequest.addToOpenFileTable(omMetadataManager, batchOperation,
OMFileRequest.addToOpenFileTableForMultipart(omMetadataManager,
batchOperation,
getOmKeyInfo(), getOmMultipartKeyInfo().getUploadID(), volumeId,
bucketId);

Expand Down