Apache Solr open-source search software
i dont love what i added to deal with null filters...
Eric Pugh78824508e827
diff --git a/solr/core/src/java/org/apache/solr/search/QueryResultKey.java b/solr/core/src/java/org/apache/solr/search/QueryResultKey.javaindex abcdbaf9f34..48eced3d8e1 100644--- a/solr/core/src/java/org/apache/solr/search/QueryResultKey.java+++ b/solr/core/src/java/org/apache/solr/search/QueryResultKey.java@@ -17,11 +17,9 @@package org.apache.solr.search;import java.util.ArrayList;-import java.util.Collections;import java.util.List;import java.util.Objects;import java.util.stream.Collectors;-import org.apache.lucene.search.Query;import org.apache.lucene.search.Sort;import org.apache.lucene.search.SortField;@@ -54,9 +52,10 @@ public final class QueryResultKey implements Accountable {public QueryResultKey(Query query, List<Query> filters, Sort sort, int nc_flags, int minExactCount) {- List<Query> filtersWithoutNulls = filters.stream()- .filter(Objects::nonNull)- .collect(Collectors.toList());+ List<Query> filtersWithoutNulls = null;+ if (filters != null) {+ filtersWithoutNulls = filters.stream().filter(Objects::nonNull).collect(Collectors.toList());+ }this.query = query;this.sort = sort;this.filters = filtersWithoutNulls;@@ -70,7 +69,6 @@ public final class QueryResultKey implements Accountable {// NOTE: simple summation used here so keys with the same filters but in// different orders get the same hashCodeh += filt.hashCode();-}sfields = (this.sort != null) ? this.sort.getSort() : defaultSort;diff --git a/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java b/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.javaindex 4bc505cac9e..6f3df97578b 100644--- a/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java+++ b/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java@@ -108,7 +108,20 @@ public class QueryResultKeyTest extends SolrTestCaseJ4 {assertKeyNotEquals(key1, key2);}- public void testNullFilter() {+ public void testCreateKeyWithNullFilterList() {+ // the hashcode should be the same even when the list+ // of filters has a null filter++ Sort sort = new Sort(new SortField("test", SortField.Type.INT));+ BooleanQuery.Builder query = new BooleanQuery.Builder();+ query.add(new TermQuery(new Term("test", "field")), Occur.MUST);++ List<Query> filters = null;+ QueryResultKey qrk1 = new QueryResultKey(query.build(), filters, sort, 1);+ assertNotNull(qrk1);+ }++ public void testNullFilterInFiltersList() {// the hashcode should be the same even when the list// of filters has a null filter@@ -117,13 +130,15 @@ public class QueryResultKeyTest extends SolrTestCaseJ4 {query.add(new TermQuery(new Term("test", "field")), Occur.MUST);List<Query> filters =- Arrays.<Query>asList(- new TermQuery(new Term("test", "field")), new TermQuery(new Term("test2", "field2")), null);+ Arrays.<Query>asList(+ new TermQuery(new Term("test", "field")),+ new TermQuery(new Term("test2", "field2")),+ null);QueryResultKey qrk1 = new QueryResultKey(query.build(), filters, sort, 1);List<Query> filters2 =- Arrays.<Query>asList(- new TermQuery(new Term("test2", "field2")), new TermQuery(new Term("test", "field")));+ Arrays.<Query>asList(+ new TermQuery(new Term("test2", "field2")), new TermQuery(new Term("test", "field")));QueryResultKey qrk2 = new QueryResultKey(query.build(), filters2, sort, 1);assertKeyEquals(qrk1, qrk2);}