You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by am...@apache.org on 2016/06/08 04:26:24 UTC
svn commit: r1747346 - in /jackrabbit/oak/branches/1.4: ./
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStore.java
oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStoreTest.java
Author: amitj
Date: Wed Jun 8 04:26:23 2016
New Revision: 1747346
URL: http://svn.apache.org/viewvc?rev=1747346&view=rev
Log:
OAK-4432: Ignore files in the root directory of the FileDataStore in #getAllIdentifiers
Merged r1746981 from trunk
Modified:
jackrabbit/oak/branches/1.4/ (props changed)
jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStore.java
jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStoreTest.java
Propchange: jackrabbit/oak/branches/1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 8 04:26:23 2016
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738775,1738795,1738833,1738950,1738957,1738963,1739894,1740116,1740625-1740626,1740971,1741032,1741339,1741343,1742520,1742888,1742916,1743097,1743172,1743343,1744265,1744959,1745038,1745197,1745368,1746086,1746117,1746342,1746696
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738775,1738795,1738833,1738950,1738957,1738963,1739894,1740116,1740625-1740626,1740971,1741032,1741339,1741343,1742520,1742888,1742916,1743097,1743172,1743343,1744265,1744959,1745038,1745197,1745368,1746086,1746117,1746342,1746696,1746981
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStore.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStore.java?rev=1747346&r1=1747345&r2=1747346&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStore.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStore.java Wed Jun 8 04:26:23 2016
@@ -38,7 +38,6 @@ import com.google.common.io.BaseEncoding
import com.google.common.io.Closeables;
import com.google.common.io.Files;
-import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.filefilter.FileFilterUtils;
import org.apache.jackrabbit.core.data.DataIdentifier;
@@ -50,6 +49,8 @@ import org.apache.jackrabbit.oak.plugins
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static org.apache.commons.io.FilenameUtils.normalizeNoEndSeparator;
+
/**
* Oak specific extension of JR2 FileDataStore which enables
* provisioning the signing key via OSGi config
@@ -67,12 +68,13 @@ public class OakFileDataStore extends Fi
@Override
public Iterator<DataIdentifier> getAllIdentifiers() {
- final String path = FilenameUtils.normalizeNoEndSeparator(getPath());
+ final String path = normalizeNoEndSeparator(getPath());
return Files.fileTreeTraverser().postOrderTraversal(new File(getPath()))
.filter(new Predicate<File>() {
@Override
public boolean apply(File input) {
- return input.isFile() && !input.getParent().equals(path);
+ return input.isFile() &&
+ !normalizeNoEndSeparator(input.getParent()).equals(path);
}
})
.transform(new Function<File, DataIdentifier>() {
Modified: jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStoreTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStoreTest.java?rev=1747346&r1=1747345&r2=1747346&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStoreTest.java (original)
+++ jackrabbit/oak/branches/1.4/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/blob/datastore/OakFileDataStoreTest.java Wed Jun 8 04:26:23 2016
@@ -42,9 +42,10 @@ public class OakFileDataStoreTest {
@Test
public void testGetAllIdentifiers() throws Exception {
File testDir = new File("./target", "oak-fds-test");
- FileUtils.touch(new File(testDir, "a"));
- FileUtils.touch(new File(testDir, "b"));
- FileUtils.touch(new File(testDir, "adir/c"));
+ FileUtils.touch(new File(testDir, "ab/cd/ef/abcdef"));
+ FileUtils.touch(new File(testDir, "bc/de/fg/bcdefg"));
+ FileUtils.touch(new File(testDir, "cd/ef/gh/cdefgh"));
+ FileUtils.touch(new File(testDir, "c"));
FileDataStore fds = new OakFileDataStore();
fds.setPath(testDir.getAbsolutePath());
@@ -58,7 +59,7 @@ public class OakFileDataStoreTest {
}
}));
- Set<String> expectedNames = Sets.newHashSet("a","b","c");
+ Set<String> expectedNames = Sets.newHashSet("abcdef","bcdefg","cdefgh");
assertEquals(expectedNames, fileNames);
FileUtils.cleanDirectory(testDir);
}