You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by va...@apache.org on 2016/12/14 18:54:31 UTC
lucene-solr:branch_6x: SOLR-9844: Display fc total size only when
field entries asked for
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x f05d6e773 -> 26d797149
SOLR-9844: Display fc total size only when field entries asked for
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/26d79714
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/26d79714
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/26d79714
Branch: refs/heads/branch_6x
Commit: 26d79714953cd707d2d283e264eaa5461a6d25cf
Parents: f05d6e7
Author: Varun Thacker <va...@apache.org>
Authored: Tue Dec 13 15:52:17 2016 -0800
Committer: Varun Thacker <va...@apache.org>
Committed: Wed Dec 14 10:52:52 2016 -0800
----------------------------------------------------------------------
.../apache/solr/search/SolrFieldCacheMBean.java | 6 ++---
.../solr/uninverting/UninvertingReader.java | 25 +++++++++++++-------
.../solr/search/TestSolrFieldCacheMBean.java | 3 ++-
3 files changed, 22 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/26d79714/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java b/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
index 70781e9..642b708 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
@@ -62,15 +62,15 @@ public class SolrFieldCacheMBean implements JmxAugmentedSolrInfoMBean {
private NamedList getStats(boolean listEntries) {
NamedList stats = new SimpleOrderedMap();
if (listEntries) {
- String[] entries = UninvertingReader.getUninvertedStats();
+ UninvertingReader.FieldCacheStats fieldCacheStats = UninvertingReader.getUninvertedStats();
+ String[] entries = fieldCacheStats.info;
stats.add("entries_count", entries.length);
- stats.add("total_size", UninvertingReader.getTotalSize());
+ stats.add("total_size", fieldCacheStats.totalSize);
for (int i = 0; i < entries.length; i++) {
stats.add("entry#" + i, entries[i]);
}
} else {
stats.add("entries_count", UninvertingReader.getUninvertedStatsSize());
- stats.add("total_size", UninvertingReader.getTotalSize());
}
return stats;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/26d79714/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java b/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java
index ef66a94..c828a2b 100644
--- a/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java
+++ b/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java
@@ -381,25 +381,34 @@ public class UninvertingReader extends FilterLeafReader {
* Return information about the backing cache
* @lucene.internal
*/
- public static String[] getUninvertedStats() {
+ public static FieldCacheStats getUninvertedStats() {
CacheEntry[] entries = FieldCache.DEFAULT.getCacheEntries();
+ long totalBytesUsed = 0;
String[] info = new String[entries.length];
for (int i = 0; i < entries.length; i++) {
info[i] = entries[i].toString();
+ totalBytesUsed += entries[i].getValue().ramBytesUsed();
}
- return info;
+ String totalSize = RamUsageEstimator.humanReadableUnits(totalBytesUsed);
+ return new FieldCacheStats(totalSize, info);
}
public static int getUninvertedStatsSize() {
return FieldCache.DEFAULT.getCacheEntries().length;
}
- public static String getTotalSize() {
- CacheEntry[] entries = FieldCache.DEFAULT.getCacheEntries();
- long totalBytesUsed = 0;
- for (int i = 0; i < entries.length; i++) {
- totalBytesUsed += entries[i].getValue().ramBytesUsed();
+ /**
+ * Return information about the backing cache
+ * @lucene.internal
+ */
+ public static class FieldCacheStats {
+ public String totalSize;
+ public String[] info;
+
+ public FieldCacheStats(String totalSize, String[] info) {
+ this.totalSize = totalSize;
+ this.info = info;
}
- return RamUsageEstimator.humanReadableUnits(totalBytesUsed);
+
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/26d79714/solr/core/src/test/org/apache/solr/search/TestSolrFieldCacheMBean.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/search/TestSolrFieldCacheMBean.java b/solr/core/src/test/org/apache/solr/search/TestSolrFieldCacheMBean.java
index a705e1e..35bdec6 100644
--- a/solr/core/src/test/org/apache/solr/search/TestSolrFieldCacheMBean.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSolrFieldCacheMBean.java
@@ -69,6 +69,7 @@ public class TestSolrFieldCacheMBean extends SolrTestCaseJ4 {
SolrFieldCacheMBean mbean = new SolrFieldCacheMBean();
NamedList stats = checkJmx ? mbean.getStatisticsForJmx() : mbean.getStatistics();
assert(new Integer(stats.get("entries_count").toString()) > 0);
+ assertNotNull(stats.get("total_size"));
assertNotNull(stats.get("entry#0"));
}
@@ -76,7 +77,7 @@ public class TestSolrFieldCacheMBean extends SolrTestCaseJ4 {
SolrFieldCacheMBean mbean = new SolrFieldCacheMBean();
NamedList stats = checkJmx ? mbean.getStatisticsForJmx() : mbean.getStatistics();
assert(new Integer(stats.get("entries_count").toString()) > 0);
- assertNotNull(stats.get("total_size"));
+ assertNull(stats.get("total_size"));
assertNull(stats.get("entry#0"));
}
}