You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mv...@apache.org on 2012/08/29 16:05:59 UTC
svn commit: r1378567 - in /lucene/dev/branches/branch_4x/lucene/grouping/src:
java/org/apache/lucene/search/grouping/term/TermGroupFacetCollector.java
test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java
Author: mvg
Date: Wed Aug 29 14:05:59 2012
New Revision: 1378567
URL: http://svn.apache.org/viewvc?rev=1378567&view=rev
Log:
LUCENE-4333: Fixed bug caused by previous commit.
Modified:
lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermGroupFacetCollector.java
lucene/dev/branches/branch_4x/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java
Modified: lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermGroupFacetCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermGroupFacetCollector.java?rev=1378567&r1=1378566&r2=1378567&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermGroupFacetCollector.java (original)
+++ lucene/dev/branches/branch_4x/lucene/grouping/src/java/org/apache/lucene/search/grouping/term/TermGroupFacetCollector.java Wed Aug 29 14:05:59 2012
@@ -244,10 +244,6 @@ public abstract class TermGroupFacetColl
segmentTotalCount = 0;
segmentGroupedFacetHits.clear();
- if (facetFieldDocTermOrds.isEmpty()) {
- return;
- }
-
for (GroupedFacetHit groupedFacetHit : groupedFacetHits) {
int groupOrd = groupFieldTermsIndex.binarySearchLookup(groupedFacetHit.groupValue, spare);
if (groupOrd < 0) {
Modified: lucene/dev/branches/branch_4x/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java?rev=1378567&r1=1378566&r2=1378567&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java (original)
+++ lucene/dev/branches/branch_4x/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupFacetCollectorTest.java Wed Aug 29 14:05:59 2012
@@ -235,6 +235,7 @@ public class GroupFacetCollectorTest ext
addField(doc, "x", "x", useDv);
w.addDocument(doc);
+ // 1
doc = new Document();
addField(doc, groupField, "a", useDv);
addField(doc, "airport", "ams", useDv);
@@ -243,37 +244,43 @@ public class GroupFacetCollectorTest ext
w.commit();
w.deleteDocuments(new TermQuery(new Term("airport", "ams")));
- // 0
+ // 2
doc = new Document();
addField(doc, groupField, "a", useDv);
addField(doc, "airport", "ams", useDv);
w.addDocument(doc);
- // 1
+ // 3
doc = new Document();
addField(doc, groupField, "a", useDv);
addField(doc, "airport", "dus", useDv);
w.addDocument(doc);
- // 2
+ // 4
doc = new Document();
addField(doc, groupField, "b", useDv);
addField(doc, "airport", "ams", useDv);
w.addDocument(doc);
- // 3
+ // 5
doc = new Document();
addField(doc, groupField, "b", useDv);
addField(doc, "airport", "ams", useDv);
w.addDocument(doc);
- // 4
+ // 6
doc = new Document();
addField(doc, groupField, "b", useDv);
addField(doc, "airport", "ams", useDv);
w.addDocument(doc);
+ w.commit();
+ // 7
+ doc = new Document();
+ addField(doc, "x", "x", useDv);
+ w.addDocument(doc);
w.commit();
+
w.close();
IndexSearcher indexSearcher = new IndexSearcher(DirectoryReader.open(dir));
AbstractGroupFacetCollector groupedAirportFacetCollector = createRandomCollector(groupField, "airport", null, true, useDv);