Remove obsolet search type QUERY_AND_FETCH

Original commit: elastic/x-pack-elasticsearch@10329462bd
This commit is contained in:
Simon Willnauer 2017-02-06 18:26:01 +01:00
parent ccf3ac9c82
commit 14e97565fa
2 changed files with 2 additions and 5 deletions

View File

@ -51,7 +51,7 @@ public class HistoryTemplateSearchInputMappingsTests extends AbstractWatcherInte
refresh(); refresh();
WatcherSearchTemplateRequest request = new WatcherSearchTemplateRequest( WatcherSearchTemplateRequest request = new WatcherSearchTemplateRequest(
new String[]{index}, new String[]{type}, SearchType.QUERY_AND_FETCH, new String[]{index}, new String[]{type}, SearchType.QUERY_THEN_FETCH,
WatcherSearchTemplateRequest.DEFAULT_INDICES_OPTIONS, new BytesArray("{}") WatcherSearchTemplateRequest.DEFAULT_INDICES_OPTIONS, new BytesArray("{}")
); );
PutWatchResponse putWatchResponse = watcherClient().preparePutWatch("_id").setSource(watchBuilder() PutWatchResponse putWatchResponse = watcherClient().preparePutWatch("_id").setSource(watchBuilder()

View File

@ -253,9 +253,6 @@ public final class WatcherTestUtils {
} }
public static SearchType getRandomSupportedSearchType() { public static SearchType getRandomSupportedSearchType() {
return randomFrom( return randomFrom(SearchType.QUERY_THEN_FETCH, SearchType.DFS_QUERY_THEN_FETCH);
SearchType.QUERY_AND_FETCH,
SearchType.QUERY_THEN_FETCH,
SearchType.DFS_QUERY_THEN_FETCH);
} }
} }