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

Make GetField behavior more consitent for multivalued fields. 

Before this change, the GetField#getValue() method was returning a list of values of a multivalued fields if the field values were obtained from source or if the field was stored and real-time get was used. If the field was stored but non-realtime get was used, GetField#getValue() was returning only the first element and the GetField#getValues() was returning a list of elements. This change makes behavior consistent. GetField#getValue() now always returns only the first value of the field and GetField#getValues() returns the entire list.
This commit is contained in:
Igor Motov 2013-05-08 17:54:21 -04:00
parent 522ca7e889
commit 4d66575abe
2 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/org/elasticsearch/index/get/ShardGetService.java
View File

@ -19,6 +19,7 @@
package org.elasticsearch.index.get; package org.elasticsearch.index.get;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import org.apache.lucene.index.Term; import org.apache.lucene.index.Term;
import org.elasticsearch.ElasticSearchException; import org.elasticsearch.ElasticSearchException;
@ -267,12 +268,11 @@ public class ShardGetService extends AbstractIndexShardComponent {
if (fields == null) { if (fields == null) {
fields = newHashMapWithExpectedSize(2); fields = newHashMapWithExpectedSize(2);
} }
GetField getField = fields.get(field); if (value instanceof List) {
if (getField == null) { fields.put(field, new GetField(field, (List) value));
getField = new GetField(field, new ArrayList<Object>(2)); } else {
fields.put(field, getField); fields.put(field, new GetField(field, ImmutableList.of(value)));
} }
getField.getValues().add(value);
} }
} }
} }
@ -379,12 +379,11 @@ public class ShardGetService extends AbstractIndexShardComponent {
if (fields == null) { if (fields == null) {
fields = newHashMapWithExpectedSize(2); fields = newHashMapWithExpectedSize(2);
} }
GetField getField = fields.get(field); if (value instanceof List) {
if (getField == null) { fields.put(field, new GetField(field, (List) value));
getField = new GetField(field, new ArrayList<Object>(2)); } else {
fields.put(field, getField); fields.put(field, new GetField(field, ImmutableList.of(value)));
} }
getField.getValues().add(value);
} }
} }
} }

40
src/test/java/org/elasticsearch/test/integration/get/GetActionTests.java
View File

