svn commit: r1709499 - /lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSetBuilder.java

[yo...@apache.org]

Author: yonik
Date: Tue Oct 20 01:12:57 2015
New Revision: 1709499

URL: http://svn.apache.org/viewvc?rev=1709499&view=rev
Log:
SOLR-8170: fix DocSetBuilder not removing doc 0 if it was deleted

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

Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSetBuilder.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSetBuilder.java?rev=1709499&r1=1709498&r2=1709499&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSetBuilder.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/DocSetBuilder.java Tue Oct 20 01:12:57 2015
@@ -165,22 +165,17 @@ public final class DocSetBuilder {
   }
 
   private static int dedup(int[] arr, int length, FixedBitSet acceptDocs) {
-    if (length == 0) {
-      return 0;
-    }
-    int l = 1;
-    int previous = arr[0];
-    for (int i = 1; i < length; ++i) {
+    int pos = 0;
+    int previous = -1;
+    for (int i = 0; i < length; ++i) {
       final int value = arr[i];
-      assert value >= previous;
-      if (value != previous) {
-        if (acceptDocs == null || acceptDocs.get(value)) {
-          arr[l++] = value;
-          previous = value;
-        }
+      // assert value >= previous;
+      if (value != previous && (acceptDocs == null || acceptDocs.get(value))) {
+        arr[pos++] = value;
+        previous = value;
       }
     }
-    return l;
+    return pos;
   }