Hexiaoqiao commented on code in PR #8411:
URL: https://github.com/apache/hadoop/pull/8411#discussion_r3085314742
##########
hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfs/hdfs.c:
##########
@@ -2759,24 +2763,48 @@ int hdfsRename(hdfsFS fs, const char *oldPath, const
char *newPath)
goto done;
}
- // Rename the file
- // TODO: use rename2 here? (See HDFS-3592)
- jthr = invokeMethod(env, &jVal, INSTANCE, jFS, JC_FILE_SYSTEM,
- "rename", JMETHOD2(JPARAM(HADOOP_PATH), JPARAM
- (HADOOP_PATH), "Z"), jOldPath, jNewPath);
+ jthr = fetchEnumInstance(env, "org/apache/hadoop/fs/Options$Rename",
"NONE",
+ &jRenameOptionsNone);
if (jthr) {
errno = printExceptionAndFree(env, jthr, PRINT_EXC_ALL,
- "hdfsRename(oldPath=%s, newPath=%s): FileSystem#rename",
- oldPath, newPath);
+ "hdfsRename: Options.Rename.NONE");
goto done;
}
- if (!jVal.z) {
- errno = EIO;
+ enumClass = (*env)->GetObjectClass(env, jRenameOptionsNone);
+ if (!enumClass) {
+ errno = printPendingExceptionAndFree(env, PRINT_EXC_ALL,
+ "hdfsRename: GetObjectClass(Options.Rename)");
+ goto done;
+ }
+ jOptsArr = (*env)->NewObjectArray(env, 1, enumClass, NULL);
+ if (!jOptsArr) {
+ errno = printPendingExceptionAndFree(env, PRINT_EXC_ALL,
+ "hdfsRename: NewObjectArray");
+ goto done;
+ }
+ (*env)->SetObjectArrayElement(env, jOptsArr, 0, jRenameOptionsNone);
+ if ((*env)->ExceptionCheck(env)) {
+ errno = printPendingExceptionAndFree(env, PRINT_EXC_ALL,
+ "hdfsRename: SetObjectArrayElement");
+ goto done;
+ }
+
+ jthr = invokeMethod(env, NULL, INSTANCE, jFS, JC_FILE_SYSTEM,
+ "rename", JMETHOD3(JPARAM(HADOOP_PATH), JPARAM(HADOOP_PATH),
+ "[Lorg/apache/hadoop/fs/Options$Rename;", JAVA_VOID),
+ jOldPath, jNewPath, jOptsArr);
+ if (jthr) {
+ errno = printExceptionAndFree(env, jthr, PRINT_EXC_ALL,
+ "hdfsRename(oldPath=%s, newPath=%s): FileSystem#rename(rename2)",
+ oldPath, newPath);
goto done;
}
ret = 0;
done:
+ destroyLocalReference(env, jOldPath);
+ destroyLocalReference(env, jNewPath);
Review Comment:
destroy the reference `jOldPath` and `jNewPath` twice here.
##########
hadoop-hdfs-project/hadoop-hdfs-native-client/src/main/native/libhdfs/hdfs.c:
##########
@@ -2759,24 +2763,48 @@ int hdfsRename(hdfsFS fs, const char *oldPath, const
char *newPath)
goto done;
}
- // Rename the file
- // TODO: use rename2 here? (See HDFS-3592)
- jthr = invokeMethod(env, &jVal, INSTANCE, jFS, JC_FILE_SYSTEM,
- "rename", JMETHOD2(JPARAM(HADOOP_PATH), JPARAM
- (HADOOP_PATH), "Z"), jOldPath, jNewPath);
+ jthr = fetchEnumInstance(env, "org/apache/hadoop/fs/Options$Rename",
"NONE",
+ &jRenameOptionsNone);
if (jthr) {
errno = printExceptionAndFree(env, jthr, PRINT_EXC_ALL,
- "hdfsRename(oldPath=%s, newPath=%s): FileSystem#rename",
- oldPath, newPath);
+ "hdfsRename: Options.Rename.NONE");
Review Comment:
Why did remove path in log message here?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
