svn commit: r1524758 - /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarFile.java

[ju...@apache.org]

Author: jukka
Date: Thu Sep 19 14:43:12 2013
New Revision: 1524758

URL: http://svn.apache.org/r1524758
Log:
OAK-1001: SegmentMK: 32bit support for the file backend

Use a concurrent map to avoid having to copy the map over and over again

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

Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarFile.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarFile.java?rev=1524758&r1=1524757&r2=1524758&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarFile.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/segment/file/TarFile.java Thu Sep 19 14:43:12 2013
@@ -18,9 +18,7 @@ package org.apache.jackrabbit.oak.plugin
 
 import static com.google.common.base.Charsets.UTF_8;
 import static com.google.common.base.Preconditions.checkState;
-import static com.google.common.base.Predicates.equalTo;
-import static com.google.common.base.Predicates.not;
-import static com.google.common.collect.Maps.filterKeys;
+import static com.google.common.collect.Maps.newConcurrentMap;
 
 import java.io.File;
 import java.io.IOException;
@@ -28,8 +26,6 @@ import java.nio.ByteBuffer;
 import java.util.Map;
 import java.util.UUID;
 
-import com.google.common.collect.ImmutableMap;
-
 class TarFile {
 
     /** The tar file block size. */
@@ -56,7 +52,7 @@ class TarFile {
 
     private final int maxFileSize;
 
-    private volatile Map<UUID, Location> entries;
+    private final Map<UUID, Location> entries = newConcurrentMap();
 
     TarFile(File file, int maxFileSize, boolean memoryMapping)
             throws IOException {
@@ -70,9 +66,6 @@ class TarFile {
             this.file = new RandomAccess(file);
         }
 
-        ImmutableMap.Builder<UUID, Location> builder = ImmutableMap.builder();
-
-        Location journals = null;
         this.position = 0;
         while (position + BLOCK_SIZE <= len) {
             // read the tar header block
@@ -87,24 +80,14 @@ class TarFile {
             }
 
             try {
-                Location location = new Location(position + BLOCK_SIZE, size);
                 UUID id = UUID.fromString(name);
-                if (FileStore.JOURNALS_UUID.equals(id)) {
-                    journals = location;
-                } else {
-                    builder.put(id, location);
-                }
+                entries.put(id, new Location(position + BLOCK_SIZE, size));
             } catch (IllegalArgumentException e) {
                 throw new IOException("Unexpected tar entry: " + name);
             }
 
             position += (1 + (size + BLOCK_SIZE - 1) / BLOCK_SIZE) * BLOCK_SIZE;
         }
-        if (journals != null) {
-            builder.put(FileStore.JOURNALS_UUID, journals);
-        }
-
-        this.entries = builder.build();
     }
 
     ByteBuffer readEntry(UUID id) throws IOException {
@@ -176,10 +159,7 @@ class TarFile {
         position += BLOCK_SIZE;
 
         file.write(position, b, offset, size);
-        entries = ImmutableMap.<UUID, Location>builder()
-                .putAll(filterKeys(entries, not(equalTo(id))))
-                .put(id, new Location(position, size))
-                .build();
+        entries.put(id, new Location(position, size));
         position += size;
 
         int padding = BLOCK_SIZE - position % BLOCK_SIZE;