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

Fixed resolving closest nested object when sorting on a field inside nested object

This commit is contained in:
Martijn van Groningen 2013-02-25 16:21:22 +01:00
parent c751df5ee5
commit 2b5e3f5586
2 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/main/java/org/elasticsearch/search/sort/SortParseElement.java
View File

@ -242,18 +242,24 @@ public class SortParseElement implements SearchParseElement {
int indexOf = fieldName.lastIndexOf('.'); int indexOf = fieldName.lastIndexOf('.');
if (indexOf == -1) { if (indexOf == -1) {
return null; return null;
} } else {
do {
String objectPath = fieldName.substring(0, indexOf);
ObjectMappers objectMappers = context.mapperService().objectMapper(objectPath);
if (objectMappers == null) {
return null;
}
String objectPath = fieldName.substring(0, indexOf); if (objectMappers.hasNested()) {
ObjectMappers objectMappers = context.mapperService().objectMapper(objectPath); for (ObjectMapper objectMapper : objectMappers) {
if (objectMappers == null) { if (objectMapper.nested().isNested()) {
return null; return objectMapper;
} }
}
}
for (ObjectMapper objectMapper : objectMappers) { indexOf = objectPath.lastIndexOf('.');
if (objectMapper.nested().isNested()) { } while (indexOf != -1);
return objectMapper;
}
} }
return null; return null;

27
src/test/java/org/elasticsearch/test/integration/nested/SimpleNestedTests.java
View File

@ -714,6 +714,9 @@ public class SimpleNestedTests extends AbstractNodesTests {
.startObject("child") .startObject("child")
.field("filter", true) .field("filter", true)
.field("child_values", 1l) .field("child_values", 1l)
.startObject("child_obj")
.field("value", 1l)
.endObject()
.endObject() .endObject()
.startObject("child") .startObject("child")
.field("filter", false) .field("filter", false)
@ -742,6 +745,9 @@ public class SimpleNestedTests extends AbstractNodesTests {
.startObject("child") .startObject("child")
.field("filter", true) .field("filter", true)
.field("child_values", 2l) .field("child_values", 2l)
.startObject("child_obj")
.field("value", 2l)
.endObject()
.endObject() .endObject()
.startObject("child") .startObject("child")
.field("filter", false) .field("filter", false)
@ -770,6 +776,9 @@ public class SimpleNestedTests extends AbstractNodesTests {
.startObject("child") .startObject("child")
.field("filter", true) .field("filter", true)
.field("child_values", 3l) .field("child_values", 3l)
.startObject("child_obj")
.field("value", 3l)
.endObject()
.endObject() .endObject()
.startObject("child") .startObject("child")
.field("filter", false) .field("filter", false)
@ -884,6 +893,24 @@ public class SimpleNestedTests extends AbstractNodesTests {
// assertThat(searchResponse.getHits().getHits()[1].sortValues()[0].toString(), equalTo("-2")); // assertThat(searchResponse.getHits().getHits()[1].sortValues()[0].toString(), equalTo("-2"));
// assertThat(searchResponse.getHits().getHits()[2].getId(), equalTo("1")); // assertThat(searchResponse.getHits().getHits()[2].getId(), equalTo("1"));
// assertThat(searchResponse.getHits().getHits()[2].sortValues()[0].toString(), equalTo("-1")); // assertThat(searchResponse.getHits().getHits()[2].sortValues()[0].toString(), equalTo("-1"));
// Check if closest nested type is resolved
searchResponse = client.prepareSearch()
.setQuery(matchAllQuery())
.addSort(
SortBuilders.fieldSort("parent.child.child_obj.value")
.setNestedFilter(FilterBuilders.termFilter("parent.child.filter", true))
.order(SortOrder.ASC)
)
.execute().actionGet();
assertThat(searchResponse.getHits().totalHits(), equalTo(3l));
assertThat(searchResponse.getHits().getHits().length, equalTo(3));
assertThat(searchResponse.getHits().getHits()[0].getId(), equalTo("1"));
assertThat(searchResponse.getHits().getHits()[0].sortValues()[0].toString(), equalTo("1"));
assertThat(searchResponse.getHits().getHits()[1].getId(), equalTo("2"));
assertThat(searchResponse.getHits().getHits()[1].sortValues()[0].toString(), equalTo("2"));
assertThat(searchResponse.getHits().getHits()[2].getId(), equalTo("3"));
assertThat(searchResponse.getHits().getHits()[2].sortValues()[0].toString(), equalTo("3"));
} }
} }