svn commit: r1793526 - /jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java

[mduerig]

Author: mduerig
Date: Tue May  2 15:18:42 2017
New Revision: 1793526

URL: http://svn.apache.org/viewvc?rev=1793526&view=rev
Log:
OAK-5042: Improve caching of segments
Don't cache bulk segments

Modified:
    
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java

Modified: 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java?rev=1793526&r1=1793525&r2=1793526&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/SegmentCache.java
 Tue May  2 15:18:42 2017
@@ -93,6 +93,10 @@ public class SegmentCache {
     throws ExecutionException {
         try {
             Segment segment = loader.call();
+            if (id.isBulkSegmentId()) {
+                return segment;
+            }
+
             cache.put(id, segment);
             id.loaded(segment);
             return segment;
@@ -107,6 +111,10 @@ public class SegmentCache {
      */
     public void putSegment(@Nonnull Segment segment) {
         SegmentId segmentId = segment.getSegmentId();
+        if (segmentId.isBulkSegmentId()) {
+            return;
+        }
+
         cache.put(segmentId, segment);
         segmentId.loaded(segment);
     }