Author: amitj
Date: Tue Nov 8 10:19:08 2016
New Revision: 1768657
URL: http://svn.apache.org/viewvc?rev=1768657&view=rev
Log:
OAK-5078: Improper handling of relative paths in
OakFileDataStore#getAllIdentifiers
Merged r1768637 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 Tue Nov 8 10:19:08 2016
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457
,1750462,1750465,1750495,1750626,1750809,1750886,1751410,1751445-1751446,1751478,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1760340,1760373,1760387,1760661-1760662,1761412,1761444,1761571,1761762,1761787,1761876,1762453,1762612,1762632,1762635,1763347,1763355-1763356,1763378,1763465,1763735,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766423,1766496,1766519,1766554,1766644,1767265,1768446
+/jackrabbit/oak/trunk:1733615,1733875,1733913,1733929,1734230,1734254,1734279,1734941,1735052,1735081,1735109,1735141,1735267,1735405,1735484,1735549,1735564,1735588,1735622,1735638,1735919,1735983,1736176,1737309-1737310,1737334,1737349,1737998,1738004,1738136,1738138,1738207,1738234,1738252,1738775,1738795,1738833,1738950,1738957,1738963,1739712,1739760,1739867,1739894,1739959-1739960,1740114,1740116,1740250,1740333,1740349,1740360,1740625-1740626,1740774,1740837,1740879,1740971,1741016,1741032,1741339,1741343,1742077,1742117,1742125,1742363,1742520,1742888,1742916,1743097,1743172,1743343,1743674,1744265,1744292,1744589,1744670,1744672,1744959,1745038,1745127,1745197,1745336,1745368,1746086,1746117,1746342,1746345,1746408,1746696,1746981,1747198,1747200,1747341-1747342,1747380,1747387,1747406,1747492,1747512,1747654,1748505,1748553,1748722,1748870,1749275,1749350,1749424,1749443,1749464,1749475,1749645,1749662,1749815,1749872,1749875,1749899,1750052,1750076-1750077,1750287,1750457
,1750462,1750465,1750495,1750626,1750809,1750886,1751410,1751445-1751446,1751478,1751753,1751755,1751871,1752198,1752202,1752259,1752273-1752274,1752283,1752292,1752438,1752447-1752448,1752508,1752596,1752616,1752659,1752672,1753262,1753331-1753332,1753335-1753336,1753355,1753444,1754117,1754239,1755157,1755191,1756520,1756580,1757119,1757166,1758213,1758713,1759433,1760340,1760373,1760387,1760661-1760662,1761412,1761444,1761571,1761762,1761787,1761876,1762453,1762612,1762632,1762635,1763347,1763355-1763356,1763378,1763465,1763735,1764678,1764705,1764814,1764898,1765817,1765983,1766071,1766423,1766496,1766519,1766554,1766644,1767265,1768446,1768637
/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=1768657&r1=1768656&r2=1768657&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
Tue Nov 8 10:19:08 2016
@@ -69,13 +69,13 @@ public class OakFileDataStore extends Fi
@Override
public Iterator<DataIdentifier> getAllIdentifiers() {
- final String path = normalizeNoEndSeparator(getPath());
- return Files.fileTreeTraverser().postOrderTraversal(new
File(getPath()))
+ final String path = normalizeNoEndSeparator(new
File(getPath()).getAbsolutePath());
+ return Files.fileTreeTraverser().postOrderTraversal(new File(path))
.filter(new Predicate<File>() {
@Override
public boolean apply(File input) {
return input.isFile() &&
-
!normalizeNoEndSeparator(input.getParent()).equals(path);
+ !input.getParent().equals(path);
}
})
.transform(new Function<File, DataIdentifier>() {
@@ -232,14 +232,14 @@ public class OakFileDataStore extends Fi
@Override
public Iterator<DataRecord> getAllRecords() {
- final String path = normalizeNoEndSeparator(getPath());
+ final String path = normalizeNoEndSeparator(new
File(getPath()).getAbsolutePath());
final OakFileDataStore store = this;
- return Files.fileTreeTraverser().postOrderTraversal(new
File(getPath()))
+ return Files.fileTreeTraverser().postOrderTraversal(new File(path))
.filter(new Predicate<File>() {
@Override
public boolean apply(File input) {
return input.isFile() &&
-
!normalizeNoEndSeparator(input.getParent()).equals(path);
+ !input.getParent().equals(path);
}
})
.transform(new Function<File, DataRecord>() {
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=1768657&r1=1768656&r2=1768657&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
Tue Nov 8 10:19:08 2016
@@ -30,6 +30,7 @@ import com.google.common.base.Function;
import com.google.common.collect.Iterators;
import com.google.common.collect.Sets;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
import org.apache.jackrabbit.core.data.DataIdentifier;
import org.apache.jackrabbit.core.data.FileDataStore;
import org.junit.Test;
@@ -40,15 +41,32 @@ import static org.junit.Assert.assertTru
public class OakFileDataStoreTest {
@Test
+ public void testGetAllIdentifiersRelative1() throws Exception {
+ File f = new File("./target/oak-fds-test1");
+ testGetAllIdentifiers(f.getAbsolutePath(), f.getPath());
+ }
+
+ @Test
+ public void testGetAllIdentifiersRelative2() throws Exception {
+ File f = new File("./target", "/fds/../oak-fds-test2");
+ testGetAllIdentifiers(FilenameUtils.normalize(f.getAbsolutePath()),
f.getPath());
+ }
+
+ @Test
public void testGetAllIdentifiers() throws Exception {
- File testDir = new File("./target", "oak-fds-test");
+ File f = new File("./target", "oak-fds-test3");
+ testGetAllIdentifiers(f.getAbsolutePath(), f.getPath());
+ }
+
+ private void testGetAllIdentifiers(String path, String unnormalizedPath)
throws Exception {
+ File testDir = new File(path);
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());
+ fds.setPath(unnormalizedPath);
fds.init(null);
Iterator<DataIdentifier> dis = fds.getAllIdentifiers();
