You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by er...@apache.org on 2013/07/14 15:08:10 UTC
svn commit: r1502966 - in /lucene/dev/branches/lucene_solr_4_4: ./
dev-tools/ lucene/ lucene/analysis/
lucene/analysis/icu/src/java/org/apache/lucene/collation/ lucene/backwards/
lucene/benchmark/ lucene/classification/ lucene/classification/src/ lucen...
Author: erick
Date: Sun Jul 14 13:08:09 2013
New Revision: 1502966
URL: http://svn.apache.org/r1502966
Log:
fix for SOLR-5039, admin/schema browser displaying -1 for unique terms on multiValued fields
Modified:
lucene/dev/branches/lucene_solr_4_4/ (props changed)
lucene/dev/branches/lucene_solr_4_4/dev-tools/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/BUILD.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/JRE_VERSION_MIGRATION.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/LICENSE.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/MIGRATE.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/README.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/SYSTEM_REQUIREMENTS.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/analysis/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/analysis/icu/src/java/org/apache/lucene/collation/ICUCollationKeyFilterFactory.java (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/backwards/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/benchmark/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/build.xml (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/classification/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/classification/build.xml (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/classification/ivy.xml (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/classification/src/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/codecs/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/common-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/src/test/org/apache/lucene/index/index.40.cfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/src/test/org/apache/lucene/index/index.40.nocfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.cfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/src/test/org/apache/lucene/index/index.40.optimized.nocfs.zip (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/src/test/org/apache/lucene/search/TestSort.java (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/src/test/org/apache/lucene/search/TestSortDocValues.java (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/demo/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/facet/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/grouping/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/highlighter/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/ivy-settings.xml (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/join/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/licenses/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/memory/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/misc/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/module-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/queries/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/queryparser/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/replicator/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/sandbox/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/site/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/spatial/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/suggest/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene_solr_4_4/lucene/tools/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_4/solr/LICENSE.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/README.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/SYSTEM_REQUIREMENTS.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/build.xml (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/cloud-dev/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/common-build.xml (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/contrib/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/core/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
lucene/dev/branches/lucene_solr_4_4/solr/core/src/test/org/apache/solr/core/TestConfig.java (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/example/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/licenses/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/licenses/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/licenses/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/licenses/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/licenses/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/licenses/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/licenses/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/scripts/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/site/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/solrj/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/test-framework/ (props changed)
lucene/dev/branches/lucene_solr_4_4/solr/webapp/ (props changed)
Modified: lucene/dev/branches/lucene_solr_4_4/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_4/solr/CHANGES.txt?rev=1502966&r1=1502965&r2=1502966&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_4/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_4/solr/CHANGES.txt Sun Jul 14 13:08:09 2013
@@ -406,6 +406,8 @@ Bug Fixes
* SOLR-4744: Update failure on sub shard is not propagated to clients by parent
shard (Anshum Gupta, yonik, shalin)
+
+* SOLR-5039: Admin/Schema Browser displays -1 for term counts for multiValued fields.
Other Changes
----------------------
Modified: lucene/dev/branches/lucene_solr_4_4/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_4/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java?rev=1502966&r1=1502965&r2=1502966&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_4/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java (original)
+++ lucene/dev/branches/lucene_solr_4_4/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java Sun Jul 14 13:08:09 2013
@@ -596,13 +596,13 @@ public class LukeRequestHandler extends
BytesRef text;
int[] buckets = new int[HIST_ARRAY_SIZE];
while ((text = termsEnum.next()) != null) {
+ ++tiq.distinctTerms;
int freq = termsEnum.docFreq(); // This calculation seems odd, but it gives the same results as it used to.
int slot = 32 - Integer.numberOfLeadingZeros(Math.max(0, freq - 1));
buckets[slot] = buckets[slot] + 1;
if (freq > tiq.minFreq) {
UnicodeUtil.UTF8toUTF16(text, spare);
String t = spare.toString();
- tiq.distinctTerms = new Long(terms.size()).intValue();
tiq.add(new TopTermQueue.TermInfo(new Term(field, t), termsEnum.docFreq()));
if (tiq.size() > numTerms) { // if tiq full