@ -276,9 +276,9 @@ public class GetActionTests extends AbstractNodesTests {
GetResponse getResponse = client.prepareGet("test", "type1", "1").setFields("str", "strs", "int", "ints", "date", "binary").execute().actionGet(); GetResponse getResponse = client.prepareGet("test", "type1", "1").setFields("str", "strs", "int", "ints", "date", "binary").execute().actionGet();
assertThat(getResponse.isExists(), equalTo(true)); assertThat(getResponse.isExists(), equalTo(true));
assertThat((String) getResponse.getField("str").getValue(), equalTo("test")); assertThat((String) getResponse.getField("str").getValue(), equalTo("test"));
assertThat((List<String>) getResponse.getField("strs").getValue(), contains("A", "B", "C")); assertThat(getResponse.getField("strs").getValues(), contains((Object) "A", "B", "C"));
assertThat((Long) getResponse.getField("int").getValue(), equalTo(42l)); assertThat((Long) getResponse.getField("int").getValue(), equalTo(42l));
assertThat((List<Long>) getResponse.getField("ints").getValue(), contains(1L, 2L, 3L, 4L)); assertThat(getResponse.getField("ints").getValues(), contains((Object) 1L, 2L, 3L, 4L));
assertThat((String) getResponse.getField("date").getValue(), equalTo("2012-11-13T15:26:14.000Z")); assertThat((String) getResponse.getField("date").getValue(), equalTo("2012-11-13T15:26:14.000Z"));
assertThat(getResponse.getField("binary").getValue(), instanceOf(String.class)); // its a String..., not binary mapped assertThat(getResponse.getField("binary").getValue(), instanceOf(String.class)); // its a String..., not binary mapped
@ -286,9 +286,9 @@ public class GetActionTests extends AbstractNodesTests {
getResponse = client.prepareGet("test", "type2", "1").setFields("str", "strs", "int", "ints", "date", "binary").execute().actionGet(); getResponse = client.prepareGet("test", "type2", "1").setFields("str", "strs", "int", "ints", "date", "binary").execute().actionGet();
assertThat(getResponse.isExists(), equalTo(true)); assertThat(getResponse.isExists(), equalTo(true));
assertThat((String) getResponse.getField("str").getValue(), equalTo("test")); assertThat((String) getResponse.getField("str").getValue(), equalTo("test"));
assertThat((List<String>) getResponse.getField("strs").getValue(), contains("A", "B", "C")); assertThat(getResponse.getField("strs").getValues(), contains((Object) "A", "B", "C"));
assertThat((Integer) getResponse.getField("int").getValue(), equalTo(42)); assertThat((Integer) getResponse.getField("int").getValue(), equalTo(42));
assertThat((List<Integer>) getResponse.getField("ints").getValue(), contains(1, 2, 3, 4)); assertThat(getResponse.getField("ints").getValues(), contains((Object) 1, 2, 3, 4));
assertThat((String) getResponse.getField("date").getValue(), equalTo("2012-11-13T15:26:14.000Z")); assertThat((String) getResponse.getField("date").getValue(), equalTo("2012-11-13T15:26:14.000Z"));
assertThat((BytesReference) getResponse.getField("binary").getValue(), equalTo((BytesReference) new BytesArray(new byte[]{1, 2, 3}))); assertThat((BytesReference) getResponse.getField("binary").getValue(), equalTo((BytesReference) new BytesArray(new byte[]{1, 2, 3})));
@ -299,9 +299,9 @@ public class GetActionTests extends AbstractNodesTests {
getResponse = client.prepareGet("test", "type1", "1").setFields("str", "strs", "int", "ints", "date", "binary").execute().actionGet(); getResponse = client.prepareGet("test", "type1", "1").setFields("str", "strs", "int", "ints", "date", "binary").execute().actionGet();
assertThat(getResponse.isExists(), equalTo(true)); assertThat(getResponse.isExists(), equalTo(true));
assertThat((String) getResponse.getField("str").getValue(), equalTo("test")); assertThat((String) getResponse.getField("str").getValue(), equalTo("test"));
assertThat((List<String>) getResponse.getField("strs").getValue(), contains("A", "B", "C")); assertThat(getResponse.getField("strs").getValues(), contains((Object) "A", "B", "C"));
assertThat((Long) getResponse.getField("int").getValue(), equalTo(42l)); assertThat((Long) getResponse.getField("int").getValue(), equalTo(42l));
assertThat((List<Long>) getResponse.getField("ints").getValue(), contains(1L, 2L, 3L, 4L)); assertThat(getResponse.getField("ints").getValues(), contains((Object) 1L, 2L, 3L, 4L));
assertThat((String) getResponse.getField("date").getValue(), equalTo("2012-11-13T15:26:14.000Z")); assertThat((String) getResponse.getField("date").getValue(), equalTo("2012-11-13T15:26:14.000Z"));
assertThat(getResponse.getField("binary").getValue(), instanceOf(String.class)); // its a String..., not binary mapped assertThat(getResponse.getField("binary").getValue(), instanceOf(String.class)); // its a String..., not binary mapped
@ -364,10 +364,9 @@ public class GetActionTests extends AbstractNodesTests {
assertThat(response.getId(), equalTo("1")); assertThat(response.getId(), equalTo("1"));
assertThat(response.getType(), equalTo("type1")); assertThat(response.getType(), equalTo("type1"));
assertThat(response.getFields().size(), equalTo(1)); assertThat(response.getFields().size(), equalTo(1));
assertThat(response.getFields().get("field").getValues().size(), equalTo(1)); assertThat(response.getFields().get("field").getValues().size(), equalTo(2));
assertThat(((List) response.getFields().get("field").getValues().get(0)).size(), equalTo(2)); assertThat(response.getFields().get("field").getValues().get(0).toString(), equalTo("1"));
assertThat(((List) response.getFields().get("field").getValues().get(0)).get(0).toString(), equalTo("1")); assertThat(response.getFields().get("field").getValues().get(1).toString(), equalTo("2"));
assertThat(((List) response.getFields().get("field").getValues().get(0)).get(1).toString(), equalTo("2"));
response = client.prepareGet("test", "type2", "1") response = client.prepareGet("test", "type2", "1")
@ -377,10 +376,9 @@ public class GetActionTests extends AbstractNodesTests {
assertThat(response.getType(), equalTo("type2")); assertThat(response.getType(), equalTo("type2"));
assertThat(response.getId(), equalTo("1")); assertThat(response.getId(), equalTo("1"));
assertThat(response.getFields().size(), equalTo(1)); assertThat(response.getFields().size(), equalTo(1));
assertThat(response.getFields().get("field").getValues().size(), equalTo(1)); assertThat(response.getFields().get("field").getValues().size(), equalTo(2));
assertThat(((List) response.getFields().get("field").getValues().get(0)).size(), equalTo(2)); assertThat(response.getFields().get("field").getValues().get(0).toString(), equalTo("1"));
assertThat(((List) response.getFields().get("field").getValues().get(0)).get(0).toString(), equalTo("1")); assertThat(response.getFields().get("field").getValues().get(1).toString(), equalTo("2"));
assertThat(((List) response.getFields().get("field").getValues().get(0)).get(1).toString(), equalTo("2"));
// Now test values being fetched from stored fields. // Now test values being fetched from stored fields.
client.admin().indices().prepareRefresh("test").execute().actionGet(); client.admin().indices().prepareRefresh("test").execute().actionGet();
@ -390,10 +388,9 @@ public class GetActionTests extends AbstractNodesTests {
assertThat(response.isExists(), equalTo(true)); assertThat(response.isExists(), equalTo(true));
assertThat(response.getId(), equalTo("1")); assertThat(response.getId(), equalTo("1"));
assertThat(response.getFields().size(), equalTo(1)); assertThat(response.getFields().size(), equalTo(1));
assertThat(response.getFields().get("field").getValues().size(), equalTo(1)); assertThat(response.getFields().get("field").getValues().size(), equalTo(2));
assertThat(((List) response.getFields().get("field").getValues().get(0)).size(), equalTo(2)); assertThat(response.getFields().get("field").getValues().get(0).toString(), equalTo("1"));
assertThat(((List) response.getFields().get("field").getValues().get(0)).get(0).toString(), equalTo("1")); assertThat(response.getFields().get("field").getValues().get(1).toString(), equalTo("2"));
assertThat(((List) response.getFields().get("field").getValues().get(0)).get(1).toString(), equalTo("2"));
response = client.prepareGet("test", "type2", "1") response = client.prepareGet("test", "type2", "1")
@ -402,10 +399,9 @@ public class GetActionTests extends AbstractNodesTests {
assertThat(response.isExists(), equalTo(true)); assertThat(response.isExists(), equalTo(true));
assertThat(response.getId(), equalTo("1")); assertThat(response.getId(), equalTo("1"));
assertThat(response.getFields().size(), equalTo(1)); assertThat(response.getFields().size(), equalTo(1));
assertThat(response.getFields().get("field").getValues().size(), equalTo(1)); assertThat(response.getFields().get("field").getValues().size(), equalTo(2));
assertThat(((List) response.getFields().get("field").getValues().get(0)).size(), equalTo(2)); assertThat(response.getFields().get("field").getValues().get(0).toString(), equalTo("1"));
assertThat(((List) response.getFields().get("field").getValues().get(0)).get(0).toString(), equalTo("1")); assertThat(response.getFields().get("field").getValues().get(1).toString(), equalTo("2"));
assertThat(((List) response.getFields().get("field").getValues().get(0)).get(1).toString(), equalTo("2"));
} }
@Test @Test