TSDB: routingPath object type check improvement

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/tsdb/20_mapping.yml

@@ -66,7 +66,7 @@ top level dim object:
             settings:
               index:
                 mode: time_series
-                routing_path: [dim.*]
+                routing_path: [dim*]
                 time_series:
                   start_time: 2021-04-28T00:00:00Z
                   end_time: 2021-04-29T00:00:00Z
@@ -111,6 +111,39 @@ top level dim object:
                               type: double
                               time_series_metric: gauge
 
+---
+match object but no match object children:
+  - skip:
+      version: " - 8.0.99"
+      reason: introduced in 8.1.0
+
+  - do:
+      catch: '/All fields that match routing_path must be keywords with \[time_series_dimension: true\] and without the \[script\] parameter. \[dim\] was \[object\]./'
+      indices.create:
+        index: tsdb_index
+        body:
+          settings:
+            index:
+              mode: time_series
+              routing_path: [dim]
+              time_series:
+                start_time: 2021-04-28T00:00:00Z
+                end_time: 2021-04-29T00:00:00Z
+              number_of_replicas: 0
+              number_of_shards: 2
+          mappings:
+            properties:
+              "@timestamp":
+                type: date
+              dim:
+                properties:
+                  metricset:
+                    type: keyword
+                    time_series_dimension: true
+                  uid:
+                    type: keyword
+                    time_series_dimension: true
+
 ---
 non keyword matches routing_path:
   - skip:

server/src/main/java/org/elasticsearch/index/mapper/DocumentMapper.java

@@ -104,7 +104,9 @@ public void validate(IndexSettings settings, boolean checkLimits) {
                 mappingLookup.getFieldType(match).validateMatchedRoutingPath();
             }
             for (String objectName : mappingLookup.objectMappers().keySet()) {
-                if (Regex.simpleMatch(path, objectName)) {
+                // if path match objectName, and path is not end with '*' .
+                // it means the object' children can't match the path.
+                if (Regex.simpleMatch(path, objectName) && false == path.endsWith("*")) {
                     throw new IllegalArgumentException(
                         "All fields that match routing_path must be keywords with [time_series_dimension: true] "
                             + "and without the [script] parameter. ["

server/src/test/java/org/elasticsearch/index/TimeSeriesModeTests.java

@@ -85,8 +85,22 @@ public void testValidateAliasWithSearchRouting() {
         assertThat(e.getMessage(), equalTo("routing is forbidden on CRUD operations that target indices in [index.mode=time_series]"));
     }
 
-    public void testRoutingPathMatchesObject() {
-        Settings s = getSettings(randomBoolean() ? "dim.o" : "dim.*");
+    public void testRoutingPathMatchesObject() throws IOException {
+        Settings s = getSettings("dim.o*");
+        createMapperService(s, mapping(b -> {
+            b.startObject("dim").startObject("properties");
+            {
+                b.startObject("o").startObject("properties");
+                b.startObject("inner_dim").field("type", "keyword").field("time_series_dimension", true).endObject();
+                b.endObject().endObject();
+            }
+            b.startObject("dim").field("type", "keyword").field("time_series_dimension", true).endObject();
+            b.endObject().endObject();
+        }));
+    }
+
+    public void testRoutingPathMatchesObjectError() {
+        Settings s = getSettings("dim.o");
         Exception e = expectThrows(IllegalArgumentException.class, () -> createMapperService(s, mapping(b -> {
             b.startObject("dim").startObject("properties");
             {