TSDB: Add _tsid field to time_series indices

server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java

@@ -42,6 +42,8 @@
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.gateway.MetadataStateFormat;
 import org.elasticsearch.index.Index;
+import org.elasticsearch.index.IndexMode;
+import org.elasticsearch.index.IndexSettings;
 import org.elasticsearch.index.mapper.MapperService;
 import org.elasticsearch.index.seqno.SequenceNumbers;
 import org.elasticsearch.index.shard.IndexLongFieldRange;
@@ -476,6 +478,8 @@ public static APIBlock readFrom(StreamInput input) throws IOException {
 
     private final IndexLongFieldRange timestampRange;
 
+    private final IndexMode mode;
+
     private final int priority;
 
     private final long creationDate;
@@ -516,7 +520,8 @@ private IndexMetadata(
         final int priority,
         final long creationDate,
         final boolean ignoreDiskWatermarks,
-        @Nullable final List<String> tierPreference
+        @Nullable final List<String> tierPreference,
+        final IndexMode mode
     ) {
 
         this.index = index;
@@ -557,6 +562,9 @@ private IndexMetadata(
         this.creationDate = creationDate;
         this.ignoreDiskWatermarks = ignoreDiskWatermarks;
         this.tierPreference = tierPreference;
+        this.mode = mode;
+        assert false == (mode.organizeIntoTimeSeries() && isRoutingPartitionedIndex())
+            : "time series indices incompatible with routing partitioned indices";
         assert numberOfShards * routingFactor == routingNumShards : routingNumShards + " must be a multiple of " + numberOfShards;
     }
 
@@ -1455,6 +1463,8 @@ public IndexMetadata build() {
 
             final String uuid = settings.get(SETTING_INDEX_UUID, INDEX_UUID_NA_VALUE);
 
+            final IndexMode mode = IndexSettings.MODE.get(settings);
+
             List<String> tierPreference;
             try {
                 tierPreference = DataTier.parseTierList(DataTier.TIER_PREFERENCE_SETTING.get(settings));
@@ -1497,7 +1507,8 @@ public IndexMetadata build() {
                 IndexMetadata.INDEX_PRIORITY_SETTING.get(settings),
                 settings.getAsLong(SETTING_CREATION_DATE, -1L),
                 DiskThresholdDecider.SETTING_IGNORE_DISK_WATERMARKS.get(settings),
-                tierPreference
+                tierPreference,
+                mode
             );
         }
 
@@ -2050,6 +2061,10 @@ public static int getRoutingFactor(int sourceNumberOfShards, int targetNumberOfS
         return factor;
     }
 
+    public IndexMode mode() {
+        return mode;
+    }
+
     /**
      * Parses the number from the rolled over index name. It also supports the date-math format (ie. index name is wrapped in &lt; and &gt;)
      * E.g.

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

@@ -139,6 +139,11 @@ private void validateTimeStampField(Object timestampFieldValue) {
                 );
             }
         }
+
+        @Override
+        public boolean organizeIntoTimeSeries() {
+            return true;
+        }
     };
 
     private static final List<Setting<?>> TIME_SERIES_UNSUPPORTED = List.of(
@@ -171,4 +176,8 @@ private void validateTimeStampField(Object timestampFieldValue) {
      * Validate and/or modify the mappings after after they've been parsed.
      */
     public abstract void completeMappings(MappingParserContext context, Map<String, Object> mapping, RootObjectMapper.Builder builder);
+
+    public boolean organizeIntoTimeSeries() {
+        return false;
+    };
 }

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

@@ -650,7 +650,7 @@ public IndexSettings(final IndexMetadata indexMetadata, final Settings nodeSetti
         nodeName = Node.NODE_NAME_SETTING.get(settings);
         this.indexMetadata = indexMetadata;
         numberOfShards = settings.getAsInt(IndexMetadata.SETTING_NUMBER_OF_SHARDS, null);
-        mode = isTimeSeriesModeEnabled() ? scopedSettings.get(MODE) : IndexMode.STANDARD;
+        this.mode = isTimeSeriesModeEnabled() ? scopedSettings.get(MODE) : IndexMode.STANDARD;
 
         this.searchThrottled = INDEX_SEARCH_THROTTLED.get(settings);
         this.queryStringLenient = QUERY_STRING_LENIENT_SETTING.get(settings);