svn commit: r1760926 - in /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment: BinaryReferenceConsumers.java BinaryReferences.java http/HttpStore.java memory/MemoryStore.java

[mduerig]

Author: mduerig
Date: Thu Sep 15 12:59:18 2016
New Revision: 1760926

URL: http://svn.apache.org/viewvc?rev=1760926&view=rev
Log:
OAK-4740: TarReader recovery skips generating the index and binary graphs
Rename BinaryReferenceConsumers to BinaryReferences

Added:
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/BinaryReferences.java
      - copied, changed from r1760914, 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/BinaryReferenceConsumers.java
Removed:
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/BinaryReferenceConsumers.java
Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/http/HttpStore.java
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java

Copied: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/BinaryReferences.java
 (from r1760914, 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/BinaryReferenceConsumers.java)
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/BinaryReferences.java?p2=jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/BinaryReferences.java&p1=jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/BinaryReferenceConsumers.java&r1=1760914&r2=1760926&rev=1760926&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/BinaryReferenceConsumers.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/BinaryReferences.java
 Thu Sep 15 12:59:18 2016
@@ -20,9 +20,10 @@ package org.apache.jackrabbit.oak.segmen
 import java.util.UUID;
 
 /**
- * Utility methods to work with {@link BinaryReferenceConsumer} instances.
+ * Utility methods for working with binary references.
  */
-public class BinaryReferenceConsumers {
+public final class BinaryReferences {
+    private BinaryReferences() {}
 
     /**
      * Creates a new instance of {@link BinaryReferenceConsumer} that ignores

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/http/HttpStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/http/HttpStore.java?rev=1760926&r1=1760925&r2=1760926&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/http/HttpStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/http/HttpStore.java
 Thu Sep 15 12:59:18 2016
@@ -36,7 +36,7 @@ import javax.annotation.Nonnull;
 import com.google.common.base.Supplier;
 import com.google.common.io.ByteStreams;
 import org.apache.jackrabbit.oak.segment.BinaryReferenceConsumer;
-import org.apache.jackrabbit.oak.segment.BinaryReferenceConsumers;
+import org.apache.jackrabbit.oak.segment.BinaryReferences;
 import org.apache.jackrabbit.oak.segment.CachingSegmentReader;
 import org.apache.jackrabbit.oak.segment.Revisions;
 import org.apache.jackrabbit.oak.segment.Segment;
@@ -115,7 +115,7 @@ public class HttpStore implements Segmen
 
     @Nonnull
     public BinaryReferenceConsumer getBinaryReferenceConsumer() {
-        return BinaryReferenceConsumers.newDiscardBinaryReferenceConsumer();
+        return BinaryReferences.newDiscardBinaryReferenceConsumer();
     }
 
     @Override

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java?rev=1760926&r1=1760925&r2=1760926&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/memory/MemoryStore.java
 Thu Sep 15 12:59:18 2016
@@ -30,7 +30,7 @@ import javax.annotation.Nonnull;
 import com.google.common.base.Supplier;
 import com.google.common.collect.Maps;
 import org.apache.jackrabbit.oak.segment.BinaryReferenceConsumer;
-import org.apache.jackrabbit.oak.segment.BinaryReferenceConsumers;
+import org.apache.jackrabbit.oak.segment.BinaryReferences;
 import org.apache.jackrabbit.oak.segment.CachingSegmentReader;
 import org.apache.jackrabbit.oak.segment.Revisions;
 import org.apache.jackrabbit.oak.segment.Segment;
@@ -109,7 +109,7 @@ public class MemoryStore implements Segm
 
     @Nonnull
     public BinaryReferenceConsumer getBinaryReferenceConsumer() {
-        return BinaryReferenceConsumers.newDiscardBinaryReferenceConsumer();
+        return BinaryReferences.newDiscardBinaryReferenceConsumer();
     }
 
     @Override