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

[TEST] remove unused methods and fix some warnings in AbstractQueryTestCase 

Also fix line length issues
This commit is contained in:
javanna 2016-08-03 21:16:45 +02:00 committed by Luca Cavanna
parent 533412e36f
commit 146f02183d
2 changed files with 52 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
buildSrc/src/main/resources/checkstyle_suppressions.xml
View File

@ -1157,7 +1157,6 @@
<suppress files="test[/\\]framework[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]common[/\\]cli[/\\]CliToolTestCase.java" checks="LineLength" /> <suppress files="test[/\\]framework[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]common[/\\]cli[/\\]CliToolTestCase.java" checks="LineLength" />
<suppress files="test[/\\]framework[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]common[/\\]util[/\\]MockBigArrays.java" checks="LineLength" /> <suppress files="test[/\\]framework[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]common[/\\]util[/\\]MockBigArrays.java" checks="LineLength" />
<suppress files="test[/\\]framework[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]bucket[/\\]script[/\\]NativeSignificanceScoreScriptWithParams.java" checks="LineLength" /> <suppress files="test[/\\]framework[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]search[/\\]aggregations[/\\]bucket[/\\]script[/\\]NativeSignificanceScoreScriptWithParams.java" checks="LineLength" />
<suppress files="test[/\\]framework[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]test[/\\]AbstractQueryTestCase.java" checks="LineLength" />
<suppress files="test[/\\]framework[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]test[/\\]BackgroundIndexer.java" checks="LineLength" /> <suppress files="test[/\\]framework[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]test[/\\]BackgroundIndexer.java" checks="LineLength" />
<suppress files="test[/\\]framework[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]test[/\\]CompositeTestCluster.java" checks="LineLength" /> <suppress files="test[/\\]framework[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]test[/\\]CompositeTestCluster.java" checks="LineLength" />
<suppress files="test[/\\]framework[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]test[/\\]CorruptionUtils.java" checks="LineLength" /> <suppress files="test[/\\]framework[/\\]src[/\\]main[/\\]java[/\\]org[/\\]elasticsearch[/\\]test[/\\]CorruptionUtils.java" checks="LineLength" />

112
test/framework/src/main/java/org/elasticsearch/test/AbstractQueryTestCase.java
View File

