Merge branch 'main' into feature/count_by_trunc_with_filter

Author: GalLalouche

build-conventions/settings.gradle

@@ -8,7 +8,7 @@
  */
 
 plugins {
-  id "com.gradle.develocity" version "4.1.1"
+  id "com.gradle.develocity" version "4.2.2"
 }
 
 rootProject.name = 'build-conventions'

build-tools-internal/settings.gradle

@@ -9,7 +9,7 @@ pluginManagement {
 }
 
 plugins {
-  id "com.gradle.develocity" version "4.1.1"
+  id "com.gradle.develocity" version "4.2.2"
 }
 
 dependencyResolutionManagement {

build-tools/settings.gradle

@@ -10,7 +10,7 @@ pluginManagement {
     includeBuild "../build-conventions"
 }
 plugins {
-  id "com.gradle.develocity" version "4.1.1"
+  id "com.gradle.develocity" version "4.2.2"
 }
 include 'reaper'
 

docs/changelog/138632.yaml

@@ -0,0 +1,5 @@
+pr: 138632
+summary: Correctly handle empty inputs in `chunkedInfer()`
+area: Machine Learning
+type: bug
+issues: []

docs/reference/elasticsearch/mapping-reference/mapping-source-field.md

@@ -356,6 +356,9 @@ An expert-only feature is the ability to prune the contents of the `_source` fie
 Removing fields from the `_source` has similar downsides to disabling `_source`, especially the fact that you cannot reindex documents from one Elasticsearch index to another. Consider using [source filtering](/reference/elasticsearch/rest-apis/retrieve-selected-fields.md#source-filtering) instead.
 ::::
 
+::::{note}
+Source pruning is not available in {{serverless-short}}
+::::
 
 The `includes`/`excludes` parameters (which also accept wildcards) can be used as follows:
 

gradle/build.versions.toml

@@ -17,7 +17,7 @@ checkstyle = "com.puppycrawl.tools:checkstyle:11.0.1"
 commmons-io = "commons-io:commons-io:2.2"
 docker-compose = "com.avast.gradle:gradle-docker-compose-plugin:0.17.5"
 forbiddenApis = "de.thetaphi:forbiddenapis:3.8"
-gradle-enterprise = "com.gradle:develocity-gradle-plugin:4.1.1"
+gradle-enterprise = "com.gradle:develocity-gradle-plugin:4.2.2"
 hamcrest = "org.hamcrest:hamcrest:3.0"
 httpcore5 = "org.apache.httpcomponents.core5:httpcore5:5.3.3"
 httpclient5 = "org.apache.httpcomponents.client5:httpclient5:5.4.2"

gradle/verification-metadata.xml

@@ -964,9 +964,9 @@
             <sha256 value="48234cd74e35d91a31a683820a35b5b6d11b55527f32a5b162c6757408b95d7a" origin="Generated by Gradle"/>
          </artifact>
       </component>
-      <component group="com.gradle" name="develocity-gradle-plugin" version="4.1.1">
-         <artifact name="develocity-gradle-plugin-4.1.1.jar">
-            <sha256 value="21a509cfff19aad0eb23dcc2a1979345708ffa61d6f4488f8956caae51cb55ff" origin="Generated by Gradle"/>
+      <component group="com.gradle" name="develocity-gradle-plugin" version="4.2.2">
+         <artifact name="develocity-gradle-plugin-4.2.2.jar">
+            <sha256 value="3e45a8c18b34a8dddeb185c3e7030728634aaf31b9762052e5dae87f3d597fba" origin="Generated by Gradle"/>
          </artifact>
       </component>
       <component group="com.gradleup.gratatouille" name="gratatouille-runtime" version="0.0.8">

libs/x-content/src/main/java/org/elasticsearch/xcontent/XContentParser.java

@@ -225,4 +225,12 @@ <T> Map<String, T> map(Supplier<Map<String, T>> mapFactory, CheckedFunction<XCon
      * The callback to notify when parsing encounters a deprecated field.
      */
     DeprecationHandler getDeprecationHandler();
+
+    /**
+     * Switch to a different underlying parser.
+     * Typically, that's a noop but some filter parsers might want to wrap the underlying parser again.
+     */
+    default XContentParser switchParser(XContentParser parser) throws IOException {
+        return parser;
+    }
 }

modules/data-streams/src/javaRestTest/java/org/elasticsearch/datastreams/DisabledSecurityDataStreamTestCase.java

@@ -14,6 +14,7 @@
 import org.elasticsearch.common.util.concurrent.ThreadContext;
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
 import org.elasticsearch.test.cluster.FeatureFlag;
+import org.elasticsearch.test.cluster.local.LocalClusterConfigProvider;
 import org.elasticsearch.test.cluster.local.distribution.DistributionType;
 import org.elasticsearch.test.rest.ESRestTestCase;
 import org.junit.ClassRule;
@@ -24,12 +25,15 @@
  */
 public abstract class DisabledSecurityDataStreamTestCase extends ESRestTestCase {
 
+    protected static LocalClusterConfigProvider clusterConfig = c -> {};
+
     @ClassRule
     public static ElasticsearchCluster cluster = ElasticsearchCluster.local()
         .distribution(DistributionType.DEFAULT)
         .setting("xpack.security.enabled", "false")
         .setting("xpack.watcher.enabled", "false")
         .feature(FeatureFlag.INDEX_DIMENSIONS_TSID_OPTIMIZATION_FEATURE_FLAG)
+        .apply(() -> clusterConfig) // allows sub-classes to apply a custom cluster configuration
         .build();
 
     @Override

modules/data-streams/src/javaRestTest/java/org/elasticsearch/datastreams/TsdbDataStreamRestIT.java

@@ -8,12 +8,15 @@
  */
 package org.elasticsearch.datastreams;
 
+import org.elasticsearch.Build;
 import org.elasticsearch.client.Request;
 import org.elasticsearch.client.ResponseException;
+import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.common.time.DateFormatter;
 import org.elasticsearch.common.time.DateFormatters;
 import org.elasticsearch.common.time.FormatNames;
 import org.elasticsearch.index.mapper.DateFieldMapper;
+import org.elasticsearch.test.cluster.FeatureFlag;
 import org.elasticsearch.test.rest.ObjectPath;
 import org.junit.Before;
 
@@ -25,6 +28,7 @@
 import java.util.Set;
 
 import static org.elasticsearch.cluster.metadata.DataStreamTestHelper.backingIndexEqualTo;
+import static org.elasticsearch.index.IndexSettings.USE_SYNTHETIC_ID;
 import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.empty;
@@ -36,6 +40,10 @@
 
 public class TsdbDataStreamRestIT extends DisabledSecurityDataStreamTestCase {
 
+    static {
+        clusterConfig = config -> config.feature(FeatureFlag.TSDB_SYNTHETIC_ID_FEATURE_FLAG);
+    }
+
     private static final String COMPONENT_TEMPLATE = """
         {
             "template": {
@@ -53,7 +61,7 @@ public class TsdbDataStreamRestIT extends DisabledSecurityDataStreamTestCase {
                         "number_of_replicas": 1,
                         "number_of_shards": 2,
                         "mode": "time_series"
-                        SOURCEMODE
+                        RANDOM_INDEX_SETTINGS
                     }
                 },
                 "mappings":{
@@ -202,9 +210,51 @@ public class TsdbDataStreamRestIT extends DisabledSecurityDataStreamTestCase {
             """;
 
     private static String getTemplate() {
-        return TEMPLATE.replace("SOURCEMODE", randomFrom("", """
-            , "mapping": { "source": { "mode": "stored" } }""", """
-            , "mapping": { "source": { "mode": "synthetic" } }"""));
+        String sourceMode = switch (randomInt(2)) {
+            case 0 -> null;
+            case 1 -> """
+                "source": { "mode": "stored" }
+                """;
+            case 2 -> """
+                "source": { "mode": "synthetic" }
+                """;
+            default -> throw new AssertionError("Unknown mode");
+        };
+        String idMode = null;
+        if (Build.current().isSnapshot()) {
+            idMode = switch (randomInt(2)) {
+                case 0 -> null;
+                case 1 -> """
+                    "use_synthetic_id": "false"
+                    """;
+                case 2 -> """
+                    "use_synthetic_id": "true"
+                    """;
+                default -> throw new AssertionError("Unknown mode");
+            };
+        } else {
+            assertFalse(
+                "Setting is enabled by default and must now be tested on non-snapshot build too ",
+                USE_SYNTHETIC_ID.getDefault(Settings.EMPTY)
+            );
+        }
+        if (sourceMode == null && idMode == null) {
+            return TEMPLATE.replace("RANDOM_INDEX_SETTINGS", "");
+        }
+        var mapping = new StringBuilder("""
+            , "mapping": {
+            """);
+        if (sourceMode != null) {
+            mapping.append(sourceMode);
+        }
+        if (idMode != null) {
+            if (sourceMode != null) {
+                mapping.append(',');
+            }
+            mapping.append(idMode);
+        }
+        mapping.append('}');
+        return TEMPLATE.replace("RANDOM_INDEX_SETTINGS", mapping.toString());
     }
 
     private static boolean trialStarted = false;