big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MAPREDUCE-6416. Not all platforms have d_type in struct dirent (Alan Burlison via aw)

Browse Source
This commit is contained in:
Allen Wittenauer 2015-10-27 12:22:08 -07:00
parent ab99d953e4
commit 5c24fe7f91
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -214,6 +214,9 @@ Trunk (Unreleased)
MAPREDUCE-6412. Make hadoop-mapreduce-client Native code -Wall-clean MAPREDUCE-6412. Make hadoop-mapreduce-client Native code -Wall-clean
(Alan Burlison via aw) (Alan Burlison via aw)
MAPREDUCE-6416. Not all platforms have d_type in struct dirent
(Alan Burlison via aw)
BREAKDOWN OF MAPREDUCE-2841 (NATIVE TASK) SUBTASKS BREAKDOWN OF MAPREDUCE-2841 (NATIVE TASK) SUBTASKS
MAPREDUCE-5985. native-task: Fix build on macosx. Contributed by MAPREDUCE-5985. native-task: Fix build on macosx. Contributed by

9
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/main/native/src/lib/FileSystem.cc
View File

@ -167,10 +167,17 @@ class RawFileSystem : public FileSystem {
FileEntry temp; FileEntry temp;
while ((dirp = readdir(dp)) != NULL) { while ((dirp = readdir(dp)) != NULL) {
temp.name = dirp->d_name; temp.name = dirp->d_name;
temp.isDirectory = dirp->d_type & DT_DIR;
if (temp.name == "." || temp.name == "..") { if (temp.name == "." || temp.name == "..") {
continue; continue;
} }
/* Use Linux d_type if available, otherwise stat(2) the path */
#ifdef DT_DIR
temp.isDirectory = dirp->d_type & DT_DIR;
#else
const string p = path + "/" + temp.name;
struct stat sb;
temp.isDirectory = stat(p.c_str(), &sb) == 0 && S_ISDIR(sb.st_mode) == 0;
#endif
status.push_back(temp); status.push_back(temp);
} }
closedir(dp); closedir(dp);