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:35:27 UTC
lucene-solr:branch_6x: SOLR-9374: Speed up Jmx MBean retrieval for
FieldCache (cherry picked from commit b1b933e)
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x d4954dad2 -> 5a16f1526
SOLR-9374: Speed up Jmx MBean retrieval for FieldCache
(cherry picked from commit b1b933e)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/5a16f152
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5a16f152
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5a16f152
Branch: refs/heads/branch_6x
Commit: 5a16f1526057c5faac1f552d4e4caa364a50fccf
Parents: d4954da
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:05:33 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/5a16f152/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 7f0e49b..fa6dcba 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -54,6 +54,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/5a16f152/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/5a16f152/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 4450cbb..3bc5e3e 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;
+ }
}