honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-09 14:34:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cut over StringScriptDataComparator to use BytesRef instead of Strings

Browse Source 
Closes #2920
This commit is contained in:
Simon Willnauer 2013-04-23 13:28:49 +02:00
parent 7a36bed031
commit f372f7c109
2 changed files with 69 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/main/java/org/elasticsearch/index/fielddata/fieldcomparator/StringScriptDataComparator.java
View File

@ -23,6 +23,7 @@ import org.apache.lucene.index.AtomicReaderContext;
import org.apache.lucene.search.FieldComparator;
import org.apache.lucene.search.Scorer;
import org.apache.lucene.search.SortField;
import org.apache.lucene.util.BytesRef;
import org.elasticsearch.index.fielddata.IndexFieldData;
import org.elasticsearch.script.SearchScript;
@ -31,7 +32,7 @@ import java.io.IOException;
/**
*
*/
public class StringScriptDataComparator extends FieldComparator<String> {
public class StringScriptDataComparator extends FieldComparator<BytesRef> {
public static IndexFieldData.XFieldComparatorSource comparatorSource(SearchScript script) {
return new InnerSource(script);
@ -58,18 +59,23 @@ public class StringScriptDataComparator extends FieldComparator<String> {
private final SearchScript script;
private String[] values;
private BytesRef[] values;
private String bottom;
private BytesRef bottom;
private BytesRef spare = new BytesRef();
private int spareDoc = -1;
public StringScriptDataComparator(int numHits, SearchScript script) {
this.script = script;
values = new String[numHits];
values = new BytesRef[numHits];
}
@Override
public FieldComparator<String> setNextReader(AtomicReaderContext context) throws IOException {
public FieldComparator<BytesRef> setNextReader(AtomicReaderContext context) throws IOException {
script.setNextReader(context);
spareDoc = -1;
return this;
}
@ -80,8 +86,8 @@ public class StringScriptDataComparator extends FieldComparator<String> {
@Override
public int compare(int slot1, int slot2) {
final String val1 = values[slot1];
final String val2 = values[slot2];
final BytesRef val1 = values[slot1];
final BytesRef val2 = values[slot2];
if (val1 == null) {
if (val2 == null) {
return 0;
@ -96,30 +102,38 @@ public class StringScriptDataComparator extends FieldComparator<String> {
@Override
public int compareBottom(int doc) {
script.setNextDocId(doc);
final String val2 = script.run().toString();
if (bottom == null) {
if (val2 == null) {
return 0;
}
return -1;
} else if (val2 == null) {
return 1;
}
return bottom.compareTo(val2);
return bottom.compareTo(spare);
}
@Override
public int compareDocToValue(int doc, String val2) throws IOException {
public int compareDocToValue(int doc, BytesRef val2) throws IOException {
script.setNextDocId(doc);
String val1 = script.run().toString();
return val1.compareTo(val2);
setSpare(doc);
return spare.compareTo(val2);
}
private void setSpare(int doc) {
if (spareDoc == doc) {
return;
}
script.setNextDocId(doc);
spare.copyChars(script.run().toString());
spareDoc = doc;
}
@Override
public void copy(int slot, int doc) {
script.setNextDocId(doc);
values[slot] = script.run().toString();
setSpare(doc);
if (values[slot] == null) {
values[slot] = BytesRef.deepCopyOf(spare);
} else {
values[slot].copyBytes(spare);
}
}
@Override
@ -128,7 +142,7 @@ public class StringScriptDataComparator extends FieldComparator<String> {
}
@Override
public String value(int slot) {
public BytesRef value(int slot) {
return values[slot];
}
}

34
src/test/java/org/elasticsearch/test/integration/search/sort/SimpleSortTests.java
View File

@ -431,6 +431,40 @@ public class SimpleSortTests extends AbstractNodesTests {
assertThat(searchResponse.toString(), not(containsString("error")));
}
@Test
public void testSortScript() throws IOException {
try {
client.admin().indices().prepareDelete("test").execute().actionGet();
} catch (Exception e) {
// ignore
}
String mapping = jsonBuilder().startObject().startObject("profile").field("dynamic", "strict")
.startObject("properties")
.startObject("id").field("type", "integer").field("index", "not_analyzed").field("store", true).endObject()
.startObject("groups_code").startObject("properties").field("type", "integer").field("index", "not_analyzed").endObject().endObject()
.startObject("date").field("type", "date").field("index", "not_analyzed").field("format", "date_time_no_millis").endObject()
.endObject().endObject().endObject().string();
client.admin().indices().prepareCreate("test")
.setSettings(ImmutableSettings.settingsBuilder().put("index.number_of_shards", 2).put("index.number_of_replicas", 0)).addMapping("test", mapping);
client.prepareIndex("test", "test", "1").setSource(jsonBuilder().startObject()
.startArray("groups_code").startObject().field("id", 47642).field("date", "2010-08-12T07:54:55Z").endObject().endArray()
.endObject()).execute().actionGet();
client.prepareIndex("test", "test", "2").setSource(jsonBuilder().startObject()
.startArray("groups_code").startObject().field("id", 47642).field("date", "2010-05-04T12:10:54Z").endObject().endArray()
.endObject()).execute().actionGet();
client.admin().indices().prepareRefresh("test").execute().actionGet();
SearchResponse searchResponse = client.prepareSearch()
.setQuery(matchAllQuery())
.addSort(SortBuilders.scriptSort("\u0027\u0027", "string")).setSize(10)
.execute().actionGet();
assertThat("Failures " + Arrays.toString(searchResponse.getShardFailures()), searchResponse.getShardFailures().length, equalTo(0));
}
@Test
public void testSortMinValueScript() throws IOException {
try {