Merge pull request #93 from sreekanth-r/hidden-files
Ignoring Hidden Files in partition files List
diff --git a/grill-server/src/main/java/com/inmobi/grill/server/stats/store/log/StatisticsLogFileScannerTask.java b/grill-server/src/main/java/com/inmobi/grill/server/stats/store/log/StatisticsLogFileScannerTask.java
index 43f0da6..2805542 100644
--- a/grill-server/src/main/java/com/inmobi/grill/server/stats/store/log/StatisticsLogFileScannerTask.java
+++ b/grill-server/src/main/java/com/inmobi/grill/server/stats/store/log/StatisticsLogFileScannerTask.java
@@ -86,7 +86,8 @@
return parent.listFiles(new FilenameFilter() {
@Override
public boolean accept(File file, String name) {
- return !name.equals(fileNamePattern)
+ return !new File(name).isHidden()
+ &&!name.equals(fileNamePattern)
&& name.contains(fileNamePattern);
}
});
diff --git a/grill-server/src/test/java/com/inmobi/grill/server/stats/TestStatisticsLogFileScannerTask.java b/grill-server/src/test/java/com/inmobi/grill/server/stats/TestStatisticsLogFileScannerTask.java
index 9dbdb93..95d15f4 100644
--- a/grill-server/src/test/java/com/inmobi/grill/server/stats/TestStatisticsLogFileScannerTask.java
+++ b/grill-server/src/test/java/com/inmobi/grill/server/stats/TestStatisticsLogFileScannerTask.java
@@ -19,7 +19,6 @@
* #L%
*/
-import com.google.common.eventbus.Subscribe;
import com.inmobi.grill.server.api.events.GrillEventService;
import com.inmobi.grill.server.stats.store.log.PartitionEvent;
import com.inmobi.grill.server.stats.store.log.StatisticsLogFileScannerTask;
@@ -34,7 +33,6 @@
import org.testng.annotations.Test;
import java.io.File;
-import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -42,15 +40,19 @@
private File f;
+ private File hidden;
@BeforeMethod
public void createTestLogFile() throws Exception {
f = new File("/tmp/test.log.2014-08-05-11-28");
+ hidden = new File("/tmp/.test.log.2014-08-05-11-28.swp");
+ hidden.createNewFile();
f.createNewFile();
}
@AfterMethod
public void deleteTestFile() throws Exception {
f.delete();
+ hidden.delete();
}
@@ -84,6 +86,7 @@
PartitionEvent event = events.get(0);
Assert.assertEquals(event.getEventName(),
TestStatisticsLogFileScannerTask.class.getSimpleName());
+ Assert.assertEquals(event.getPartMap().size(), 1);
Assert.assertTrue(event.getPartMap().containsKey("2014-08-05-11-28"));
Assert.assertEquals(event.getPartMap().get("2014-08-05-11-28"),
f.getAbsolutePath());
