Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-15185: HashQParser, make hashCode deterministic (#175)

David Smileyb9f0f8f7f132
diff --git a/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java b/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java
index d4161701778..4a6f007471a 100644
--- a/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/HashQParserPlugin.java
@@ -34,8 +34,10 @@ import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.LongValues;
import org.apache.lucene.search.LongValuesSource;
import org.apache.lucene.search.Query;
+import org.apache.lucene.util.BytesRef;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.SolrParams;
+import org.apache.solr.common.util.Hash;
import org.apache.solr.request.SolrQueryRequest;
/**
@@ -114,7 +116,12 @@ public class HashQParserPlugin extends QParserPlugin {
@Override
public long longValue() throws IOException {
//TODO: maybe cache hashCode if same ord as prev doc to save lookupOrd?
- return atDoc ? values.lookupOrd(values.ordValue()).hashCode() : 0;
+ return atDoc ? hashCode(values.lookupOrd(values.ordValue())) : 0;
+ }
+
+ private int hashCode(BytesRef bytesRef) {
+ // Use deterministic hashCode. BytesRef.hashCode() varies!
+ return Hash.murmurhash3_x86_32(bytesRef.bytes, bytesRef.offset, bytesRef.length, 0);
}
};
continue;