Merge branch 'main' into rename-text-embeddings-to-dense-embeddings

Author: DonalEvans

docs/changelog/136143.yaml

@@ -0,0 +1,6 @@
+pr: 136143
+summary: Optionally ignore field when indexed field name exceeds length limit
+area: Mapping
+type: enhancement
+issues:
+ - 135700

docs/changelog/136448.yaml

@@ -0,0 +1,6 @@
+pr: 136448
+summary: Add `m` alias for `minute` duration literal
+area: ES|QL
+type: enhancement
+issues:
+ - 135552

docs/reference/elasticsearch/index-settings/mapping-limit.md

@@ -46,6 +46,9 @@ $$$ignore-dynamic-beyond-limit$$$
 `index.mapping.field_name_length.limit`
 :   Setting for the maximum length of a field name. This setting isn’t really something that addresses mappings explosion but might still be useful if you want to limit the field length. It usually shouldn’t be necessary to set this setting. The default is okay unless a user starts to add a huge number of fields with really long names. Default is `Long.MAX_VALUE` (no limit).
 
+`index.mapping.field_name_length.ignore_dynamic_beyond_limit` {applies_to}`stack: ga 9.3`
+:   This setting determines what happens when a the name of a dynamically mapped field would exceed the configured maximum length. When set to `false` (the default), the index request of the document that tries to add a dynamic field to the mapping will fail with the message `Field name [x] is longer than the limit of [y] characters`. When set to `true`, the index request will not fail. Instead, fields that would exceed the limit are not added to the mapping, similar to [`dynamic: false`](/reference/elasticsearch/mapping-reference/dynamic.md). The fields that were not added to the mapping will be added to the [`_ignored` field](/reference/elasticsearch/mapping-reference/mapping-ignored-field.md). The default value is `false`.
+
 `index.mapping.dimension_fields.limit`
 :   (Dynamic, integer) Maximum number of [time series dimensions](docs-content://manage-data/data-store/data-streams/time-series-data-stream-tsds.md#time-series-dimension) for the index. Defaults to `32768`.
 

docs/reference/query-languages/esql/esql-time-spans.md

@@ -120,7 +120,7 @@ POST /_query
 | week | w, weeks |
 | day | d, days |
 | hour | h, hours |
-| minute | min, minutes |
+| minute | m, min, minutes |
 | second | s, sec, seconds |
 | millisecond | ms, milliseconds |
 

muted-tests.yml

@@ -281,9 +281,6 @@ tests:
 - class: org.elasticsearch.xpack.profiling.action.GetStatusActionIT
   method: testWaitsUntilResourcesAreCreated
   issue: https://github.com/elastic/elasticsearch/issues/129486
-- class: org.elasticsearch.upgrades.MlJobSnapshotUpgradeIT
-  method: testSnapshotUpgrader
-  issue: https://github.com/elastic/elasticsearch/issues/98560
 - class: org.elasticsearch.search.query.VectorIT
   method: testFilteredQueryStrategy
   issue: https://github.com/elastic/elasticsearch/issues/129517
@@ -666,6 +663,9 @@ tests:
 - class: org.elasticsearch.xpack.inference.integration.SemanticTextInferenceFieldsIT
   method: testExcludeInferenceFieldsFromSourceOldIndexVersions
   issue: https://github.com/elastic/elasticsearch/issues/136452
+- class: org.elasticsearch.xpack.remotecluster.CrossClusterEsqlRCS2UnavailableRemotesIT
+  method: testEsqlRcs2UnavailableRemoteScenarios
+  issue: https://github.com/elastic/elasticsearch/issues/136493
 
 # Examples:
 #

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/index/100_field_name_length_limit.yml

@@ -0,0 +1,213 @@
+setup:
+  - requires:
+      cluster_features: ["mapper.ignore_dynamic_field_names_beyond_limit"]
+      reason: "setting must be present to be tested"
+
+---
+
+"Test field name length limit":
+  - do:
+      indices.create:
+        index: test_index
+        body:
+          settings:
+            index:
+              mapping:
+                field_name_length:
+                  ignore_dynamic_beyond_limit: true
+                  limit: 45
+          mappings:
+            dynamic: true
+
+  - do:
+      index:
+        index: test_index
+        id: 1
+        refresh: true
+        body:
+          foo:
+            test_really_long_field_name_that_will_be_ignored: foo
+            field_name_not_ignored: 10
+
+  - do:
+      indices.get_mapping:
+        index: test_index
+
+  - match: { test_index.mappings.properties.foo.properties.test_really_long_field_name_that_will_be_ignored: null }
+  - match: { test_index.mappings.properties.foo.properties.field_name_not_ignored.type: long }
+
+  - do:
+      get:
+        index: test_index
+        id: 1
+        _source: true
+        stored_fields: [_ignored]
+  - match:
+      _source:
+        foo:
+          test_really_long_field_name_that_will_be_ignored: foo
+          field_name_not_ignored: 10
+  - match: { _ignored: [ "foo.test_really_long_field_name_that_will_be_ignored" ] }
+
+---
+
+"Test field name length limit array":
+  - do:
+      indices.create:
+        index: test_index
+        body:
+          settings:
+            index:
+              mapping:
+                field_name_length:
+                  ignore_dynamic_beyond_limit: true
+                  limit: 45
+          mappings:
+            dynamic: true
+
+  - do:
+      index:
+        index: test_index
+        id: 1
+        refresh: true
+        body:
+          foo:
+            test_really_long_field_name_that_will_be_ignored: [ foo, bar, baz ]
+            field_name_not_ignored: [ 10, 20, 30 ]
+
+  - do:
+      indices.get_mapping:
+        index: test_index
+
+  - match: { test_index.mappings.properties.foo.properties.test_really_long_field_name_that_will_be_ignored: null }
+  - match: { test_index.mappings.properties.foo.properties.field_name_not_ignored.type: long }
+
+  - do:
+      get:
+        index: test_index
+        id: 1
+        _source: true
+        stored_fields: [ _ignored ]
+
+  - match:
+      _source:
+        foo:
+          test_really_long_field_name_that_will_be_ignored: [ foo, bar, baz ]
+          field_name_not_ignored: [ 10, 20, 30 ]
+  - match: {_ignored:["foo.test_really_long_field_name_that_will_be_ignored"]}
+
+---
+
+"Test field name length limit synthetic source":
+  - do:
+      indices.create:
+        index: test_index
+        body:
+          settings:
+            index:
+              mapping:
+                source.mode: synthetic
+                field_name_length:
+                  ignore_dynamic_beyond_limit: true
+                  limit: 45
+          mappings:
+            dynamic: true
+
+  - do:
+      index:
+        index: test_index
+        id: 1
+        refresh: true
+        body:
+          foo:
+            test_really_long_field_name_that_will_be_ignored: foo
+            field_name_not_ignored: 10
+
+  - do:
+      indices.get_mapping:
+        index: test_index
+
+  - match: { test_index.mappings.properties.foo.properties.test_really_long_field_name_that_will_be_ignored: null }
+  - match: { test_index.mappings.properties.foo.properties.field_name_not_ignored.type: long }
+
+  - do:
+      get:
+        index: test_index
+        id: 1
+        _source: true
+        stored_fields: [ _ignored ]
+  - match:
+      _source:
+        foo:
+          test_really_long_field_name_that_will_be_ignored: foo
+          field_name_not_ignored: 10
+  - match: {_ignored:["foo.test_really_long_field_name_that_will_be_ignored"]}
+
+---
+
+"Test field name length limit array synthetic source":
+  - do:
+      indices.create:
+        index: test_index
+        body:
+          settings:
+            index:
+              mapping:
+                source.mode: synthetic
+                field_name_length:
+                  ignore_dynamic_beyond_limit: true
+                  limit: 45
+          mappings:
+            dynamic: true
+
+  - do:
+      index:
+        index: test_index
+        id: 1
+        refresh: true
+        body:
+          foo:
+            test_really_long_field_name_that_will_be_ignored: [ foo, bar, baz ]
+            field_name_not_ignored: [ 10, 20, 30 ]
+
+  - do:
+      indices.get_mapping:
+        index: test_index
+
+  - match: { test_index.mappings.properties.foo.properties.test_really_long_field_name_that_will_be_ignored: null }
+  - match: { test_index.mappings.properties.foo.properties.field_name_not_ignored.type: long }
+
+  - do:
+      get:
+        index: test_index
+        id: 1
+        _source: true
+        stored_fields: [ _ignored ]
+  - match:
+      _source:
+        foo:
+          test_really_long_field_name_that_will_be_ignored: [ foo, bar, baz ]
+          field_name_not_ignored: [ 10, 20, 30 ]
+  - match: {_ignored:["foo.test_really_long_field_name_that_will_be_ignored"]}
+
+---
+
+"Test field name length limit with static mapping":
+  - do:
+      catch: /illegal_argument_exception/
+      indices.create:
+        index: test_index
+        body:
+          settings:
+            index:
+              mapping:
+                field_name_length:
+                  ignore_dynamic_beyond_limit: true
+                  limit: 45
+          mappings:
+            dynamic: false
+            properties:
+              test_really_long_field_name_that_will_be_ignored:
+                type: text
+
+  - match: {error.reason: "Field name [test_really_long_field_name_that_will_be_ignored] is longer than the limit of [45] characters"}

server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterHealthIT.java

@@ -16,6 +16,7 @@
 import org.elasticsearch.action.support.PlainActionFuture;
 import org.elasticsearch.cluster.health.ClusterHealthStatus;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
+import org.elasticsearch.cluster.metadata.Metadata;
 import org.elasticsearch.cluster.routing.UnassignedInfo;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.Priority;
@@ -56,8 +57,14 @@ public void testSimpleLocalHealth() {
     }
 
     public void testHealth() {
+        logger.info("--> running cluster health for '_all' on an empty cluster");
+        ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, Metadata.ALL).get();
+        assertThat(healthResponse.isTimedOut(), equalTo(false));
+        assertThat(healthResponse.getStatus(), equalTo(ClusterHealthStatus.GREEN));
+        assertThat(healthResponse.getIndices().isEmpty(), equalTo(true));
+
         logger.info("--> running cluster health on an index that does not exists");
-        ClusterHealthResponse healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "test1")
+        healthResponse = clusterAdmin().prepareHealth(TEST_REQUEST_TIMEOUT, "test1")
             .setWaitForYellowStatus()
             .setTimeout(TimeValue.timeValueSeconds(1))
             .get();

