Updated Branches: refs/heads/trunk ed91e4e3f -> c6c86aa65
GIRAPH-761: GiraphFileInputFormat ignores hidden file filter in folders (Manuel Lagang via aching) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/c6c86aa6 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/c6c86aa6 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/c6c86aa6 Branch: refs/heads/trunk Commit: c6c86aa6520cbad5ce1c19782a92dc97bd910c1e Parents: ed91e4e Author: Avery Ching <[email protected]> Authored: Mon Sep 30 13:39:28 2013 -0700 Committer: Avery Ching <[email protected]> Committed: Mon Sep 30 13:40:26 2013 -0700 ---------------------------------------------------------------------- CHANGELOG | 3 +++ .../java/org/apache/giraph/io/formats/GiraphFileInputFormat.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/c6c86aa6/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index bb2033b..f960d09 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-761: GiraphFileInputFormat ignores hidden file filter in + folders (Manuel Lagang via aching) + GIRAPH-771: Upgrade hive-io to 0.17 (majakabiljo) GIRAPH-756: Provide a way to halt running application (majakabiljo) http://git-wip-us.apache.org/repos/asf/giraph/blob/c6c86aa6/giraph-core/src/main/java/org/apache/giraph/io/formats/GiraphFileInputFormat.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/io/formats/GiraphFileInputFormat.java b/giraph-core/src/main/java/org/apache/giraph/io/formats/GiraphFileInputFormat.java index 7474aa3..157a0c8 100644 --- a/giraph-core/src/main/java/org/apache/giraph/io/formats/GiraphFileInputFormat.java +++ b/giraph-core/src/main/java/org/apache/giraph/io/formats/GiraphFileInputFormat.java @@ -252,7 +252,8 @@ end[HADOOP_NON_SECURE]*/ } else { for (FileStatus globStat: matches) { if (globStat.isDir()) { - Collections.addAll(result, fs.listStatus(globStat.getPath())); + Collections.addAll(result, fs.listStatus(globStat.getPath(), + inputFilter)); } else { result.add(globStat); }
