[lucene-solr] branch jira/solr-13350-8x updated: SOLR-13350: Fix compile issue

[is...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

ishan pushed a commit to branch jira/solr-13350-8x
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git


The following commit(s) were added to refs/heads/jira/solr-13350-8x by this push:
     new e100040  SOLR-13350: Fix compile issue
e100040 is described below

commit e100040e4d81e5786188fd783306ce3c27480dfe
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Tue Dec 29 12:55:11 2020 +0530

    SOLR-13350: Fix compile issue
---
 .../java/org/apache/solr/search/SolrIndexSearcher.java    |  2 +-
 .../src/test/org/apache/solr/search/TestFiltering.java    | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
index 83be2cf..e4ad8f8 100644
--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@ -1683,7 +1683,7 @@ public class SolrIndexSearcher extends IndexSearcher implements Closeable, SolrI
           TopFieldDocs[] topFieldDocs = Arrays.copyOf(topDocs, topDocs.length, TopFieldDocs[].class);
           mergedTopDocs = TopFieldDocs.merge(weightSort(cmd.getSort()), len, topFieldDocs);
         } else {
-          mergedTopDocs = needTopDocs? TopDocs.merge(0, len, topDocs): null;
+          mergedTopDocs = needTopDocs? TopDocs.merge(0, len, topDocs, true): null;
         }
         int totalHits = needTopDocs? (int)mergedTopDocs.totalHits.value: -1;
         maxScore = totalHits > 0 ? maxScore : 0.0f;
diff --git a/solr/core/src/test/org/apache/solr/search/TestFiltering.java b/solr/core/src/test/org/apache/solr/search/TestFiltering.java
index 392e8bc..162b8df 100644
--- a/solr/core/src/test/org/apache/solr/search/TestFiltering.java
+++ b/solr/core/src/test/org/apache/solr/search/TestFiltering.java
@@ -86,7 +86,7 @@ public class TestFiltering extends SolrTestCaseJ4 {
         QueryResult res = new QueryResult();
         searcher.search(res, cmd);
         set = res.getDocSet();
-        assertTrue( equals(live, set) );
+        assertTrue("Live: "+live+", set: "+set, equals(live, set) );
 
         cmd.setQuery( QParser.getParser(qstr + " OR id:0", null, req).getQuery() );
         cmd.setFilterList( QParser.getParser(qstr + " OR id:1", null, req).getQuery() );
@@ -102,19 +102,20 @@ public class TestFiltering extends SolrTestCaseJ4 {
   }
 
   boolean equals(DocSet ds1, DocSet ds2) {
-    DocSet smaller = ds1.getFixedBitSet().length() < ds2.getFixedBitSet().length() ? ds1: ds2;
-    DocSet larger = ds1.getFixedBitSet().length() > ds2.getFixedBitSet().length() ? ds1: ds2;
-    for (int i=0; i<Math.max(smaller.getFixedBitSet().length(), larger.getFixedBitSet().length()); i++) {
-      if (i>=smaller.getFixedBitSet().length()) {
-        if (larger.getFixedBitSet().get(i) == true) {
+    DocSet smaller = ds1.size() < ds2.size() ? ds1: ds2;
+    DocSet larger = ds1.size() > ds2.size() ? ds1: ds2;
+    for (int i=0; i<Math.max(smaller.size(), larger.size()); i++) {
+      if (i>=smaller.size()) {
+        if (larger.exists(i)) {
           return false;
         }
       } else {
-        if (larger.getFixedBitSet().get(i) != smaller.getFixedBitSet().get(i)) {
+        if (larger.exists(i) != smaller.exists(i)) {
           return false;
         }
       }
     }
+    
     return true;
   }