svn commit: r1727936 - /jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/tooling/ConsistencyChecker.java

[al...@apache.org]

Author: alexparvulescu
Date: Mon Feb  1 13:51:27 2016
New Revision: 1727936

URL: http://svn.apache.org/viewvc?rev=1727936&view=rev
Log:
OAK-3811 Provide option to pass external data store to oak-run check
 - added external binary check

Modified:
    jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/tooling/ConsistencyChecker.java

Modified: jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/tooling/ConsistencyChecker.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/tooling/ConsistencyChecker.java?rev=1727936&r1=1727935&r2=1727936&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/tooling/ConsistencyChecker.java (original)
+++ jackrabbit/oak/trunk/oak-segment/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/tooling/ConsistencyChecker.java Mon Feb  1 13:51:27 2016
@@ -37,6 +37,7 @@ import java.util.Set;
 import org.apache.jackrabbit.oak.api.Blob;
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.plugins.segment.SegmentBlob;
 import org.apache.jackrabbit.oak.plugins.segment.SegmentNodeStore;
 import org.apache.jackrabbit.oak.plugins.segment.file.FileStore.ReadOnlyStore;
 import org.apache.jackrabbit.oak.plugins.segment.file.JournalReader;
@@ -222,7 +223,7 @@ public class ConsistencyChecker {
         if (length < 0) {
             length = Long.MAX_VALUE;
         }
-        if (length > 0) {
+        if (length > 0 && !isExternal(blob)) {
             InputStream s = blob.getNewStream();
             try {
                 byte[] buffer = new byte[8192];
@@ -236,6 +237,13 @@ public class ConsistencyChecker {
         }
     }
 
+    private static boolean isExternal(Blob b) {
+        if (b instanceof SegmentBlob) {
+            return ((SegmentBlob) b).isExternal();
+        }
+        return false;
+    }
+
     public void close() {
         store.close();
     }