Merge branch 'main' into checkNumNestedClauses

Author: iverase

build-tools-internal/src/main/resources/changelog-schema.json

@@ -86,6 +86,7 @@
             "Rollup",
             "SQL",
             "Search",
+            "Searchable Snapshots",
             "Security",
             "Snapshot/Restore",
             "Stats",

docs/changelog/128910.yaml

@@ -0,0 +1,5 @@
+pr: 128910
+summary: Fix `FieldAttribute` name usage in `InferNonNullAggConstraint`
+area: ES|QL
+type: bug
+issues: []

docs/reference/query-languages/esql/_snippets/lists/search-functions.md

@@ -2,5 +2,4 @@
 * [preview] [`MATCH`](../../functions-operators/search-functions.md#esql-match)
 * [preview] [`MATCH_PHRASE`](../../functions-operators/search-functions.md#esql-match_phrase)
 * [preview] [`QSTR`](../../functions-operators/search-functions.md#esql-qstr)
-  % * [preview] [
-  `TERM`](../../functions-operators/search-functions.md#esql-term)
+% * [preview] [`TERM`](../../functions-operators/search-functions.md#esql-term)

muted-tests.yml

@@ -520,6 +520,9 @@ tests:
 - class: org.elasticsearch.xpack.esql.qa.single_node.GenerativeForkIT
   method: test {lookup-join.MultipleBatches*
   issue: https://github.com/elastic/elasticsearch/issues/129210
+- class: org.elasticsearch.compute.data.sort.LongTopNSetTests
+  method: testCrankyBreaker
+  issue: https://github.com/elastic/elasticsearch/issues/129257
 
 # Examples:
 #

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/indices.stats/80_search_load.yml

@@ -0,0 +1,52 @@
+---
+setup:
+  - requires:
+      cluster_features: ["mapper.search_load_per_shard"]
+      reason: Shard search load stats were introduced in 9.1
+---
+"Search load is tracked at shard level":
+  - do:
+      indices.create:
+        index: index
+        body:
+          mappings:
+            properties:
+              name:
+                type: text
+              description:
+                type: text
+              price:
+                type: double
+
+  - do:
+      indices.stats:
+        index: "index"
+        level: shards
+        metric: [ search ]
+
+  - match: { _all.total.search.recent_search_load: 0.0 }
+  - match: { indices.index.total.search.recent_search_load: 0.0 }
+  - match: { indices.index.shards.0.0.search.recent_search_load: 0.0 }
+
+  - do:
+      index:
+        index: index
+        body: { "name": "specialty coffee", "description": "arabica coffee beans", "price": 100 }
+
+  - do:
+      search:
+        index: index
+        body:
+          query:
+            match: { name: "specialty coffee" }
+          size: 1
+
+  - do:
+      indices.stats:
+        index: "index"
+        level: shards
+        metric: [ search ]
+
+  - gte: { _all.total.search.recent_search_load: 0.0 }
+  - gte: { indices.index.total.search.recent_search_load: 0.0 }
+  - gte: { indices.index.shards.0.0.search.recent_search_load: 0.0 }

server/src/internalClusterTest/java/org/elasticsearch/index/shard/IndexShardIT.java

@@ -53,6 +53,7 @@
 import org.elasticsearch.index.flush.FlushStats;
 import org.elasticsearch.index.mapper.MapperMetrics;
 import org.elasticsearch.index.mapper.SourceToParse;
+import org.elasticsearch.index.search.stats.SearchStatsSettings;
 import org.elasticsearch.index.seqno.RetentionLeaseSyncer;
 import org.elasticsearch.index.seqno.SequenceNumbers;
 import org.elasticsearch.index.translog.TestTranslog;
@@ -638,7 +639,8 @@ public static final IndexShard newIndexShard(
             System::nanoTime,
             null,
             MapperMetrics.NOOP,
-            new IndexingStatsSettings(ClusterSettings.createBuiltInClusterSettings())
+            new IndexingStatsSettings(ClusterSettings.createBuiltInClusterSettings()),
+            new SearchStatsSettings(ClusterSettings.createBuiltInClusterSettings())
         );
     }
 

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

@@ -292,6 +292,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion SEARCH_SOURCE_EXCLUDE_VECTORS_PARAM = def(9_092_0_00);
     public static final TransportVersion SNAPSHOT_INDEX_SHARD_STATUS_MISSING_STATS = def(9_093_0_00);
     public static final TransportVersion ML_INFERENCE_ELASTIC_RERANK = def(9_094_0_00);
+    public static final TransportVersion SEARCH_LOAD_PER_INDEX_STATS = def(9_095_0_00);
 
     /*
      * STOP! READ THIS FIRST! No, really,

server/src/main/java/org/elasticsearch/action/admin/indices/dangling/delete/TransportDeleteDanglingIndexAction.java

@@ -29,7 +29,7 @@
 import org.elasticsearch.cluster.block.ClusterBlockException;
 import org.elasticsearch.cluster.metadata.IndexGraveyard;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
-import org.elasticsearch.cluster.metadata.Metadata;
+import org.elasticsearch.cluster.metadata.ProjectMetadata;
 import org.elasticsearch.cluster.service.ClusterService;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.core.SuppressForbidden;
@@ -126,9 +126,9 @@ private void submitUnbatchedTask(@SuppressWarnings("SameParameterValue") String
     }
 
     private ClusterState deleteDanglingIndex(ClusterState currentState, Index indexToDelete) {
-        final Metadata metaData = currentState.getMetadata();
+        final var project = currentState.metadata().getProject();
 
-        for (Map.Entry<String, IndexMetadata> each : metaData.getProject().indices().entrySet()) {
+        for (Map.Entry<String, IndexMetadata> each : project.indices().entrySet()) {
             if (indexToDelete.getUUID().equals(each.getValue().getIndexUUID())) {
                 throw new IllegalArgumentException(
                     "Refusing to delete dangling index "
@@ -143,18 +143,13 @@ private ClusterState deleteDanglingIndex(ClusterState currentState, Index indexT
         // By definition, a dangling index is an index not present in the cluster state and with no tombstone,
         // so we shouldn't reach this point if these conditions aren't met. For super-safety, however, check
         // that a tombstone doesn't already exist for this index.
-        if (metaData.getProject().indexGraveyard().containsIndex(indexToDelete)) {
+        if (project.indexGraveyard().containsIndex(indexToDelete)) {
             return currentState;
         }
 
-        Metadata.Builder metaDataBuilder = Metadata.builder(metaData);
-
-        final IndexGraveyard newGraveyard = IndexGraveyard.builder(metaDataBuilder.indexGraveyard())
-            .addTombstone(indexToDelete)
-            .build(settings);
-        metaDataBuilder.indexGraveyard(newGraveyard);
-
-        return ClusterState.builder(currentState).metadata(metaDataBuilder.build()).build();
+        final IndexGraveyard newGraveyard = IndexGraveyard.builder(project.indexGraveyard()).addTombstone(indexToDelete).build(settings);
+        final ProjectMetadata updatedProject = ProjectMetadata.builder(project).indexGraveyard(newGraveyard).build();
+        return ClusterState.builder(currentState).putProjectMetadata(updatedProject).build();
     }
 
     @Override

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

@@ -1780,17 +1780,6 @@ public Builder removeReservedState(ReservedStateMetadata metadata) {
             return this;
         }
 
-        @Deprecated(forRemoval = true)
-        public Builder indexGraveyard(final IndexGraveyard indexGraveyard) {
-            getSingleProject().indexGraveyard(indexGraveyard);
-            return this;
-        }
-
-        @Deprecated(forRemoval = true)
-        public IndexGraveyard indexGraveyard() {
-            return getSingleProject().indexGraveyard();
-        }
-
         @Deprecated(forRemoval = true)
         public Builder updateSettings(Settings settings, String... indices) {
             getSingleProject().updateSettings(settings, indices);

server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java

@@ -90,6 +90,7 @@
 import org.elasticsearch.index.MergePolicyConfig;
 import org.elasticsearch.index.engine.ThreadPoolMergeExecutorService;
 import org.elasticsearch.index.engine.ThreadPoolMergeScheduler;
+import org.elasticsearch.index.search.stats.SearchStatsSettings;
 import org.elasticsearch.index.shard.IndexingStatsSettings;
 import org.elasticsearch.indices.IndexingMemoryController;
 import org.elasticsearch.indices.IndicesQueryCache;
@@ -640,6 +641,7 @@ public void apply(Settings value, Settings current, Settings previous) {
         ShardsAvailabilityHealthIndicatorService.REPLICA_UNASSIGNED_BUFFER_TIME,
         DataStreamFailureStoreSettings.DATA_STREAM_FAILURE_STORED_ENABLED_SETTING,
         IndexingStatsSettings.RECENT_WRITE_LOAD_HALF_LIFE_SETTING,
+        SearchStatsSettings.RECENT_READ_LOAD_HALF_LIFE_SETTING,
         TransportGetAllocationStatsAction.CACHE_TTL_SETTING
     );
 }