server/src/internalClusterTest/java/org/elasticsearch/synonyms/SynonymsManagementAPIServiceIT.java

@@ -15,6 +15,7 @@
 import org.elasticsearch.action.bulk.BulkResponse;
 import org.elasticsearch.cluster.ClusterName;
 import org.elasticsearch.cluster.ClusterState;
+import org.elasticsearch.common.Strings;
 import org.elasticsearch.index.mapper.extras.MapperExtrasPlugin;
 import org.elasticsearch.indices.IndexCreationException;
 import org.elasticsearch.plugins.Plugin;
@@ -316,11 +317,7 @@ public void testCreateSynonymsWithYellowSynonymsIndex() throws Exception {
             @Override
             void checkSynonymsIndexHealth(ActionListener<ClusterHealthResponse> listener) {
                 ClusterState clusterState = ClusterState.builder(ClusterName.DEFAULT).build();
-                ClusterHealthResponse response = new ClusterHealthResponse(
-                    randomIdentifier(),
-                    new String[] { SynonymsManagementAPIService.SYNONYMS_INDEX_CONCRETE_NAME },
-                    clusterState
-                );
+                ClusterHealthResponse response = new ClusterHealthResponse(randomIdentifier(), Strings.EMPTY_ARRAY, clusterState);
                 response.setTimedOut(true);
                 listener.onResponse(response);
             }

server/src/main/java/org/elasticsearch/TransportVersions.java

@@ -77,6 +77,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion V_8_15_0 = def(8_702_0_02);
     public static final TransportVersion V_8_15_2 = def(8_702_0_03);
     public static final TransportVersion V_8_16_0 = def(8_772_0_01);
+    public static final TransportVersion V_8_16_1 = def(8_772_0_04);
     // TODO: leave this version until the very end to satisfy max transport version test
     public static final TransportVersion INITIAL_ELASTICSEARCH_8_17_5 = def(8_797_0_05);
 

server/src/main/java/org/elasticsearch/action/admin/cluster/node/info/NodeInfo.java

@@ -66,7 +66,11 @@ public NodeInfo(StreamInput in) throws IOException {
         super(in);
         if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_12_0)) {
             version = in.readString();
-            compatibilityVersions = CompatibilityVersions.readVersion(in);
+            if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) {
+                compatibilityVersions = CompatibilityVersions.readVersion(in);
+            } else {
+                compatibilityVersions = new CompatibilityVersions(TransportVersion.readVersion(in), Map.of()); // unknown mappings versions
+            }
             indexVersion = IndexVersion.readVersion(in);
         } else {
             Version legacyVersion = Version.readVersion(in);
@@ -247,7 +251,11 @@ public void writeTo(StreamOutput out) throws IOException {
         } else {
             Version.writeVersion(Version.fromString(version), out);
         }
-        compatibilityVersions.writeTo(out);
+        if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_16_1)) {
+            compatibilityVersions.writeTo(out);
+        } else if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_8_0)) {
+            TransportVersion.writeVersion(compatibilityVersions.transportVersion(), out);
+        }
         if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_11_X)) {
             IndexVersion.writeVersion(indexVersion, out);
             out.writeMap(componentVersions, StreamOutput::writeString, StreamOutput::writeVInt);