Author: mduerig
Date: Mon Jun 8 15:50:40 2015
New Revision: 1684209
URL: http://svn.apache.org/r1684209
Log:
OAK-2967: Merge OAK-2800, OAK-2801, OAK-2692, OAK-2713
Merged r1675319, r1677788, r1677797
Added:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/TarWriterTest.java
- copied, changed from r1677788,
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/TarWriterTest.java
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarWriter.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jun 8 15:50:40 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,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675054-1675055,1675332,1675354,1675357,1675382,1675555,1675566,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676693,1676703,1676725,1677579,1677581,1677609,1677611,1677774,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679235,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235,1682437,1682494,1682855,1682904,1683089,1683213,1683249,1683278,1683323,1683687,1684174-1684175
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,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,1677939,1677991,1678173,1678323,1678758,1678938,1678954,1679144,1679165,1679191,1679235,1680182,1680222,1680232,1680236,1680461,1680633,1680643,1680805-1680806,1680903,1681282,1681767,1681918,1682218,1682235,1682437,1682494,1682855,1682904,1683089,1683213,1683249,1683278,1683323,1683687,1684174-1684175
/jackrabbit/trunk:1345480
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java?rev=1684209&r1=1684208&r2=1684209&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/FileStore.java
Mon Jun 8 15:50:40 2015
@@ -651,7 +651,7 @@ public class FileStore implements Segmen
id.getMostSignificantBits(),
id.getLeastSignificantBits()));
}
- writer.cleanup(ids);
+ writer.collectReferences(ids);
CompactionMap cm = tracker.getCompactionMap();
List<TarReader> list = newArrayListWithCapacity(readers.size());
Modified:
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarWriter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarWriter.java?rev=1684209&r1=1684208&r2=1684209&view=diff
==============================================================================
---
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarWriter.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarWriter.java
Mon Jun 8 15:50:40 2015
@@ -20,7 +20,10 @@ import static com.google.common.base.Cha
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkPositionIndexes;
import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.Lists.newArrayList;
+import static com.google.common.collect.Lists.reverse;
import static com.google.common.collect.Maps.newHashMap;
+import static com.google.common.collect.Maps.newLinkedHashMap;
import static com.google.common.collect.Maps.newTreeMap;
import static com.google.common.collect.Sets.newHashSet;
import static
org.apache.jackrabbit.oak.plugins.segment.Segment.REF_COUNT_OFFSET;
@@ -40,11 +43,10 @@ import java.util.SortedMap;
import java.util.UUID;
import java.util.zip.CRC32;
+import com.google.common.collect.Lists;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Lists;
-
/**
* A writer for tar files. It is also used to read entries while the file is
* still open.
@@ -131,12 +133,17 @@ class TarWriter {
* {@link #containsEntry(long, long)} and {@link #readEntry(long, long)}
* methods to retrieve data from this file while it's still being written,
* and finally by the {@link #close()} method to generate the tar index.
- * Should only be accessed from synchronized code;
+ * The map is ordered in the order that entries have been written.
+ * <p>
+ * Should only be accessed from synchronized code.
*/
- private final Map<UUID, TarEntry> index = newHashMap();
+ private final Map<UUID, TarEntry> index = newLinkedHashMap();
private final Set<UUID> references = newHashSet();
+ /**
+ * Segment graph of the entries that have already been written.
+ */
private final SortedMap<UUID, List<UUID>> graph = newTreeMap();
TarWriter(File file) {
@@ -421,7 +428,7 @@ class TarWriter {
// Checksum for header record
System.arraycopy(
- new byte[] { ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' }, 0,
+ new byte[] {' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '}, 0,
header, 148, 8);
// Type flag
@@ -439,9 +446,25 @@ class TarWriter {
return header;
}
- synchronized void cleanup(Set<UUID> referencedIds) throws IOException {
- referencedIds.removeAll(index.keySet());
- referencedIds.addAll(references);
+ /**
+ * Add all segment ids that are reachable from {@code referencedIds} via
+ * this writer's segment graph and subsequently remove those segment ids
+ * from {@code referencedIds} that are in this {@code TarWriter}. The
+ * latter can't be cleaned up anyway because they are not be present in
+ * any of the readers.
+ *
+ * @param referencedIds
+ * @throws IOException
+ */
+ synchronized void collectReferences(Set<UUID> referencedIds) throws
IOException {
+ for (UUID uuid : reverse(newArrayList(index.keySet()))) {
+ if (referencedIds.remove(uuid)) {
+ List<UUID> refs = graph.get(uuid);
+ if (refs != null) {
+ referencedIds.addAll(refs);
+ }
+ }
+ }
}
//------------------------------------------------------------< Object >--
Copied:
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/TarWriterTest.java
(from r1677788,
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/TarWriterTest.java)
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/TarWriterTest.java?p2=jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/TarWriterTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/TarWriterTest.java&r1=1677788&r2=1684209&rev=1684209&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/TarWriterTest.java
(original)
+++
jackrabbit/oak/branches/1.2/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/segment/file/TarWriterTest.java
Mon Jun 8 15:50:40 2015
@@ -44,7 +44,6 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.segment.SegmentWriter;
import
org.apache.jackrabbit.oak.plugins.segment.file.TarWriterTest.SegmentGraphBuilder.Node;
import org.apache.jackrabbit.oak.plugins.segment.memory.MemoryStore;
-import org.junit.Ignore;
import org.junit.Test;
public class TarWriterTest {
@@ -53,7 +52,6 @@ public class TarWriterTest {
* Regression test for OAK-2800
*/
@Test
- @Ignore("OAK-2800") // FIXME OAK-2800
public void collectReferences() throws IOException {
SegmentGraphBuilder graphBuilder = new SegmentGraphBuilder();
