Author: chetanm
Date: Thu Sep 17 04:26:44 2015
New Revision: 1703488
URL: http://svn.apache.org/r1703488
Log:
OAK-3395 - RevisionGC fails for JCR paths having line feed characters
Merging 1702860, 1703382
Added:
jackrabbit/oak/branches/1.2/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/EscapeUtils.java
- copied unchanged from r1703382,
jackrabbit/oak/trunk/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/EscapeUtils.java
jackrabbit/oak/branches/1.2/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/EscapeUtilsTest.java
- copied unchanged from r1703382,
jackrabbit/oak/trunk/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/EscapeUtilsTest.java
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-commons/pom.xml
jackrabbit/oak/branches/1.2/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/ExternalSort.java
jackrabbit/oak/branches/1.2/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/StringSort.java
jackrabbit/oak/branches/1.2/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/StringSortTest.java
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCDeletionTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 17 04:26:44 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820
,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1695050,1695122,1695280,1695299,1695457,1695482,1695507,1695521,1695540,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697
582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701986,1702022,1702272,1702387,1702405,1702423,1702942,1702960,1703212,1703395,1703411,1703428,1703430
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414-1673415,1673436,1673644,1673662-1673664,1673669,1673695,1673713,1673738,1673787,1673791,1674046,1674065,1674075,1674107,1674228,1674780,1674880,1675054-1675055,1675319,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677788,1677797,1677804,1677806,1677939,1677991,1678023,1678095-1678096,1678124,1678171,1678173,1678211,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679232,1679235,1679503,1679958,1679961,1680170,1680172,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680747,1680805-1680806,1680903,1681282,1681767,1681918,1681955,1682042,1682218,1682235,1682437,1682494,1682555,1682855,1682904,1683059,1683089,1683213,1683249,1683259,1683278,1683323,1683687,1683700,1684174-1684175,1684186,1684376,1684442,1684561,1684570,1684601,1684618,1684820
,1684868,1685023,1685075,1685370,1685552,1685589-1685590,1685840,1685964,1685977,1685989,1685999,1686023,1686032,1686097,1686162,1686229,1686234,1686253,1686414,1686780,1686854,1686857,1686971,1687053-1687055,1687175,1687196,1687198,1687220,1687239-1687240,1687301,1687441,1687553,1688089-1688090,1688172,1688179,1688349,1688421,1688436,1688453,1688616,1688622,1688634,1688636,1688817,1689003-1689004,1689008,1689577,1689581,1689623,1689810,1689828,1689831,1689833,1689903,1690017,1690043,1690047,1690057,1690247,1690249,1690634-1690637,1690650,1690669,1690674,1690885,1690941,1691139,1691151,1691159,1691167,1691183,1691188,1691210,1691280,1691307,1691331-1691333,1691345,1691384-1691385,1691401,1691509,1692133-1692134,1692156,1692250,1692274,1692363,1692382,1692478,1692955,1693002,1693030,1693209,1693421,1693525-1693526,1694007,1694393-1694394,1695050,1695122,1695280,1695299,1695457,1695482,1695507,1695521,1695540,1696194,1696242,1696285,1696578,1696759,1696916,1697363,1697373,1697410,1697
582,1697589,1697616,1697672,1700191,1700231,1700397,1700403,1700506,1700571,1700727,1700749,1700769,1700775,1701065,1701619,1701733,1701743,1701750,1701768,1701806,1701810,1701814,1701948,1701955,1701959,1701986,1702022,1702272,1702387,1702405,1702423,1702860,1702942,1702960,1703212,1703382,1703395,1703411,1703428,1703430
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-commons/pom.xml
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-commons/pom.xml?rev=1703488&r1=1703487&r2=1703488&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-commons/pom.xml (original)
+++ jackrabbit/oak/branches/1.2/oak-commons/pom.xml Thu Sep 17 04:26:44 2015
@@ -108,5 +108,12 @@
<artifactId>logback-classic</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.3.2</version>
+ <optional>true</optional>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified:
jackrabbit/oak/branches/1.2/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/ExternalSort.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/ExternalSort.java?rev=1703488&r1=1703487&r2=1703488&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/ExternalSort.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/ExternalSort.java
Thu Sep 17 04:26:44 2015
@@ -201,7 +201,7 @@ public class ExternalSort {
// in bytes
long currentblocksize = 0;
while ((currentblocksize < blocksize)
- && ((line = fbr.readLine()) != null)) {
+ && ((line = readLine(fbr)) != null)) {
// as long as you have enough memory
if (counter < numHeader) {
counter++;
@@ -296,7 +296,7 @@ public class ExternalSort {
for (String r : tmplist) {
// Skip duplicate lines
if (!distinct || !r.equals(lastLine)) {
- fbw.write(r);
+ writeLine(fbw, r);
fbw.newLine();
lastLine = r;
}
@@ -454,7 +454,7 @@ public class ExternalSort {
String r = bfb.pop();
// Skip duplicate lines
if (!distinct || !r.equals(lastLine)) {
- fbw.write(r);
+ writeLine(fbw, r);
fbw.newLine();
lastLine = r;
}
@@ -629,6 +629,14 @@ public class ExternalSort {
}
};
+ static String readLine(BufferedReader br) throws IOException {
+ return EscapeUtils.unescapeLineBreaks(br.readLine());
+ }
+
+ static void writeLine(BufferedWriter wr, String line) throws IOException {
+ wr.write(EscapeUtils.escapeLineBreak(line));
+ }
+
}
class BinaryFileBuffer {
@@ -648,7 +656,7 @@ class BinaryFileBuffer {
private void reload() throws IOException {
try {
- if ((this.cache = this.fbr.readLine()) == null) {
+ if ((this.cache = ExternalSort.readLine(fbr)) == null) {
this.empty = true;
this.cache = null;
} else {
Modified:
jackrabbit/oak/branches/1.2/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/StringSort.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/StringSort.java?rev=1703488&r1=1703487&r2=1703488&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/StringSort.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/StringSort.java
Thu Sep 17 04:26:44 2015
@@ -41,6 +41,9 @@ import org.apache.commons.io.LineIterato
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import static
org.apache.jackrabbit.oak.commons.sort.EscapeUtils.escapeLineBreak;
+import static
org.apache.jackrabbit.oak.commons.sort.EscapeUtils.unescapeLineBreaks;
+
/**
* Utility class to store a list of string and perform sort on that. For small
size
* the list would be maintained in memory. If the size crosses the required
threshold then
@@ -139,7 +142,7 @@ public class StringSort implements Itera
private void flushToFile(List<String> ids) throws IOException {
BufferedWriter w = getPersistentState().getWriter();
for (String id : ids) {
- w.write(id);
+ w.write(escapeLineBreak(id));
w.newLine();
}
ids.clear();
@@ -264,5 +267,10 @@ public class StringSort implements Itera
public CloseableIterator(Reader reader) throws
IllegalArgumentException {
super(reader);
}
+
+ @Override
+ public String next() {
+ return unescapeLineBreaks(super.next());
+ }
}
}
Modified:
jackrabbit/oak/branches/1.2/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/StringSortTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/StringSortTest.java?rev=1703488&r1=1703487&r2=1703488&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/StringSortTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/StringSortTest.java
Thu Sep 17 04:26:44 2015
@@ -32,6 +32,7 @@ import java.util.Set;
import com.google.common.base.Joiner;
import com.google.common.collect.Collections2;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -61,6 +62,42 @@ public class StringSortTest {
addPathsToCollector(paths);
assertTrue(collector.usingFile());
+ assertConstraints(paths);
+
+ collector.close();
+ }
+
+ @Test
+ public void sortWithEntriesHavingLineBreaks() throws Exception{
+ List<String> paths = Lists.newArrayList("/a", "/a/b\nc", "/a/b\rd",
"/a/b\r\ne", "/a/c");
+
+ collector = new StringSort(0, comparator);
+ addPathsToCollector(paths);
+
+ assertTrue(collector.usingFile());
+ assertConstraints(paths);
+
+ collector.close();
+ }
+
+ /**
+ * Test for the case where sorting order should not be affected by escaping
+ *
+ * "aa", "aa\n1", "aa\r2", "aa\\" -> "aa", "aa\n1", "aa\r2", "aa\\"
+ * "aa", "aa\\n1", "aa\\r2", "aa\\\\" -> "aa", "aa\\", "aa\n1", "aa\r2",
+ *
+ * In above case the sorting order for escaped string is different. So
+ * it needs to be ensured that sorting order remain un affected by escaping
+ * @throws Exception
+ */
+ @Test
+ public void sortWithEntriesHavingLineBreaks2() throws Exception{
+ List<String> paths = Lists.newArrayList("/a", "/a/a\nc", "/a/a\rd",
"/a/a\r\ne", "/a/a\\");
+
+ collector = new StringSort(0, comparator);
+ addPathsToCollector(paths);
+
+ assertTrue(collector.usingFile());
assertConstraints(paths);
collector.close();
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCDeletionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCDeletionTest.java?rev=1703488&r1=1703487&r2=1703488&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCDeletionTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGCDeletionTest.java
Thu Sep 17 04:26:44 2015
@@ -43,6 +43,7 @@ import org.apache.jackrabbit.oak.spi.sta
import org.apache.jackrabbit.oak.stats.Clock;
import org.junit.After;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import static java.util.concurrent.Executors.newSingleThreadExecutor;
@@ -164,6 +165,46 @@ public class VersionGCDeletionTest {
}
}
+ @Test
+ public void gcWithPathsHavingNewLine() throws Exception{
+ int noOfDocsToDelete = 200;
+ DocumentStore ts = new MemoryDocumentStore();
+ store = new DocumentMK.Builder()
+ .clock(clock)
+ .setDocumentStore(new MemoryDocumentStore())
+ .setAsyncDelay(0)
+ .getNodeStore();
+
+ //Baseline the clock
+ clock.waitUntil(Revision.getCurrentTimestamp());
+
+ NodeBuilder b1 = store.getRoot().builder();
+ NodeBuilder xb = b1.child("x");
+ for (int i = 0; i < noOfDocsToDelete - 1; i++){
+ xb.child("a"+i).child("b"+i);
+ }
+ xb.child("a-1").child("b\r");
+ store.merge(b1, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ long maxAge = 1; //hours
+ long delta = TimeUnit.MINUTES.toMillis(10);
+
+ //Remove x/y
+ NodeBuilder b2 = store.getRoot().builder();
+ b2.child("x").remove();
+ store.merge(b2, EmptyHook.INSTANCE, CommitInfo.EMPTY);
+
+ store.runBackgroundOperations();
+
+ //3. Check that deleted doc does get collected post maxAge
+ clock.waitUntil(clock.getTime() + HOURS.toMillis(maxAge*2) + delta);
+ VersionGarbageCollector gc = store.getVersionGarbageCollector();
+ gc.setOverflowToDiskThreshold(100);
+
+ VersionGCStats stats = gc.gc(maxAge * 2, HOURS);
+ assertEquals(noOfDocsToDelete * 2 + 1, stats.deletedDocGCCount);
+ }
+
// OAK-2420
@Test
public void queryWhileDocsAreRemoved() throws Exception {
