From 449d5273fa44569d581f1e0c2663a27d04308eb9 Mon Sep 17 00:00:00 2001 From: Dimitris Athanasiou Date: Fri, 28 Feb 2020 18:04:38 +0200 Subject: [PATCH] [ML] Handle unmapped_type for sort field while searching mem usage Relates #52778 --- .../ml/action/TransportGetDataFrameAnalyticsStatsAction.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDataFrameAnalyticsStatsAction.java b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDataFrameAnalyticsStatsAction.java index ea91f0c77ec69..d2c8271cb4f1a 100644 --- a/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDataFrameAnalyticsStatsAction.java +++ b/x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportGetDataFrameAnalyticsStatsAction.java @@ -27,6 +27,7 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.persistent.PersistentTasksCustomMetaData; import org.elasticsearch.search.SearchHit; +import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortOrder; import org.elasticsearch.tasks.Task; import org.elasticsearch.threadpool.ThreadPool; @@ -235,7 +236,9 @@ private static SearchRequest buildMemoryUsageSearch(String configId) { .filter(QueryBuilders.termQuery(MemoryUsage.JOB_ID.getPreferredName(), configId)) .filter(QueryBuilders.termQuery(MemoryUsage.TYPE.getPreferredName(), MemoryUsage.TYPE_VALUE)); searchRequest.source().query(query); - searchRequest.source().sort(MemoryUsage.TIMESTAMP.getPreferredName(), SortOrder.DESC); + searchRequest.source().sort(SortBuilders.fieldSort(MemoryUsage.TIMESTAMP.getPreferredName()).order(SortOrder.DESC) + // We need this for the search not to fail when there are no mappings yet in the index + .unmappedType("long")); return searchRequest; }