You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by yo...@apache.org on 2010/08/12 02:16:23 UTC
svn commit: r984620 - in /lucene/solr/branches/branch-1.4: CHANGES.txt
src/java/org/apache/solr/search/SolrFieldCacheMBean.java
Author: yonik
Date: Thu Aug 12 00:16:22 2010
New Revision: 984620
URL: http://svn.apache.org/viewvc?rev=984620&view=rev
Log:
SOLR-2036: don't automatically use ram estimator from stats page
Modified:
lucene/solr/branches/branch-1.4/CHANGES.txt
lucene/solr/branches/branch-1.4/src/java/org/apache/solr/search/SolrFieldCacheMBean.java (contents, props changed)
Modified: lucene/solr/branches/branch-1.4/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/CHANGES.txt?rev=984620&r1=984619&r2=984620&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/CHANGES.txt (original)
+++ lucene/solr/branches/branch-1.4/CHANGES.txt Thu Aug 12 00:16:22 2010
@@ -51,6 +51,10 @@ Bug Fixes
* SOLR-1902: Upgraded Tika to 0.8-SNAPSHOT (Tommaso Teofili, gsingers)
+* SOLR-2036: Avoid expensive fieldCache ram estimation for the
+ admin stats page. (yonik)
+
+
================== Release 1.4.1 ==================
Release Date: See http://lucene.apache.org/solr for the official release date.
Modified: lucene/solr/branches/branch-1.4/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/branch-1.4/src/java/org/apache/solr/search/SolrFieldCacheMBean.java?rev=984620&r1=984619&r2=984620&view=diff
==============================================================================
--- lucene/solr/branches/branch-1.4/src/java/org/apache/solr/search/SolrFieldCacheMBean.java (original)
+++ lucene/solr/branches/branch-1.4/src/java/org/apache/solr/search/SolrFieldCacheMBean.java Thu Aug 12 00:16:22 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());
}
Propchange: lucene/solr/branches/branch-1.4/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Aug 12 00:16:22 2010
@@ -0,0 +1,2 @@
+/lucene/dev/trunk/solr/src/java/org/apache/solr/search/SolrFieldCacheMBean.java:950125,954336,984589
+/lucene/solr/trunk/src/java/org/apache/solr/search/SolrFieldCacheMBean.java:881642,881906,882734,882838,883178,883388,883518,883566,884393,890243,891596,891889,898119,903271,909705,911245,919871,925898