@ -19,19 +19,6 @@
package org.elasticsearch.test; package org.elasticsearch.test;
import java.io.Closeable;
import java.io.IOException;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParseException;
import com.fasterxml.jackson.core.io.JsonStringEncoder; import com.fasterxml.jackson.core.io.JsonStringEncoder;
import org.apache.lucene.search.BoostQuery; import org.apache.lucene.search.BoostQuery;
@ -58,7 +45,6 @@ import org.elasticsearch.common.ParseFieldMatcher;
import org.elasticsearch.common.ParsingException; import org.elasticsearch.common.ParsingException;
import org.elasticsearch.common.bytes.BytesArray; import org.elasticsearch.common.bytes.BytesArray;
import org.elasticsearch.common.bytes.BytesReference; import org.elasticsearch.common.bytes.BytesReference;
import org.elasticsearch.common.collect.Tuple;
import org.elasticsearch.common.compress.CompressedXContent; import org.elasticsearch.common.compress.CompressedXContent;
import org.elasticsearch.common.inject.Injector; import org.elasticsearch.common.inject.Injector;
import org.elasticsearch.common.inject.Module; import org.elasticsearch.common.inject.Module;
@ -118,6 +104,19 @@ import org.junit.After;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import java.io.Closeable;
import java.io.IOException;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.concurrent.ExecutionException;
import static java.util.Collections.emptyList; import static java.util.Collections.emptyList;
import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.either; import static org.hamcrest.Matchers.either;
@ -300,7 +299,8 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>>
assertThat(validQuery, containsString("{")); assertThat(validQuery, containsString("{"));
for (int insertionPosition = 0; insertionPosition < validQuery.length(); insertionPosition++) { for (int insertionPosition = 0; insertionPosition < validQuery.length(); insertionPosition++) {
if (validQuery.charAt(insertionPosition) == '{') { if (validQuery.charAt(insertionPosition) == '{') {
String testQuery = validQuery.substring(0, insertionPosition) + "{ \"newField\" : " + validQuery.substring(insertionPosition) + "}"; String testQuery = validQuery.substring(0, insertionPosition) + "{ \"newField\" : "
+ validQuery.substring(insertionPosition) + "}";
try { try {
parseQuery(testQuery); parseQuery(testQuery);
fail("some parsing exception expected for query: " + testQuery); fail("some parsing exception expected for query: " + testQuery);
@ -363,11 +363,12 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>>
/** /**
* Parses the query provided as string argument and compares it with the expected result provided as argument as a {@link QueryBuilder} * Parses the query provided as string argument and compares it with the expected result provided as argument as a {@link QueryBuilder}
*/ */
protected static final void assertParsedQuery(String queryAsString, QueryBuilder expectedQuery) throws IOException { protected static void assertParsedQuery(String queryAsString, QueryBuilder expectedQuery) throws IOException {
assertParsedQuery(queryAsString, expectedQuery, ParseFieldMatcher.STRICT); assertParsedQuery(queryAsString, expectedQuery, ParseFieldMatcher.STRICT);
} }
protected static final void assertParsedQuery(String queryAsString, QueryBuilder expectedQuery, ParseFieldMatcher matcher) throws IOException { protected static void assertParsedQuery(String queryAsString, QueryBuilder expectedQuery, ParseFieldMatcher matcher)
throws IOException {
QueryBuilder newQuery = parseQuery(queryAsString, matcher); QueryBuilder newQuery = parseQuery(queryAsString, matcher);
assertNotSame(newQuery, expectedQuery); assertNotSame(newQuery, expectedQuery);
assertEquals(expectedQuery, newQuery); assertEquals(expectedQuery, newQuery);
@ -377,31 +378,32 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>>
/** /**
* Parses the query provided as bytes argument and compares it with the expected result provided as argument as a {@link QueryBuilder} * Parses the query provided as bytes argument and compares it with the expected result provided as argument as a {@link QueryBuilder}
*/ */
protected static final void assertParsedQuery(BytesReference queryAsBytes, QueryBuilder expectedQuery) throws IOException { private static void assertParsedQuery(BytesReference queryAsBytes, QueryBuilder expectedQuery) throws IOException {
assertParsedQuery(queryAsBytes, expectedQuery, ParseFieldMatcher.STRICT); assertParsedQuery(queryAsBytes, expectedQuery, ParseFieldMatcher.STRICT);
} }
protected static final void assertParsedQuery(BytesReference queryAsBytes, QueryBuilder expectedQuery, ParseFieldMatcher matcher) throws IOException { private static void assertParsedQuery(BytesReference queryAsBytes, QueryBuilder expectedQuery, ParseFieldMatcher matcher)
throws IOException {
QueryBuilder newQuery = parseQuery(queryAsBytes, matcher); QueryBuilder newQuery = parseQuery(queryAsBytes, matcher);
assertNotSame(newQuery, expectedQuery); assertNotSame(newQuery, expectedQuery);
assertEquals(expectedQuery, newQuery); assertEquals(expectedQuery, newQuery);
assertEquals(expectedQuery.hashCode(), newQuery.hashCode()); assertEquals(expectedQuery.hashCode(), newQuery.hashCode());
} }
protected static final QueryBuilder parseQuery(String queryAsString) throws IOException { protected static QueryBuilder parseQuery(String queryAsString) throws IOException {
return parseQuery(queryAsString, ParseFieldMatcher.STRICT); return parseQuery(queryAsString, ParseFieldMatcher.STRICT);
} }
protected static final QueryBuilder parseQuery(String queryAsString, ParseFieldMatcher matcher) throws IOException { protected static QueryBuilder parseQuery(String queryAsString, ParseFieldMatcher matcher) throws IOException {
XContentParser parser = XContentFactory.xContent(queryAsString).createParser(queryAsString); XContentParser parser = XContentFactory.xContent(queryAsString).createParser(queryAsString);
return parseQuery(parser, matcher); return parseQuery(parser, matcher);
} }
protected static final QueryBuilder parseQuery(BytesReference queryAsBytes) throws IOException { protected static QueryBuilder parseQuery(BytesReference queryAsBytes) throws IOException {
return parseQuery(queryAsBytes, ParseFieldMatcher.STRICT); return parseQuery(queryAsBytes, ParseFieldMatcher.STRICT);
} }
protected static final QueryBuilder parseQuery(BytesReference queryAsBytes, ParseFieldMatcher matcher) throws IOException { protected static QueryBuilder parseQuery(BytesReference queryAsBytes, ParseFieldMatcher matcher) throws IOException {
XContentParser parser = XContentFactory.xContent(queryAsBytes).createParser(queryAsBytes); XContentParser parser = XContentFactory.xContent(queryAsBytes).createParser(queryAsBytes);
return parseQuery(parser, matcher); return parseQuery(parser, matcher);
} }
@ -428,7 +430,8 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>>
Query firstLuceneQuery = rewriteQuery(firstQuery, context).toQuery(context); Query firstLuceneQuery = rewriteQuery(firstQuery, context).toQuery(context);
assertNotNull("toQuery should not return null", firstLuceneQuery); assertNotNull("toQuery should not return null", firstLuceneQuery);
assertLuceneQuery(firstQuery, firstLuceneQuery, context); assertLuceneQuery(firstQuery, firstLuceneQuery, context);
SearchContext.removeCurrent(); // remove after assertLuceneQuery since the assertLuceneQuery impl might access the context as well //remove after assertLuceneQuery since the assertLuceneQuery impl might access the context as well
SearchContext.removeCurrent();
assertTrue( assertTrue(
"query is not equal to its copy after calling toQuery, firstQuery: " + firstQuery + ", secondQuery: " + controlQuery, "query is not equal to its copy after calling toQuery, firstQuery: " + firstQuery + ", secondQuery: " + controlQuery,
firstQuery.equals(controlQuery)); firstQuery.equals(controlQuery));
@ -449,7 +452,8 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>>
assertLuceneQuery(secondQuery, secondLuceneQuery, context); assertLuceneQuery(secondQuery, secondLuceneQuery, context);
SearchContext.removeCurrent(); SearchContext.removeCurrent();
assertEquals("two equivalent query builders lead to different lucene queries", rewrite(secondLuceneQuery), rewrite(firstLuceneQuery)); assertEquals("two equivalent query builders lead to different lucene queries",
rewrite(secondLuceneQuery), rewrite(firstLuceneQuery));
if (supportsBoostAndQueryName()) { if (supportsBoostAndQueryName()) {
secondQuery.boost(firstQuery.boost() + 1f + randomFloat()); secondQuery.boost(firstQuery.boost() + 1f + randomFloat());
@ -476,20 +480,21 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>>
} }
/** /**
* Few queries allow you to set the boost and queryName on the java api, although the corresponding parser doesn't parse them as they are not supported. * Few queries allow you to set the boost and queryName on the java api, although the corresponding parser
* This method allows to disable boost and queryName related tests for those queries. Those queries are easy to identify: their parsers * doesn't parse them as they are not supported. This method allows to disable boost and queryName related tests for those queries.
* don't parse `boost` and `_name` as they don't apply to the specific query: wrapper query and match_none * Those queries are easy to identify: their parsers don't parse `boost` and `_name` as they don't apply to the specific query:
* wrapper query and match_none
*/ */
protected boolean supportsBoostAndQueryName() { protected boolean supportsBoostAndQueryName() {
return true; return true;
} }
/** /**
* Checks the result of {@link QueryBuilder#toQuery(QueryShardContext)} given the original {@link QueryBuilder} and {@link QueryShardContext}. * Checks the result of {@link QueryBuilder#toQuery(QueryShardContext)} given the original {@link QueryBuilder}
* Verifies that named queries and boost are properly handled and delegates to {@link #doAssertLuceneQuery(AbstractQueryBuilder, Query, QueryShardContext)} * and {@link QueryShardContext}. Verifies that named queries and boost are properly handled and delegates to
* for query specific checks. * {@link #doAssertLuceneQuery(AbstractQueryBuilder, Query, QueryShardContext)} for query specific checks.
*/ */
protected final void assertLuceneQuery(QB queryBuilder, Query query, QueryShardContext context) throws IOException { private void assertLuceneQuery(QB queryBuilder, Query query, QueryShardContext context) throws IOException {
if (queryBuilder.queryName() != null) { if (queryBuilder.queryName() != null) {
Query namedQuery = context.copyNamedQueries().get(queryBuilder.queryName()); Query namedQuery = context.copyNamedQueries().get(queryBuilder.queryName());
assertThat(namedQuery, equalTo(query)); assertThat(namedQuery, equalTo(query));
@ -512,8 +517,8 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>>
} }
/** /**
* Checks the result of {@link QueryBuilder#toQuery(QueryShardContext)} given the original {@link QueryBuilder} and {@link QueryShardContext}. * Checks the result of {@link QueryBuilder#toQuery(QueryShardContext)} given the original {@link QueryBuilder}
* Contains the query specific checks to be implemented by subclasses. * and {@link QueryShardContext}. Contains the query specific checks to be implemented by subclasses.
*/ */
protected abstract void doAssertLuceneQuery(QB queryBuilder, Query query, QueryShardContext context) throws IOException; protected abstract void doAssertLuceneQuery(QB queryBuilder, Query query, QueryShardContext context) throws IOException;
@ -596,7 +601,7 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>>
//we use the streaming infra to create a copy of the query provided as argument //we use the streaming infra to create a copy of the query provided as argument
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
protected QB copyQuery(QB query) throws IOException { private QB copyQuery(QB query) throws IOException {
try (BytesStreamOutput output = new BytesStreamOutput()) { try (BytesStreamOutput output = new BytesStreamOutput()) {
output.writeNamedWriteable(query); output.writeNamedWriteable(query);
try (StreamInput in = new NamedWriteableAwareStreamInput(output.bytes().streamInput(), serviceHolder.namedWriteableRegistry)) { try (StreamInput in = new NamedWriteableAwareStreamInput(output.bytes().streamInput(), serviceHolder.namedWriteableRegistry)) {
@ -616,8 +621,7 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>>
* @return a new {@link QueryParseContext} based on the base test index and queryParserService * @return a new {@link QueryParseContext} based on the base test index and queryParserService
*/ */
protected static QueryParseContext createParseContext(XContentParser parser, ParseFieldMatcher matcher) { protected static QueryParseContext createParseContext(XContentParser parser, ParseFieldMatcher matcher) {
QueryParseContext queryParseContext = new QueryParseContext(serviceHolder.indicesQueriesRegistry, parser, matcher); return new QueryParseContext(serviceHolder.indicesQueriesRegistry, parser, matcher);
return queryParseContext;
} }
/** /**
@ -659,7 +663,7 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>>
int terms = randomIntBetween(0, 3); int terms = randomIntBetween(0, 3);
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
for (int i = 0; i < terms; i++) { for (int i = 0; i < terms; i++) {
builder.append(randomAsciiOfLengthBetween(1, 10) + " "); builder.append(randomAsciiOfLengthBetween(1, 10)).append(" ");
} }
return builder.toString().trim(); return builder.toString().trim();
} }
@ -669,20 +673,12 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>>
*/ */
protected String getRandomFieldName() { protected String getRandomFieldName() {
// if no type is set then return a random field name // if no type is set then return a random field name
if (serviceHolder.currentTypes == null || serviceHolder.currentTypes.length == 0 || randomBoolean()) { if (serviceHolder.currentTypes.length == 0 || randomBoolean()) {
return randomAsciiOfLengthBetween(1, 10); return randomAsciiOfLengthBetween(1, 10);
} }
return randomFrom(MAPPED_LEAF_FIELD_NAMES); return randomFrom(MAPPED_LEAF_FIELD_NAMES);
} }
/**
* Helper method to return a random field (mapped or unmapped) and a value
*/
protected Tuple<String, Object> getRandomFieldNameAndValue() {
String fieldName = getRandomFieldName();
return new Tuple<>(fieldName, getRandomValueForFieldName(fieldName));
}
/** /**
* Helper method to return a random rewrite method * Helper method to return a random rewrite method
*/ */
@ -700,7 +696,7 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>>
return rewrite; return rewrite;
} }
protected String[] getRandomTypes() { private String[] getRandomTypes() {
String[] types; String[] types;
if (serviceHolder.currentTypes.length > 0 && randomBoolean()) { if (serviceHolder.currentTypes.length > 0 && randomBoolean()) {
int numberOfQueryTypes = randomIntBetween(1, serviceHolder.currentTypes.length); int numberOfQueryTypes = randomIntBetween(1, serviceHolder.currentTypes.length);
@ -738,10 +734,6 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>>
} }
} }
protected static boolean isNumericFieldName(String fieldName) {
return INT_FIELD_NAME.equals(fieldName) || DOUBLE_FIELD_NAME.equals(fieldName);
}
protected static String randomAnalyzer() { protected static String randomAnalyzer() {
return randomFrom("simple", "standard", "keyword", "whitespace"); return randomFrom("simple", "standard", "keyword", "whitespace");
} }
@ -858,7 +850,7 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>>
return query; return query;
} }
static class ServiceHolder implements Closeable { private static class ServiceHolder implements Closeable {
private final Injector injector; private final Injector injector;
private final IndicesQueriesRegistry indicesQueriesRegistry; private final IndicesQueriesRegistry indicesQueriesRegistry;
@ -875,7 +867,7 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>>
private final BitsetFilterCache bitsetFilterCache; private final BitsetFilterCache bitsetFilterCache;
private final ScriptService scriptService; private final ScriptService scriptService;
public ServiceHolder(Collection<Class<? extends Plugin>> plugins, AbstractQueryTestCase<?> testCase) throws IOException { ServiceHolder(Collection<Class<? extends Plugin>> plugins, AbstractQueryTestCase<?> testCase) throws IOException {
// we have to prefer CURRENT since with the range of versions we support it's rather unlikely to get the current actually. // we have to prefer CURRENT since with the range of versions we support it's rather unlikely to get the current actually.
indexVersionCreated = randomBoolean() ? Version.CURRENT indexVersionCreated = randomBoolean() ? Version.CURRENT
: VersionUtils.randomVersionBetween(random(), Version.V_2_0_0_beta1, Version.CURRENT); : VersionUtils.randomVersionBetween(random(), Version.V_2_0_0_beta1, Version.CURRENT);
@ -890,8 +882,9 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>>
final ThreadPool threadPool = new ThreadPool(settings); final ThreadPool threadPool = new ThreadPool(settings);
index = new Index(randomAsciiOfLengthBetween(1, 10), "_na_"); index = new Index(randomAsciiOfLengthBetween(1, 10), "_na_");
ClusterService clusterService = ClusterServiceUtils.createClusterService(threadPool); ClusterService clusterService = ClusterServiceUtils.createClusterService(threadPool);
ClusterServiceUtils.setState(clusterService, new ClusterState.Builder(clusterService.state()).metaData(new MetaData.Builder().put( ClusterServiceUtils.setState(clusterService, new ClusterState.Builder(clusterService.state()).metaData(
new IndexMetaData.Builder(index.getName()).settings(indexSettings).numberOfShards(1).numberOfReplicas(0)))); new MetaData.Builder().put(new IndexMetaData.Builder(
index.getName()).settings(indexSettings).numberOfShards(1).numberOfReplicas(0))));
Environment env = InternalSettingsPreparer.prepareEnvironment(settings, null); Environment env = InternalSettingsPreparer.prepareEnvironment(settings, null);
PluginsService pluginsService =new PluginsService(settings, env.modulesFile(), env.pluginsFile(), plugins); PluginsService pluginsService =new PluginsService(settings, env.modulesFile(), env.pluginsFile(), plugins);
@ -947,7 +940,7 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>>
similarityService = new SimilarityService(idxSettings, Collections.emptyMap()); similarityService = new SimilarityService(idxSettings, Collections.emptyMap());
MapperRegistry mapperRegistry = injector.getInstance(MapperRegistry.class); MapperRegistry mapperRegistry = injector.getInstance(MapperRegistry.class);
mapperService = new MapperService(idxSettings, analysisService, similarityService, mapperRegistry, mapperService = new MapperService(idxSettings, analysisService, similarityService, mapperRegistry,
() -> createShardContext()); this::createShardContext);
IndicesFieldDataCache indicesFieldDataCache = new IndicesFieldDataCache(settings, new IndexFieldDataCache.Listener() { IndicesFieldDataCache indicesFieldDataCache = new IndicesFieldDataCache(settings, new IndexFieldDataCache.Listener() {
}); });
indexFieldDataService = new IndexFieldDataService(idxSettings, indicesFieldDataCache, indexFieldDataService = new IndexFieldDataService(idxSettings, indicesFieldDataCache,
@ -981,7 +974,8 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>>
).string()), MapperService.MergeReason.MAPPING_UPDATE, false); ).string()), MapperService.MergeReason.MAPPING_UPDATE, false);
// also add mappings for two inner field in the object field // also add mappings for two inner field in the object field
mapperService.merge(type, new CompressedXContent("{\"properties\":{\"" + OBJECT_FIELD_NAME + "\":{\"type\":\"object\"," mapperService.merge(type, new CompressedXContent("{\"properties\":{\"" + OBJECT_FIELD_NAME + "\":{\"type\":\"object\","
+ "\"properties\":{\"" + DATE_FIELD_NAME + "\":{\"type\":\"date\"},\"" + INT_FIELD_NAME + "\":{\"type\":\"integer\"}}}}}"), + "\"properties\":{\"" + DATE_FIELD_NAME + "\":{\"type\":\"date\"},\"" +
INT_FIELD_NAME + "\":{\"type\":\"integer\"}}}}}"),
MapperService.MergeReason.MAPPING_UPDATE, false); MapperService.MergeReason.MAPPING_UPDATE, false);
currentTypes[i] = type; currentTypes[i] = type;
} }
@ -1019,7 +1013,5 @@ public abstract class AbstractQueryTestCase<QB extends AbstractQueryBuilder<QB>>
Environment environment = new Environment(settings); Environment environment = new Environment(settings);
return ScriptModule.create(settings, environment, null, scriptPlugins); return ScriptModule.create(settings, environment, null, scriptPlugins);
} }
} }
} }