You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by mr...@apache.org on 2016/01/14 14:09:44 UTC
svn commit: r1724597 -
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
Author: mreutegg
Date: Thu Jan 14 13:09:44 2016
New Revision: 1724597
URL: http://svn.apache.org/viewvc?rev=1724597&view=rev
Log:
OAK-3470: Utils.estimateMemoryUsage has a NoClassDefFoundError when Mongo is not being used
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java?rev=1724597&r1=1724596&r2=1724597&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java Thu Jan 14 13:09:44 2016
@@ -37,7 +37,6 @@ import javax.annotation.Nullable;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.AbstractIterator;
-import com.mongodb.BasicDBObject;
import org.apache.commons.codec.binary.Hex;
import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -157,17 +156,12 @@ public class Utils {
}
}
- if (map instanceof BasicDBObject) {
- // Based on empirical testing using JAMM
- size += 176;
- size += map.size() * 136;
- } else {
- // overhead for some other kind of map
- // TreeMap (80) + unmodifiable wrapper (32)
- size += 112;
- // 64 bytes per entry
- size += map.size() * 64;
- }
+ // overhead for map object
+ // TreeMap (80) + unmodifiable wrapper (32)
+ size += 112;
+ // 64 bytes per entry
+ size += map.size() * 64;
+
return size;
}