Apache Solr open-source search software
the npe fix, and a test.. however to get it to pass the ram checks, we need to filter the list
Eric Pughc04e22f907eb
diff --git a/solr/core/src/java/org/apache/solr/search/QueryResultKey.java b/solr/core/src/java/org/apache/solr/search/QueryResultKey.javaindex 6b68a13e581..abcdbaf9f34 100644--- a/solr/core/src/java/org/apache/solr/search/QueryResultKey.java+++ b/solr/core/src/java/org/apache/solr/search/QueryResultKey.java@@ -17,7 +17,11 @@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;@@ -49,19 +53,24 @@ 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());this.query = query;this.sort = sort;- this.filters = filters;+ this.filters = filtersWithoutNulls;this.nc_flags = nc_flags;this.minExactCount = minExactCount;int h = query.hashCode();- if (filters != null) {- for (Query filt : filters)+ if (filtersWithoutNulls != null) {+ for (Query filt : filtersWithoutNulls)// 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;@@ -79,7 +88,7 @@ public final class QueryResultKey implements Accountable {+ ramSfields+ RamUsageEstimator.sizeOfObject(query, RamUsageEstimator.QUERY_DEFAULT_RAM_BYTES_USED)+ RamUsageEstimator.sizeOfObject(- filters, RamUsageEstimator.QUERY_DEFAULT_RAM_BYTES_USED);+ filtersWithoutNulls, RamUsageEstimator.QUERY_DEFAULT_RAM_BYTES_USED);}@Overridediff --git a/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java b/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.javaindex e5f53892b24..4bc505cac9e 100644--- a/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java+++ b/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java@@ -108,6 +108,26 @@ public class QueryResultKeyTest extends SolrTestCaseJ4 {assertKeyNotEquals(key1, key2);}+ public void testNullFilter() {+ // 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 =+ 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")));+ QueryResultKey qrk2 = new QueryResultKey(query.build(), filters2, sort, 1);+ assertKeyEquals(qrk1, qrk2);+ }+public void testRandomQueryKeyEquality() {final int minIters = atLeast(100 * 1000);