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 2015/04/18 05:33:48 UTC
svn commit: r1674431 - in /lucene/dev/branches/branch_5x: ./ solr/
solr/CHANGES.txt solr/core/
solr/core/src/java/org/apache/solr/search/Grouping.java
Author: shalin
Date: Sat Apr 18 03:33:48 2015
New Revision: 1674431
URL: http://svn.apache.org/r1674431
Log:
SOLR-6886: Removed redundant size check and added missing calls to DelegatingCollection.finish inside Grouping code. This closes #116.
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/solr/ (props changed)
lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/Grouping.java
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1674431&r1=1674430&r2=1674431&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Sat Apr 18 03:33:48 2015
@@ -105,6 +105,9 @@ Other Changes
- When using hl.maxMultiValuedToMatch with hl.preserveMulti, only count matched snippets.
(David Smiley)
+* SOLR-6886: Removed redundant size check and added missing calls to
+ DelegatingCollection.finish inside Grouping code. (Christine Poerschke via shalin)
+
================== 5.1.0 ==================
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/Grouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/Grouping.java?rev=1674431&r1=1674430&r2=1674431&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/Grouping.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/Grouping.java Sat Apr 18 03:33:48 2015
@@ -405,10 +405,9 @@ public class Grouping {
secondPhaseCollectors = pf.postFilter;
}
searchWithTimeLimiter(luceneFilter, secondPhaseCollectors);
-
- if(secondPhaseCollectors instanceof DelegatingCollector) {
- ((DelegatingCollector) secondPhaseCollectors).finish();
- }
+ }
+ if (secondPhaseCollectors instanceof DelegatingCollector) {
+ ((DelegatingCollector) secondPhaseCollectors).finish();
}
}
}