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

Search Fields: If a field is not stored, automatically extract it from _source (without the need for _source prefix), closes #562.

This commit is contained in:
kimchy 2010-12-12 05:00:24 +02:00
parent 216b2ab912
commit bc04243a2b
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/elasticsearch/src/main/java/org/elasticsearch/search/fetch/FieldsParseElement.java
View File

@ -20,6 +20,7 @@
package org.elasticsearch.search.fetch; package org.elasticsearch.search.fetch;
import org.elasticsearch.common.xcontent.XContentParser; import org.elasticsearch.common.xcontent.XContentParser;
import org.elasticsearch.index.mapper.FieldMapper;
import org.elasticsearch.script.search.SearchScript; import org.elasticsearch.script.search.SearchScript;
import org.elasticsearch.search.SearchParseElement; import org.elasticsearch.search.SearchParseElement;
import org.elasticsearch.search.fetch.script.ScriptFieldsContext; import org.elasticsearch.search.fetch.script.ScriptFieldsContext;
@ -41,10 +42,17 @@ public class FieldsParseElement implements SearchParseElement {
// script field to load from source // script field to load from source
SearchScript searchScript = new SearchScript(context.lookup(), null, name, null, context.scriptService()); SearchScript searchScript = new SearchScript(context.lookup(), null, name, null, context.scriptService());
context.scriptFields().add(new ScriptFieldsContext.ScriptField(name, searchScript)); context.scriptFields().add(new ScriptFieldsContext.ScriptField(name, searchScript));
} else {
FieldMapper fieldMapper = context.mapperService().smartNameFieldMapper(name);
if (!"*".equals(name) && (fieldMapper == null || !fieldMapper.stored())) {
// script field to load from source
SearchScript searchScript = new SearchScript(context.lookup(), null, "_source." + name, null, context.scriptService());
context.scriptFields().add(new ScriptFieldsContext.ScriptField(name, searchScript));
} else { } else {
context.fieldNames().add(name); context.fieldNames().add(name);
} }
} }
}
if (!added) { if (!added) {
context.emptyFieldNames(); context.emptyFieldNames();
} }
@ -54,9 +62,16 @@ public class FieldsParseElement implements SearchParseElement {
// script field to load from source // script field to load from source
SearchScript searchScript = new SearchScript(context.lookup(), null, name, null, context.scriptService()); SearchScript searchScript = new SearchScript(context.lookup(), null, name, null, context.scriptService());
context.scriptFields().add(new ScriptFieldsContext.ScriptField(name, searchScript)); context.scriptFields().add(new ScriptFieldsContext.ScriptField(name, searchScript));
} else {
FieldMapper fieldMapper = context.mapperService().smartNameFieldMapper(name);
if (!"*".equals(name) && (fieldMapper == null || !fieldMapper.stored())) {
// script field to load from source
SearchScript searchScript = new SearchScript(context.lookup(), null, "_source." + name, null, context.scriptService());
context.scriptFields().add(new ScriptFieldsContext.ScriptField(name, searchScript));
} else { } else {
context.fieldNames().add(name); context.fieldNames().add(name);
} }
} }
} }
}
} }

3
modules/test/integration/src/test/java/org/elasticsearch/test/integration/search/fields/SearchFieldsTests.java
View File

@ -82,9 +82,12 @@ public class SearchFieldsTests extends AbstractNodesTests {
assertThat(searchResponse.hits().getAt(0).fields().size(), equalTo(1)); assertThat(searchResponse.hits().getAt(0).fields().size(), equalTo(1));
assertThat(searchResponse.hits().getAt(0).fields().get("field1").value().toString(), equalTo("value1")); assertThat(searchResponse.hits().getAt(0).fields().get("field1").value().toString(), equalTo("value1"));
// field2 is not stored, check that it gets extracted from source
searchResponse = client.prepareSearch().setQuery(matchAllQuery()).addField("field2").execute().actionGet(); searchResponse = client.prepareSearch().setQuery(matchAllQuery()).addField("field2").execute().actionGet();
assertThat(searchResponse.hits().getTotalHits(), equalTo(1l)); assertThat(searchResponse.hits().getTotalHits(), equalTo(1l));
assertThat(searchResponse.hits().hits().length, equalTo(1)); assertThat(searchResponse.hits().hits().length, equalTo(1));
assertThat(searchResponse.hits().getAt(0).fields().size(), equalTo(1));
assertThat(searchResponse.hits().getAt(0).fields().get("field2").value().toString(), equalTo("value2"));
searchResponse = client.prepareSearch().setQuery(matchAllQuery()).addField("field3").execute().actionGet(); searchResponse = client.prepareSearch().setQuery(matchAllQuery()).addField("field3").execute().actionGet();
assertThat(searchResponse.hits().getTotalHits(), equalTo(1l)); assertThat(searchResponse.hits().getTotalHits(), equalTo(1l));