honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lucene 4: text comparator should always work on bytes

This commit is contained in:
Shay Banon 2012-10-26 14:11:11 +02:00
parent 65ce3aea57
commit 4b84078f91
3 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/elasticsearch/common/text/BytesText.java
View File

@ -22,8 +22,6 @@ package org.elasticsearch.common.text;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.bytes.BytesReference;
import java.util.Comparator;
/** /**
* A {@link BytesReference} representation of the text, will always convert on the fly to a {@link String}. * A {@link BytesReference} representation of the text, will always convert on the fly to a {@link String}.
*/ */
@ -76,7 +74,6 @@ public class BytesText implements Text {
@Override @Override
public int compareTo(Text text) { public int compareTo(Text text) {
return UTF8SortedAsUnicodeComparator.utf8SortedAsUnicodeSortOrder.compare(text.bytes(), text.bytes()); return UTF8SortedAsUnicodeComparator.utf8SortedAsUnicodeSortOrder.compare(bytes(), text.bytes());
} }
} }

8
src/main/java/org/elasticsearch/common/text/StringAndBytesText.java
View File

@ -99,11 +99,7 @@ public class StringAndBytesText implements Text {
} }
@Override @Override
public int compareTo(Text other) { public int compareTo(Text text) {
if (text == null) { return UTF8SortedAsUnicodeComparator.utf8SortedAsUnicodeSortOrder.compare(bytes(), text.bytes());
return UTF8SortedAsUnicodeComparator.utf8SortedAsUnicodeSortOrder.compare(bytes, other.bytes());
} else {
return text.compareTo(other.string());
}
} }
} }

2
src/main/java/org/elasticsearch/common/text/StringText.java
View File

@ -86,6 +86,6 @@ public class StringText implements Text {
@Override @Override
public int compareTo(Text text) { public int compareTo(Text text) {
return this.text.compareTo(text.string()); return UTF8SortedAsUnicodeComparator.utf8SortedAsUnicodeSortOrder.compare(bytes(), text.bytes());
} }
} }