Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

Cleanup null check logic

Kevin Risdenbbda9ffe54d6
diff --git a/solr/core/src/java/org/apache/solr/search/QueryResultKey.java b/solr/core/src/java/org/apache/solr/search/QueryResultKey.java
index 431e273ad4e..2eb0df2b6ff 100644
--- a/solr/core/src/java/org/apache/solr/search/QueryResultKey.java
+++ b/solr/core/src/java/org/apache/solr/search/QueryResultKey.java
@@ -36,7 +36,7 @@ public final class QueryResultKey implements Accountable {
final Query query;
final Sort sort;
- final SortField[] sfields;
+ final List<SortField> sfields;
final List<Query> filters;
final int nc_flags; // non-comparable flags... ignored by hashCode and equals
final int minExactCount;
@@ -44,51 +44,35 @@ public final class QueryResultKey implements Accountable {
private final int hc; // cached hashCode
private final long ramBytesUsed; // cached
- private static SortField[] defaultSort = new SortField[0];
-
public QueryResultKey(Query query, List<Query> filters, Sort sort, int nc_flags) {
this(query, filters, sort, nc_flags, Integer.MAX_VALUE);
}
public QueryResultKey(
Query query, List<Query> filters, Sort sort, int nc_flags, int minExactCount) {
-
- 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;
this.nc_flags = nc_flags;
this.minExactCount = minExactCount;
int h = query.hashCode();
- if (filtersWithoutNulls != null) {
- for (Query filt : filtersWithoutNulls)
+ if (filters == null) {
+ this.filters = null;
+ } else {
+ this.filters = filters.stream().filter(Objects::nonNull).collect(Collectors.toList());
+ for (Query filt : this.filters) {
// NOTE: simple summation used here so keys with the same filters but in
// different orders get the same hashCode
h += filt.hashCode();
+ }
}
- if (this.sort == null){
- this.sfields = defaultSort;
- }
- else {
- //
- // Arrays.stream(sort.getSort()).filter(Objects::nonNull).collect(Collectors.toList()).toArray(Query);
- List<SortField> sortFieldsWithoutNulls = Arrays.stream(sort.getSort()).sequential().filter(Objects::nonNull).collect(Collectors.toList());
- this.sfields = new SortField[sortFieldsWithoutNulls.size()];
- int i = 0;
- for (SortField sf : sortFieldsWithoutNulls){
- sfields[i] = sf;
- i = i + 1;
- }
- //this.sfields = (SortField[]) Arrays.stream(sort.getSort()).filter(Objects::nonNull).collect(Collectors.toList()).toArray();
+ if (this.sort == null) {
+ this.sfields = List.of();
+ } else {
+ this.sfields = Arrays.stream(sort.getSort()).filter(Objects::nonNull).collect(Collectors.toList());
}
- //sfields = (this.sort != null) ? this.sort.getSort() : defaultSort;
- //sfields = sfields.stream().filter(Objects::nonNull).collect(Collectors.toList());
long ramSfields = RamUsageEstimator.NUM_BYTES_ARRAY_HEADER;
for (SortField sf : sfields) {
h = h * 29 + sf.hashCode();
@@ -103,7 +87,7 @@ public final class QueryResultKey implements Accountable {
+ ramSfields
+ RamUsageEstimator.sizeOfObject(query, RamUsageEstimator.QUERY_DEFAULT_RAM_BYTES_USED)
+ RamUsageEstimator.sizeOfObject(
- filtersWithoutNulls, RamUsageEstimator.QUERY_DEFAULT_RAM_BYTES_USED);
+ this.filters, RamUsageEstimator.QUERY_DEFAULT_RAM_BYTES_USED);
}
@Override
@@ -124,14 +108,14 @@ public final class QueryResultKey implements Accountable {
// check for the thing most likely to be different (and the fastest things)
// first.
- if (this.sfields.length != other.sfields.length) return false;
+ if (this.sfields.size() != other.sfields.size()) return false;
if (!this.query.equals(other.query)) return false;
if (!unorderedCompare(this.filters, other.filters)) return false;
if (this.minExactCount != other.minExactCount) return false;
- for (int i = 0; i < sfields.length; i++) {
- SortField sf1 = this.sfields[i];
- SortField sf2 = other.sfields[i];
+ for (int i = 0; i < sfields.size(); i++) {
+ SortField sf1 = this.sfields.get(i);
+ SortField sf2 = other.sfields.get(i);
if (!sf1.equals(sf2)) return false;
}
diff --git a/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java b/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java
index 40e7babeee7..6cb561a4eb9 100644
--- a/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java
+++ b/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java
@@ -109,7 +109,6 @@ public class QueryResultKeyTest extends SolrTestCaseJ4 {
}
public void testCreateKeyWithNullFilterList() {
-
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);
@@ -119,8 +118,6 @@ public class QueryResultKeyTest extends SolrTestCaseJ4 {
}
public void testCreateKeyWithNullFilterListAndNullSort() {
-
-
BooleanQuery.Builder query = new BooleanQuery.Builder();
query.add(new TermQuery(new Term("test", "field")), Occur.MUST);
@@ -137,14 +134,14 @@ public class QueryResultKeyTest extends SolrTestCaseJ4 {
query.add(new TermQuery(new Term("test", "field")), Occur.MUST);
List<Query> filters =
- Arrays.<Query>asList(
+ Arrays.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(
+ Arrays.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);
@@ -160,7 +157,7 @@ public class QueryResultKeyTest extends SolrTestCaseJ4 {
query.add(new TermQuery(new Term("test", "field")), Occur.MUST);
List<Query> filters =
- Arrays.<Query>asList(
+ Arrays.asList(
new TermQuery(new Term("test", "field")),
new TermQuery(new Term("test2", "field2")));
QueryResultKey qrk1 = new QueryResultKey(query.build(), filters, sort1, 1);