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

test: filtered query -> bool query 

Original commit: elastic/x-pack-elasticsearch@18ba61b9e9
This commit is contained in:
Martijn van Groningen 2015-09-10 13:18:19 +02:00
parent 0ef1bfb9a2
commit ed3821b65b
3 changed files with 46 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
watcher/src/test/java/org/elasticsearch/watcher/transform/search/SearchTransformTests.java
View File

@ -206,8 +206,8 @@ public class SearchTransformTests extends ESIntegTestCase {
refresh();
SearchRequest request = Requests.searchRequest("idx").source(searchSource().query(boolQuery()
.must(rangeQuery("date").gt("{{ctx.trigger.scheduled_time}}"))
.must(rangeQuery("date").lt("{{ctx.execution_time}}"))
.must(constantScoreQuery(rangeQuery("date").gt("{{ctx.trigger.scheduled_time}}")))
.must(constantScoreQuery(rangeQuery("date").lt("{{ctx.execution_time}}")))
.must(termQuery("value", "{{ctx.payload.value}}"))));
SearchTransform searchTransform = TransformBuilders.searchTransform(request).build();
@ -222,9 +222,12 @@ public class SearchTransformTests extends ESIntegTestCase {
assertThat(result, notNullValue());
assertThat(result.type(), is(SearchTransform.TYPE));
SearchResponse response = client().prepareSearch("idx").setQuery(
termQuery("value", "val_3"))
.get();
SearchResponse response = client().prepareSearch("idx").setSearchType(SearchType.QUERY_THEN_FETCH).setQuery(
boolQuery()
.must(constantScoreQuery(rangeQuery("date").gt(parseDate("2015-01-01T00:00:00", UTC))))
.must(constantScoreQuery(rangeQuery("date").lt(parseDate("2015-01-04T00:00:00", UTC))))
.must(termQuery("value", "val_3"))
).get();
Payload expectedPayload = new Payload.XContent(response);
// we need to remove the "took" field from teh response as this is the only field

36
watcher/src/test/resources/org/elasticsearch/watcher/input/search/config/scripts/test_disk_template.mustache
View File

@ -1,24 +1,26 @@
{
"query": {
"filtered": {
"query": {
"match": {
"event_type": {
"query": "a",
"type": "boolean"
"bool": {
"must" : [
{
"match": {
"event_type": {
"query": "a",
"type": "boolean"
}
}
},
{
"range": {
"_timestamp": {
"from": "{{ctx.trigger.scheduled_time}}||-{{seconds_param}}",
"to": "{{ctx.trigger.scheduled_time}}",
"include_lower": true,
"include_upper": true
}
}
}
},
"filter": {
"range": {
"_timestamp": {
"from": "{{ctx.trigger.scheduled_time}}||-{{seconds_param}}",
"to": "{{ctx.trigger.scheduled_time}}",
"include_lower": true,
"include_upper": true
}
}
}
]
}
}
}

36
watcher/src/test/resources/org/elasticsearch/watcher/transform/search/config/scripts/test_disk_template.mustache
View File

@ -1,24 +1,26 @@
{
"query": {
"filtered": {
"query": {
"match": {
"event_type": {
"query": "a",
"type": "boolean"
"bool": {
"must" : [
{
"match": {
"event_type": {
"query": "a",
"type": "boolean"
}
}
},
{
"range": {
"_timestamp": {
"from": "{{ctx.trigger.scheduled_time}}||-{{seconds_param}}",
"to": "{{ctx.trigger.scheduled_time}}",
"include_lower": true,
"include_upper": true
}
}
}
},
"filter": {
"range": {
"_timestamp": {
"from": "{{ctx.trigger.scheduled_time}}||-{{seconds_param}}",
"to": "{{ctx.trigger.scheduled_time}}",
"include_lower": true,
"include_upper": true
}
}
}
]
}
}
}