Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

i hate how i made the tests pass, and need someone with more java chops. are we actually solving the right problem?

Eric Pughe4f3873d08f6
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 48eced3d8e1..431e273ad4e 100644
--- a/solr/core/src/java/org/apache/solr/search/QueryResultKey.java
+++ b/solr/core/src/java/org/apache/solr/search/QueryResultKey.java
@@ -17,6 +17,7 @@
package org.apache.solr.search;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
@@ -71,7 +72,23 @@ public final class QueryResultKey implements Accountable {
h += filt.hashCode();
}
- sfields = (this.sort != null) ? this.sort.getSort() : defaultSort;
+ 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();
+ }
+ //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();