svn commit: r1707675 - in /jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins: blob/CachingBlobStore.java document/mongo/MongoBlobStore.java

[thomasm]

Author: thomasm
Date: Fri Oct  9 09:03:20 2015
New Revision: 1707675

URL: http://svn.apache.org/viewvc?rev=1707675&view=rev
Log:
OAK-3500 Review padding for blobs collection (backport to 1.0)

Modified:
    
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java
    
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java

Modified: 
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java?rev=1707675&r1=1707674&r2=1707675&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java
 (original)
+++ 
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/blob/CachingBlobStore.java
 Fri Oct  9 09:03:20 2015
@@ -26,7 +26,7 @@ import com.google.common.cache.Weigher;
  */
 public abstract class CachingBlobStore extends AbstractBlobStore {
 
-    protected static final long DEFAULT_CACHE_SIZE = 16*1024*1024;
+    protected static final long DEFAULT_CACHE_SIZE = 16 * 1024 * 1024;
 
     protected final CacheLIRS<String, byte[]> cache;
 

Modified: 
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java?rev=1707675&r1=1707674&r2=1707675&view=diff
==============================================================================
--- 
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java
 (original)
+++ 
jackrabbit/oak/branches/1.0/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoBlobStore.java
 Fri Oct  9 09:03:20 2015
@@ -63,9 +63,13 @@ public class MongoBlobStore extends Cach
         this(db, DEFAULT_CACHE_SIZE);
     }
 
-    public MongoBlobStore(DB db, long cacheSize){
+    public MongoBlobStore(DB db, long cacheSize) {
         super(cacheSize);
         this.db = db;
+        // use a block size of 2 MB - 1 KB, because MongoDB rounds up the
+        // space allocated for a record to the next power of two
+        // (there is an overhead per record, let's assume it is 1 KB at most)
+        setBlockSize(2 * 1024 * 1024 - 1024);
         initBlobCollection();
     }