You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2012/09/08 01:45:37 UTC
svn commit: r1382209 - in /lucene/dev/trunk/solr: CHANGES.txt
core/src/java/org/apache/solr/handler/component/QueryComponent.java
Author: hossman
Date: Fri Sep 7 23:45:37 2012
New Revision: 1382209
URL: http://svn.apache.org/viewvc?rev=1382209&view=rev
Log:
SOLR-3518: Include final 'hits' in log information when aggregating a distibuted request
Modified:
lucene/dev/trunk/solr/CHANGES.txt
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1382209&r1=1382208&r2=1382209&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Fri Sep 7 23:45:37 2012
@@ -137,6 +137,8 @@ Bug Fixes
* SOLR-3699: Fixed some Directory leaks when there were errors during SolrCore
or SolrIndexWriter initialization. (hossman)
+* SOLR-3518: Include final 'hits' in log information when aggregating a
+ distibuted request (Markus Jelsma via hossman)
Other Changes
----------------------
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java?rev=1382209&r1=1382208&r2=1382209&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java Fri Sep 7 23:45:37 2012
@@ -863,8 +863,7 @@ public class QueryComponent extends Sear
queue.insertWithOverflow(shardDoc);
} // end for-each-doc-in-response
} // end for-each-response
-
-
+
// The queue now has 0 -> queuesize docs, where queuesize <= start + rows
// So we want to pop the last documents off the queue to get
// the docs offset -> queuesize
@@ -880,6 +879,9 @@ public class QueryComponent extends Sear
resultIds.put(shardDoc.id.toString(), shardDoc);
}
+ // Add hits for distributed requests
+ // https://issues.apache.org/jira/browse/SOLR-3518
+ rb.rsp.addToLog("hits", numFound);
SolrDocumentList responseDocs = new SolrDocumentList();
if (maxScore!=null) responseDocs.setMaxScore(maxScore);