Merge branch 'main' into cache-interface

# Conflicts:
#	server/src/main/java/org/elasticsearch/common/cache/Cache.java

Author: mjmbischoff

modules/ingest-geoip/src/main/java/org/elasticsearch/ingest/geoip/GeoIpCache.java

@@ -120,7 +120,7 @@ public int count() {
      * @return Current stats about this cache
      */
     public CacheStats getCacheStats() {
-        Cache.CacheStats stats = cache.stats();
+        Cache.Stats stats = cache.stats();
         return new CacheStats(
             cache.count(),
             stats.getHits(),

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

@@ -396,16 +396,16 @@ public void testShardWriteLoadsArePresent() {
             // Verify that each shard has write-load reported.
             final ClusterState state = getInstanceFromNode(ClusterService.class).state();
             assertEquals(state.projectState(ProjectId.DEFAULT).metadata().getTotalNumberOfShards(), shardWriteLoads.size());
-            double maximumLoadRecorded = 0;
             for (IndexMetadata indexMetadata : state.projectState(ProjectId.DEFAULT).metadata()) {
+                double maximumLoadRecorded = 0;
                 for (int i = 0; i < indexMetadata.getNumberOfShards(); i++) {
                     final ShardId shardId = new ShardId(indexMetadata.getIndex(), i);
                     assertTrue(shardWriteLoads.containsKey(shardId));
                     maximumLoadRecorded = Math.max(shardWriteLoads.get(shardId), maximumLoadRecorded);
                 }
+                // Each index should have seen some write-load
+                assertThat(maximumLoadRecorded, greaterThan(0.0));
             }
-            // And that at least one is greater than zero
-            assertThat(maximumLoadRecorded, greaterThan(0.0));
         } finally {
             updateClusterSettings(
                 Settings.builder().putNull(WriteLoadConstraintSettings.WRITE_LOAD_DECIDER_ENABLED_SETTING.getKey()).build()

server/src/main/java/org/elasticsearch/common/cache/Cache.java

@@ -141,7 +141,7 @@ default void refresh() {}
      *
      * @return the current cache statistics
      */
-    CacheStats stats();
+    Stats stats();
 
     /**
      * Performs an action for each cache entry in the cache. While iterating over the cache entries this method might use locks. As such,
@@ -157,7 +157,7 @@ default void refresh() {}
      * @param misses number of times no cached value could be found
      * @param evictions number of entries that have been evicted
      */
-    record CacheStats(long hits, long misses, long evictions) {
+    record Stats(long hits, long misses, long evictions) {
 
         public long getHits() {
             return hits;

x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/security/authz/permission/FieldPermissionsCache.java

@@ -49,7 +49,7 @@ public FieldPermissionsCache(Settings settings) {
             .build();
     }
 
-    public Cache.CacheStats getCacheStats() {
+    public Cache.Stats getCacheStats() {
         return cache.stats();
     }
 

x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/security/authz/RoleDescriptorTests.java

@@ -578,7 +578,7 @@ public void testParsingFieldPermissionsUsesCache() throws IOException {
         FieldPermissionsCache fieldPermissionsCache = new FieldPermissionsCache(Settings.EMPTY);
         RoleDescriptor.setFieldPermissionsCache(fieldPermissionsCache);
 
-        final Cache.CacheStats beforeStats = fieldPermissionsCache.getCacheStats();
+        final Cache.Stats beforeStats = fieldPermissionsCache.getCacheStats();
 
         final String json = """
             {
@@ -604,7 +604,7 @@ public void testParsingFieldPermissionsUsesCache() throws IOException {
         RoleDescriptor.parserBuilder().build().parse("test", new BytesArray(json), XContentType.JSON);
 
         final int numberOfFieldSecurityBlocks = 2;
-        final Cache.CacheStats betweenStats = fieldPermissionsCache.getCacheStats();
+        final Cache.Stats betweenStats = fieldPermissionsCache.getCacheStats();
         assertThat(betweenStats.getMisses(), equalTo(beforeStats.getMisses() + numberOfFieldSecurityBlocks));
         assertThat(betweenStats.getHits(), equalTo(beforeStats.getHits()));
 
@@ -613,7 +613,7 @@ public void testParsingFieldPermissionsUsesCache() throws IOException {
             RoleDescriptor.parserBuilder().build().parse("test", new BytesArray(json), XContentType.JSON);
         }
 
-        final Cache.CacheStats afterStats = fieldPermissionsCache.getCacheStats();
+        final Cache.Stats afterStats = fieldPermissionsCache.getCacheStats();
         assertThat(afterStats.getMisses(), equalTo(betweenStats.getMisses()));
         assertThat(afterStats.getHits(), equalTo(beforeStats.getHits() + numberOfFieldSecurityBlocks * iterations));
     }

x-pack/plugin/enrich/src/main/java/org/elasticsearch/xpack/enrich/EnrichCache.java

@@ -137,7 +137,7 @@ void put(CacheKey cacheKey, CacheValue cacheValue) {
     }
 
     public EnrichStatsAction.Response.CacheStats getStats(String localNodeId) {
-        Cache.CacheStats cacheStats = cache.stats();
+        Cache.Stats cacheStats = cache.stats();
         return new EnrichStatsAction.Response.CacheStats(
             localNodeId,
             cache.count(),

x-pack/plugin/esql-core/src/main/java/org/elasticsearch/xpack/esql/core/expression/UnresolvedAttribute.java

@@ -19,7 +19,16 @@
 import java.util.List;
 import java.util.Objects;
 
-// unfortunately we can't use UnresolvedNamedExpression
+/**
+ * An unresolved attribute. We build these while walking the syntax
+ * tree and then resolve them into other {@link Attribute} subclasses during
+ * analysis.
+ * <p>
+ *     For example, if they reference the data directly from lucene they'll be
+ *     {@link FieldAttribute}s. If they reference the results of another calculation
+ *     they will be {@link ReferenceAttribute}s.
+ * </p>
+ */
 public class UnresolvedAttribute extends Attribute implements Unresolvable {
     private final boolean customMessage;
     private final String unresolvedMsg;

x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/expression/function/UnresolvedFunction.java

@@ -7,6 +7,7 @@
 package org.elasticsearch.xpack.esql.expression.function;
 
 import org.elasticsearch.common.io.stream.StreamOutput;
+import org.elasticsearch.xpack.esql.analysis.Analyzer;
 import org.elasticsearch.xpack.esql.core.capabilities.Unresolvable;
 import org.elasticsearch.xpack.esql.core.capabilities.UnresolvedException;
 import org.elasticsearch.xpack.esql.core.expression.Expression;
@@ -24,6 +25,11 @@
 import java.util.Objects;
 import java.util.Set;
 
+/**
+ * An unresolved function call. We build these while walking the syntax
+ * tree and then resolve them into other {@link Function} subclasses during
+ * {@link Analyzer analysis}.
+ */
 public class UnresolvedFunction extends Function implements Unresolvable {
 
     private final String name;