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

Fix PercolatorQuerySearchIT to not create multiple types.

This commit is contained in:
Adrien Grand 2017-05-03 16:44:14 +02:00
parent 7ecb79a8e1
commit 7311aaa2eb
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorQuerySearchIT.java
View File

@ -613,6 +613,7 @@ public class PercolatorQuerySearchIT extends ESSingleNodeTestCase {
public void testPercolateQueryWithNestedDocuments_doNotLeakBitsetCacheEntries() throws Exception { public void testPercolateQueryWithNestedDocuments_doNotLeakBitsetCacheEntries() throws Exception {
XContentBuilder mapping = XContentFactory.jsonBuilder(); XContentBuilder mapping = XContentFactory.jsonBuilder();
mapping.startObject().startObject("properties").startObject("companyname").field("type", "text").endObject() mapping.startObject().startObject("properties").startObject("companyname").field("type", "text").endObject()
.startObject("query").field("type", "percolator").endObject()
.startObject("employee").field("type", "nested").startObject("properties") .startObject("employee").field("type", "nested").startObject("properties")
.startObject("name").field("type", "text").endObject().endObject().endObject().endObject() .startObject("name").field("type", "text").endObject().endObject().endObject().endObject()
.endObject(); .endObject();
@ -620,9 +621,8 @@ public class PercolatorQuerySearchIT extends ESSingleNodeTestCase {
// to avoid normal document from being cached by BitsetFilterCache // to avoid normal document from being cached by BitsetFilterCache
.setSettings(Settings.builder().put(BitsetFilterCache.INDEX_LOAD_RANDOM_ACCESS_FILTERS_EAGERLY_SETTING.getKey(), false)) .setSettings(Settings.builder().put(BitsetFilterCache.INDEX_LOAD_RANDOM_ACCESS_FILTERS_EAGERLY_SETTING.getKey(), false))
.addMapping("employee", mapping) .addMapping("employee", mapping)
.addMapping("queries", "query", "type=percolator")
); );
client().prepareIndex("test", "queries", "q1").setSource(jsonBuilder().startObject() client().prepareIndex("test", "employee", "q1").setSource(jsonBuilder().startObject()
.field("query", QueryBuilders.nestedQuery("employee", .field("query", QueryBuilders.nestedQuery("employee",
QueryBuilders.matchQuery("employee.name", "virginia potts").operator(Operator.AND), ScoreMode.Avg) QueryBuilders.matchQuery("employee.name", "virginia potts").operator(Operator.AND), ScoreMode.Avg)
).endObject()) ).endObject())
@ -659,6 +659,11 @@ public class PercolatorQuerySearchIT extends ESSingleNodeTestCase {
mapping.startObject(); mapping.startObject();
{ {
mapping.startObject("properties"); mapping.startObject("properties");
{
mapping.startObject("query");
mapping.field("type", "percolator");
mapping.endObject();
}
{ {
mapping.startObject("companyname"); mapping.startObject("companyname");
mapping.field("type", "text"); mapping.field("type", "text");
@ -684,10 +689,9 @@ public class PercolatorQuerySearchIT extends ESSingleNodeTestCase {
mapping.endObject(); mapping.endObject();
createIndex("test", client().admin().indices().prepareCreate("test") createIndex("test", client().admin().indices().prepareCreate("test")
.addMapping("employee", mapping) .addMapping("employee", mapping)
.addMapping("queries", "query", "type=percolator")
); );
Script script = new Script(ScriptType.INLINE, MockScriptPlugin.NAME, "use_fielddata_please", Collections.emptyMap()); Script script = new Script(ScriptType.INLINE, MockScriptPlugin.NAME, "use_fielddata_please", Collections.emptyMap());
client().prepareIndex("test", "queries", "q1").setSource(jsonBuilder().startObject() client().prepareIndex("test", "employee", "q1").setSource(jsonBuilder().startObject()
.field("query", QueryBuilders.nestedQuery("employees", .field("query", QueryBuilders.nestedQuery("employees",
QueryBuilders.scriptQuery(script), ScoreMode.Avg) QueryBuilders.scriptQuery(script), ScoreMode.Avg)
).endObject()).get(); ).endObject()).get();