svn commit: r1562930 - in /jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document: DocumentNodeStore.java PathRev.java util/StringValue.java

[mreutegg]

Author: mreutegg
Date: Thu Jan 30 19:22:53 2014
New Revision: 1562930

URL: http://svn.apache.org/r1562930
Log:
OAK-825: Unnecessary performance overhead in MongoMK's calculation of keys for 
the nodeCache, nodeChildrenCache

Modified:
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/PathRev.java
    
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/StringValue.java

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java?rev=1562930&r1=1562929&r2=1562930&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
 Thu Jan 30 19:22:53 2014
@@ -1572,7 +1572,8 @@ public final class DocumentNodeStore
 
         @Override
         public int getMemory() {
-            return diff.length() * 2;
+            return 16                               // shallow size
+                    + 40 + diff.length() * 2;       // diff string
         }
 
     }

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/PathRev.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/PathRev.java?rev=1562930&r1=1562929&r2=1562930&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/PathRev.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/PathRev.java
 Thu Jan 30 19:22:53 2014
@@ -42,7 +42,7 @@ final public class PathRev implements Ca
     @Override
     public int getMemory() {
         return 24                           // shallow size
-                + 40 * path.length() * 2    // path
+                + 40 + path.length() * 2    // path
                 + 32;                       // revision
     }
 

Modified: 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/StringValue.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/StringValue.java?rev=1562930&r1=1562929&r2=1562930&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/StringValue.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/StringValue.java
 Thu Jan 30 19:22:53 2014
@@ -37,7 +37,8 @@ final public class StringValue implement
 
     @Override
     public int getMemory() {
-        return 16 * value.length() * 2;
+        return 16                           // shallow size
+                + 40 + value.length() * 2;  // value
     }
 
     @Override