svn commit: r984589 - in /lucene/dev/trunk/solr: CHANGES.txt src/java/org/apache/solr/search/SolrFieldCacheMBean.java

[yo...@apache.org]

Author: yonik
Date: Wed Aug 11 21:33:28 2010
New Revision: 984589

URL: http://svn.apache.org/viewvc?rev=984589&view=rev
Log:
SOLR-2036: don't automatically use ram estimator from stats page

Modified:
    lucene/dev/trunk/solr/CHANGES.txt
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/SolrFieldCacheMBean.java

Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=984589&r1=984588&r2=984589&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Wed Aug 11 21:33:28 2010
@@ -400,6 +400,9 @@ Bug Fixes
 * SOLR-2008: avoid possible RejectedExecutionException w/autoCommit
   by making SolreCore close the UpdateHandler before closing the
   SearchExecutor.  (NarasimhaRaju, hossman)
+
+* SOLR-2036: Avoid expensive fieldCache ram estimation for the
+  admin stats page. (yonik)
   
 
 Other Changes

Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/search/SolrFieldCacheMBean.java?rev=984589&r1=984588&r2=984589&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/SolrFieldCacheMBean.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/search/SolrFieldCacheMBean.java Wed Aug 11 21:33:28 2010
@@ -64,16 +64,18 @@ public class SolrFieldCacheMBean impleme
       stats.add("entry#" + i, e.toString());
     }
 
-    Insanity[] insanity = checker.checkSanity(entries);
+    Insanity[] insanity = checker.check(entries);
 
     stats.add("insanity_count", insanity.length);
     for (int i = 0; i < insanity.length; i++) {
 
+      /** RAM estimation is both CPU and memory intensive... we don't want to do it unless asked.
       // we only estimate the size of insane entries
       for (CacheEntry e : insanity[i].getCacheEntries()) {
         // don't re-estimate if we've already done it.
         if (null == e.getEstimatedSize()) e.estimateSize();
       }
+      **/
       
       stats.add("insanity#" + i, insanity[i].toString());
     }