Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use SortField hashCode/equals rather than implenenting it ourselves 

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@911872 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Yonik Seeley 2010-02-19 17:40:45 +00:00
parent 85d5802400
commit e4d016cdbe
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/java/org/apache/solr/search/QueryResultKey.java
View File

@ -50,15 +50,7 @@ public final class QueryResultKey {
sfields = (this.sort !=null) ? this.sort.getSort() : defaultSort;
for (SortField sf : sfields) {
// mix the bits so that sortFields are position dependent
// so that a,b won't hash to the same value as b,a
h ^= (h << 8) | (h >>> 25); // reversible hash
if (sf.getField() != null) h += sf.getField().hashCode();
h += sf.getType();
if (sf.getReverse()) h=~h;
if (sf.getLocale()!=null) h+=sf.getLocale().hashCode();
if (sf.getFactory()!=null) h+=sf.getFactory().hashCode();
h = h*29 + sf.hashCode();
}
hc = h;
@ -87,12 +79,7 @@ public final class QueryResultKey {
for (int i=0; i<sfields.length; i++) {
SortField sf1 = this.sfields[i];
SortField sf2 = other.sfields[i];
if (sf1.getType() != sf2.getType()) return false;
if (sf1.getReverse() != sf2.getReverse()) return false;
if (!isEqual(sf1.getField(),sf2.getField())) return false;
if (!isEqual(sf1.getLocale(), sf2.getLocale())) return false;
if (!isEqual(sf1.getFactory(), sf2.getFactory())) return false;
// NOTE: the factory must be identical!!! use singletons!
if (!sf1.equals(sf2)) return false;
}
return true;