You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2016/08/27 19:34:28 UTC
lucene-solr:master: SOLR-9374: Speed up Jmx MBean retrieval for
FieldCache
Repository: lucene-solr
Updated Branches:
refs/heads/master 4f316bc19 -> b1b933eb4
SOLR-9374: Speed up Jmx MBean retrieval for FieldCache
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b1b933eb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b1b933eb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b1b933eb
Branch: refs/heads/master
Commit: b1b933eb43730a819a37ab0b33d78b09df838b33
Parents: 4f316bc
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Sun Aug 28 01:04:36 2016 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Sun Aug 28 01:04:36 2016 +0530
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../src/java/org/apache/solr/search/SolrFieldCacheMBean.java | 6 ++++--
.../java/org/apache/solr/uninverting/UninvertingReader.java | 4 ++++
3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b1b933eb/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index a4f918c..de75a39 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -92,6 +92,8 @@ Bug Fixes
Optimizations
----------------------
+* SOLR-9374: Speed up Jmx MBean retrieval for FieldCache. (Tim Owen via shalin)
+
Other Changes
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b1b933eb/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 4c8c0c1..62bc4fa 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java
@@ -61,12 +61,14 @@ public class SolrFieldCacheMBean implements JmxAugmentedSolrInfoMBean {
private NamedList getStats(boolean listEntries) {
NamedList stats = new SimpleOrderedMap();
- String[] entries = UninvertingReader.getUninvertedStats();
- stats.add("entries_count", entries.length);
if (listEntries) {
+ String[] entries = UninvertingReader.getUninvertedStats();
+ stats.add("entries_count", entries.length);
for (int i = 0; i < entries.length; i++) {
stats.add("entry#" + i, entries[i]);
}
+ } else {
+ stats.add("entries_count", UninvertingReader.getUninvertedStatsSize());
}
return stats;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b1b933eb/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 42b2f76..8d49fcb 100644
--- a/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java
+++ b/solr/core/src/java/org/apache/solr/uninverting/UninvertingReader.java
@@ -388,4 +388,8 @@ public class UninvertingReader extends FilterLeafReader {
}
return info;
}
+
+ public static int getUninvertedStatsSize() {
+ return FieldCache.DEFAULT.getCacheEntries().length;
+ }
}