Move tsdb sort settings to IndexModeSettingsProvider

Author: jordan-powers

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/10_settings.yml

@@ -576,3 +576,29 @@ check time_series empty time bound value:
           "@timestamp": "2021-09-26T03:09:52.123456789Z",
           "metricset": "pod"
         }
+
+---
+default sort field:
+  - requires:
+      cluster_features: ["gte_v8.1.0"]
+      reason: introduced in 8.1.0
+
+  - do:
+      indices.create:
+        index: test_index
+        body:
+          settings:
+            index:
+              mode: time_series
+              routing_path: foo
+              time_series:
+                start_time: 2021-04-28T00:00:00Z
+                end_time: 2021-04-29T00:00:00Z
+
+  - do:
+      indices.get_settings:
+        index: test_index
+        include_defaults: true
+  - match: { .test_index.settings.index.mode: time_series }
+  - match: { .test_index.settings.index.sort.field: [ "_tsid", "@timestamp" ] }
+  - match: { .test_index.settings.index.sort.order: [ "asc", "desc" ] }

server/src/main/java/org/elasticsearch/index/IndexMode.java

@@ -38,6 +38,7 @@
 import org.elasticsearch.index.mapper.TimeSeriesIdFieldMapper;
 import org.elasticsearch.index.mapper.TimeSeriesRoutingHashFieldMapper;
 import org.elasticsearch.index.mapper.TsidExtractingIdFieldMapper;
+import org.elasticsearch.search.sort.SortOrder;
 
 import java.io.IOException;
 import java.time.Instant;
@@ -442,8 +443,6 @@ private static CompressedXContent createDefaultMapping(boolean includeHostName)
     }
 
     private static final List<Setting<?>> TIME_SERIES_UNSUPPORTED = List.of(
-        IndexSortConfig.INDEX_SORT_FIELD_SETTING,
-        IndexSortConfig.INDEX_SORT_ORDER_SETTING,
         IndexSortConfig.INDEX_SORT_MODE_SETTING,
         IndexSortConfig.INDEX_SORT_MISSING_SETTING
     );
@@ -629,6 +628,29 @@ public void provideAdditionalMetadata(
             }
             if (indexMode == LOOKUP) {
                 additionalSettings.put(IndexMetadata.SETTING_NUMBER_OF_SHARDS, 1);
+            } else if (indexMode == TIME_SERIES) {
+                var sortFields = List.of(TimeSeriesIdFieldMapper.NAME, DataStreamTimestampFieldMapper.DEFAULT_PATH);
+                var sortOrder = List.of(SortOrder.ASC, SortOrder.DESC);
+
+                if (IndexSortConfig.INDEX_SORT_FIELD_SETTING.exists(indexTemplateAndCreateRequestSettings)) {
+                    if (IndexSortConfig.INDEX_SORT_FIELD_SETTING.get(indexTemplateAndCreateRequestSettings).equals(sortFields) == false) {
+                        throw new IllegalArgumentException(
+                            tsdbMode() + " is incompatible with [" + IndexSortConfig.INDEX_SORT_FIELD_SETTING.getKey() + "]"
+                        );
+                    }
+                } else {
+                    additionalSettings.putList(IndexSortConfig.INDEX_SORT_FIELD_SETTING.getKey(), sortFields);
+                }
+
+                if (IndexSortConfig.INDEX_SORT_ORDER_SETTING.exists(indexTemplateAndCreateRequestSettings)) {
+                    if (IndexSortConfig.INDEX_SORT_ORDER_SETTING.get(indexTemplateAndCreateRequestSettings).equals(sortOrder) == false) {
+                        throw new IllegalArgumentException(
+                            tsdbMode() + " is incompatible with [" + IndexSortConfig.INDEX_SORT_ORDER_SETTING.getKey() + "]"
+                        );
+                    }
+                } else {
+                    additionalSettings.putList(IndexSortConfig.INDEX_SORT_ORDER_SETTING.getKey(), List.of("asc", "desc"));
+                }
             }
         }
     }

server/src/main/java/org/elasticsearch/index/IndexSortConfig.java

@@ -152,7 +152,7 @@ public static void validateSortSettings(Settings settings) {
         }
     }
 
-    public static class IndexSortConfigDefaults {
+    public static class LegacyIndexSortConfigDefaults {
         public static final FieldSortSpec[] TIME_SERIES_SORT, TIMESTAMP_SORT, HOSTNAME_TIMESTAMP_SORT, HOSTNAME_TIMESTAMP_BWC_SORT;
 
         static {
@@ -173,7 +173,12 @@ public static class IndexSortConfigDefaults {
                 new FieldSortSpec(DataStreamTimestampFieldMapper.DEFAULT_PATH) };
         }
 
-        public static FieldSortSpec[] getDefaultSortSpecs(IndexSettings indexSettings) {
+        public static FieldSortSpec[] getLegacyDefaultSortSpecs(IndexSettings indexSettings) {
+            var version = indexSettings.getIndexVersionCreated();
+            if (version.onOrAfter(IndexVersions.LOGSDB_EXPLICIT_INDEX_SORTING_DEFAULTS)) {
+                return null;
+            }
+
             final Settings settings = indexSettings.getSettings();
 
             IndexMode indexMode = indexSettings.getMode();
@@ -184,11 +189,6 @@ public static FieldSortSpec[] getDefaultSortSpecs(IndexSettings indexSettings) {
                     return null;
                 }
 
-                var version = indexSettings.getIndexVersionCreated();
-                if (version.onOrAfter(IndexVersions.LOGSDB_EXPLICIT_INDEX_SORTING_DEFAULTS)) {
-                    return null;
-                }
-
                 List<String> fields = INDEX_SORT_FIELD_SETTING.get(settings);
                 if (INDEX_SORT_ORDER_SETTING.exists(settings)) {
                     var order = INDEX_SORT_ORDER_SETTING.get(settings);
@@ -231,9 +231,9 @@ public IndexSortConfig(IndexSettings indexSettings) {
         this.indexName = indexSettings.getIndex().getName();
         this.indexMode = indexSettings.getMode();
 
-        var defaultSortSpecs = IndexSortConfigDefaults.getDefaultSortSpecs(indexSettings);
-        if (defaultSortSpecs != null) {
-            this.sortSpecs = defaultSortSpecs;
+        var legacyDefaultSortSpecs = LegacyIndexSortConfigDefaults.getLegacyDefaultSortSpecs(indexSettings);
+        if (legacyDefaultSortSpecs != null) {
+            this.sortSpecs = legacyDefaultSortSpecs;
             return;
         }
 

server/src/main/java/org/elasticsearch/search/aggregations/support/TimeSeriesIndexSearcher.java

@@ -39,7 +39,7 @@
 import java.util.List;
 import java.util.function.IntSupplier;
 
-import static org.elasticsearch.index.IndexSortConfig.IndexSortConfigDefaults.TIME_SERIES_SORT;
+import static org.elasticsearch.index.IndexSortConfig.LegacyIndexSortConfigDefaults.TIME_SERIES_SORT;
 
 /**
  * An IndexSearcher wrapper that executes the searches in time-series indices by traversing them by tsid and timestamp