HDFS-16463. Make dirent cross platform compatible #4370
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
GauthamBanasandra
force-pushed
the
dirent-x-platform
branch
from
6492030 to
27b3dc8
Compare
This comment was marked as outdated.
This comment was marked as outdated.
* Reference types aren't allowed in std::variant. Thus, replacing it with the actual type. * Added documentation. * Fixed bug in NextFile() implementation.
* Need to include dirent.h inside the extern "C" block to avoid duplicate delcarations.
* The prototypes need to be under extern "C" in order prevent name mangling.
* Needed to create the root temp folder first.
* Needed to free x_platform_dirent.
* Need to clear the d_name char buffer to avoid invalid subsequent writes.
* Need to return the absolute paths for comparison of ListDirAndFiles.
* Added a USE_X_PLATFORM_DIRENT definition. Which forces the dirent from XPlatform library to be used instead of dirent.h in Linux.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
goiri
reviewed
Jun 6, 2022
...s-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/x-platform/c-api/dirent.cc
Outdated
Show resolved
Hide resolved
...s-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/x-platform/c-api/dirent.cc
Show resolved
Hide resolved
...fs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/x-platform/c-api/dirent.h
Outdated
Show resolved
Hide resolved
* Moved the inclusion of dirent.h on non-Windows platforms to the top for easier understanding of c-api/dirent.h.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
This comment was marked as outdated.
* The method signatures in header files are already enclosed with extern "C" and thus, we don't need to wrap the implementation with extern "C".
This comment was marked as outdated.
This comment was marked as outdated.
goiri
reviewed
Jun 7, 2022
...fs-project/hadoop-hdfs-native-client/src/main/native/libhdfspp/lib/x-platform/c-api/dirent.h
Outdated
Show resolved
Hide resolved
* There were multiple #ifs and it was a bit cumbersome to understand. * Thus, I've simplified it into multiple header files. * core/dirent.h contains the core logic of dirent.h. * extern/dirent.h wraps it in an extern block. * c-api/dirent.h combines the two.
|
🎊 +1 overall
This message was automatically generated. |
goiri
approved these changes
Jun 8, 2022
| extern "C" { | ||
| #endif | ||
|
|
||
| #include "x-platform/c-api/core/dirent.h" |
Member
There was a problem hiding this comment.
At some point it is cleaner to do:
#if defined(WIN32) && defined(__cplusplus)
extern "C" {
#include "x-platform/c-api/core/dirent.h"
}
#else
#include "x-platform/c-api/core/dirent.h"
#endif
Member
Author
There was a problem hiding this comment.
I've filed a JIRA to track this - https://issues.apache.org/jira/browse/HDFS-16630.
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
|
🎊 +1 overall
This message was automatically generated. |
HarshitGupta11
pushed a commit
to HarshitGupta11/hadoop
that referenced
this pull request
Nov 28, 2022
* jnihelper.c in HDFS native client uses dirent.h. This header file isn't available on Windows. * This PR provides a cross platform compatible implementation for dirent under the XPlatform library.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of PR
jnihelper.c in HDFS native client uses dirent.h. This header file isn't available on Windows. Thus, we need to replace this with a cross platform compatible implementation for dirent.
How was this patch tested?
In progress.
For code changes:
LICENSE,LICENSE-binary,NOTICE-binaryfiles?