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

Fix script field sort returning Double.MAX_VALUE for all documents (#24942) 

This change fixes the script field sort when the returned type is a number.

Closes #24940
This commit is contained in:
Jim Ferenczi 2017-05-30 09:23:04 +02:00 committed by GitHub
parent b2abdd1174
commit 628dabd663
2 changed files with 81 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/elasticsearch/search/sort/ScriptSortBuilder.java
View File

@ -293,7 +293,7 @@ public class ScriptSortBuilder extends SortBuilder<ScriptSortBuilder> {
@Override
public boolean advanceExact(int doc) throws IOException {
leafScript.setDocument(doc);
return false;
return true;
}
@Override
public double doubleValue() {

81
core/src/test/java/org/elasticsearch/search/sort/FieldSortIT.java
View File

@ -32,10 +32,14 @@ import org.elasticsearch.cluster.metadata.IndexMetaData;
import org.elasticsearch.common.xcontent.XContentBuilder;
import org.elasticsearch.common.xcontent.XContentFactory;
import org.elasticsearch.common.xcontent.XContentType;
import org.elasticsearch.index.fielddata.ScriptDocValues;
import org.elasticsearch.index.mapper.Uid;
import org.elasticsearch.index.query.QueryBuilders;
import org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.script.MockScriptPlugin;
import org.elasticsearch.script.Script;
import org.elasticsearch.script.ScriptType;
import org.elasticsearch.search.SearchHit;
import org.elasticsearch.test.ESIntegTestCase;
import org.elasticsearch.test.InternalSettingsPlugin;
@ -46,19 +50,23 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Random;
import java.util.Set;
import java.util.TreeMap;
import java.util.concurrent.ExecutionException;
import java.util.function.Function;
import static org.elasticsearch.common.xcontent.XContentFactory.jsonBuilder;
import static org.elasticsearch.index.query.QueryBuilders.functionScoreQuery;
import static org.elasticsearch.index.query.QueryBuilders.matchAllQuery;
import static org.elasticsearch.index.query.functionscore.ScoreFunctionBuilders.fieldValueFactorFunction;
import static org.elasticsearch.script.MockScriptPlugin.NAME;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertFirstHit;
import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount;
@ -76,9 +84,34 @@ import static org.hamcrest.Matchers.not;
import static org.hamcrest.Matchers.nullValue;
public class FieldSortIT extends ESIntegTestCase {
public static class CustomScriptPlugin extends MockScriptPlugin {
@Override
@SuppressWarnings("unchecked")
protected Map<String, Function<Map<String, Object>, Object>> pluginScripts() {
Map<String, Function<Map<String, Object>, Object>> scripts = new HashMap<>();
scripts.put("doc['number'].value", vars -> sortDoubleScript(vars));
scripts.put("doc['keyword'].value", vars -> sortStringScript(vars));
return scripts;
}
@SuppressWarnings("unchecked")
static Double sortDoubleScript(Map<String, Object> vars) {
Map<?, ?> doc = (Map) vars.get("doc");
Double index = ((Number) ((ScriptDocValues<?>) doc.get("number")).getValues().get(0)).doubleValue();
return index;
}
@SuppressWarnings("unchecked")
static String sortStringScript(Map<String, Object> vars) {
Map<?, ?> doc = (Map) vars.get("doc");
String value = ((String) ((ScriptDocValues<?>) doc.get("keyword")).getValues().get(0));
return value;
}
}
@Override
protected Collection<Class<? extends Plugin>> nodePlugins() {
return Arrays.asList(InternalSettingsPlugin.class);
return Arrays.asList(InternalSettingsPlugin.class, CustomScriptPlugin.class);
}
@LuceneTestCase.AwaitsFix(bugUrl = "https://github.com/elastic/elasticsearch/issues/9421")
@ -1491,4 +1524,50 @@ public class FieldSortIT extends ESIntegTestCase {
assertArrayEquals(new String[] {"2001:db8::ff00:42:8329"},
response.getHits().getAt(0).getSortValues());
}
public void testScriptFieldSort() throws Exception {
createIndex("test");
ensureGreen();
final int numDocs = randomIntBetween(10, 20);
IndexRequestBuilder[] indexReqs = new IndexRequestBuilder[numDocs];
for (int i = 0; i < numDocs; ++i) {
indexReqs[i] = client().prepareIndex("test", "t")
.setSource("number", Integer.toString(i));
}
indexRandom(true, indexReqs);
{
Script script = new Script(ScriptType.INLINE, NAME, "doc['number'].value", Collections.emptyMap());
SearchResponse searchResponse = client().prepareSearch()
.setQuery(matchAllQuery())
.setSize(randomIntBetween(1, numDocs + 5))
.addSort(SortBuilders.scriptSort(script, ScriptSortBuilder.ScriptSortType.NUMBER))
.addSort(SortBuilders.scoreSort())
.execute().actionGet();
int expectedValue = 0;
for (SearchHit hit : searchResponse.getHits()) {
assertThat(hit.getSortValues().length, equalTo(2));
assertThat(hit.getSortValues()[0], equalTo(expectedValue++));
assertThat(hit.getSortValues()[1], equalTo(1f));
}
}
{
Script script = new Script(ScriptType.INLINE, NAME, "doc['keyword'].value", Collections.emptyMap());
SearchResponse searchResponse = client().prepareSearch()
.setQuery(matchAllQuery())
.setSize(randomIntBetween(1, numDocs + 5))
.addSort(SortBuilders.scriptSort(script, ScriptSortBuilder.ScriptSortType.STRING))
.addSort(SortBuilders.scoreSort())
.execute().actionGet();
int expectedValue = 0;
for (SearchHit hit : searchResponse.getHits()) {
assertThat(hit.getSortValues().length, equalTo(2));
assertThat(hit.getSortValues()[0], equalTo(Integer.toString(expectedValue++)));
assertThat(hit.getSortValues()[1], equalTo(1f));
}
}
}
}