svn commit: r1038327 - /lucene/dev/trunk/solr/src/java/org/apache/solr/search/Grouping.java

[yo...@apache.org]

Author: yonik
Date: Tue Nov 23 20:33:26 2010
New Revision: 1038327

URL: http://svn.apache.org/viewvc?rev=1038327&view=rev
Log:
SOLR-2068: optimize group by string

Modified:
    lucene/dev/trunk/solr/src/java/org/apache/solr/search/Grouping.java

Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/search/Grouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/search/Grouping.java?rev=1038327&r1=1038326&r2=1038327&view=diff
==============================================================================
--- lucene/dev/trunk/solr/src/java/org/apache/solr/search/Grouping.java (original)
+++ lucene/dev/trunk/solr/src/java/org/apache/solr/search/Grouping.java Tue Nov 23 20:33:26 2010
@@ -168,7 +168,7 @@ public class Grouping {
       int docsToCollect = getMax(groupOffset, docsPerGroup, maxDoc);
       docsToCollect = Math.max(docsToCollect, 1);
 
-      if (false && groupBy instanceof StrFieldSource) {
+      if (groupBy instanceof StrFieldSource) {
         collector2 = new Phase2StringGroupCollector(collector, groupBy, context, groupSort, docsToCollect, needScores, offset);
       } else {
         collector2 = new Phase2GroupCollector(collector, groupBy, context, groupSort, docsToCollect, needScores, offset);
@@ -739,8 +739,12 @@ class Phase2StringGroupCollector extends
 
     ordSet.clear();
     for (SearchGroupDocs group : groupMap.values()) {
-      int ord = index.binarySearchLookup(((MutableValueStr)group.groupValue).value, spare);
-      if (ord > 0) {
+      MutableValueStr gv = (MutableValueStr)group.groupValue;
+      int ord = 0;
+      if (gv.exists) {
+        ord = index.binarySearchLookup(((MutableValueStr)group.groupValue).value, spare);
+      }
+      if (ord >= 0) {
         int slot = ordSet.put(ord);
         groups[slot] = group;
       }