Merge branch 'main' into kderusso/text-similarity-reranking-now-with-chunks

Author: kderusso

.buildkite/pull-requests.json

@@ -16,6 +16,24 @@
       "cancel_intermediate_builds": true,
       "cancel_intermediate_builds_on_comment": false
     },
+    {
+      "enabled": true,
+      "pipeline_slug": "elasticsearch-pull-request-transport-versions",
+      "allow_org_users": true,
+      "allowed_repo_permissions": [
+        "admin",
+        "write"
+      ],
+      "allowed_list": ["elastic-renovate-prod[bot]"],
+      "set_commit_status": false,
+      "build_on_commit": true,
+      "build_on_comment": true,
+      "trigger_comment_regex": "(run\\W+elasticsearch-ci.+)|(^\\s*((buildkite|@elastic(search)?machine)\\s*)?test\\s+this(\\s+please)?)",
+      "retrigger_label_regex": "v[0-9]+\\.[0-9]+\\.[0-9]+",
+      "cancel_intermediate_builds": true,
+      "cancel_intermediate_builds_on_comment": false,
+      "skip_duplicate_builds": true
+    },
     {
       "enabled": true,
       "pipeline_slug": "elasticsearch-pull-request-performance-benchmark",

muted-tests.yml

@@ -516,6 +516,9 @@ tests:
 - class: org.elasticsearch.action.support.nodes.TransportNodesActionTests
   method: testConcurrentlyCompletionAndCancellation
   issue: https://github.com/elastic/elasticsearch/issues/134277
+- class: org.elasticsearch.xpack.core.datastreams.TimeSeriesFeatureSetUsageTests
+  method: testEqualsAndHashcode
+  issue: https://github.com/elastic/elasticsearch/issues/134332
 
 # Examples:
 #

x-pack/plugin/esql/compute/src/main/java/org/elasticsearch/compute/lucene/LuceneTopNSourceOperator.java

@@ -16,8 +16,6 @@
 import org.apache.lucene.search.ScoreMode;
 import org.apache.lucene.search.Sort;
 import org.apache.lucene.search.SortField;
-import org.apache.lucene.search.SortedNumericSortField;
-import org.apache.lucene.search.SortedSetSortField;
 import org.apache.lucene.search.TopDocsCollector;
 import org.apache.lucene.search.TopFieldCollectorManager;
 import org.apache.lucene.search.TopScoreDocCollectorManager;
@@ -425,67 +423,5 @@ private static PerShardCollector newPerShardCollector(ShardContext context, List
         return new ScoringPerShardCollector(context, new TopFieldCollectorManager(sort, limit, null, 0).newCollector());
     }
 
-    private static int perDocMemoryUsage(SortField[] sorts) {
-        int usage = FIELD_DOC_SIZE;
-        for (SortField sort : sorts) {
-            usage += perDocMemoryUsage(sort);
-        }
-        return usage;
-    }
-
-    private static int perDocMemoryUsage(SortField sort) {
-        if (sort.getType() == SortField.Type.CUSTOM) {
-            return perDocMemoryUsageForCustom(sort);
-        }
-        return perDocMemoryUsageByType(sort, sort.getType());
-
-    }
-
-    private static int perDocMemoryUsageByType(SortField sort, SortField.Type type) {
-        return switch (type) {
-            case SCORE, DOC ->
-                /* SCORE and DOC are always part of ScoreDoc/FieldDoc
-                 * So they are in FIELD_DOC_SIZE already.
-                 * And they can't be removed. */
-                0;
-            case DOUBLE, LONG ->
-                // 8 for the long, 8 for the long copied to the topDoc.
-                16;
-            case INT, FLOAT ->
-                // 4 for the int, 8 boxed object copied to topDoc.
-                12;
-            case STRING ->
-                /* `keyword`-like fields. Compares ordinals when possible, otherwise
-                 * the strings. Does a bunch of deduplication, but in the worst
-                 * case we end up with the string itself, plus two BytesRefs. Let's
-                 * presume short-ish strings. */
-                1024;
-            case STRING_VAL ->
-                /* Other string fields. Compares the string itself. Let's assume two
-                 * 2kb per string because they tend to be bigger than the keyword
-                 * versions. */
-                2048;
-            case CUSTOM -> throw new IllegalArgumentException("unsupported type " + sort.getClass() + ": " + sort);
-            case REWRITEABLE -> {
-                assert false : "rewriteable  " + sort.getClass() + ": " + sort;
-                yield 2048;
-            }
-        };
-    }
-
-    private static int perDocMemoryUsageForCustom(SortField sort) {
-        return switch (sort) {
-            case SortedNumericSortField f -> perDocMemoryUsageByType(f, f.getNumericType());
-            case SortedSetSortField f -> perDocMemoryUsageByType(f, SortField.Type.STRING);
-            default -> {
-                if (sort.getClass().getName().equals("org.apache.lucene.document.LatLonPointSortField")) {
-                    yield perDocMemoryUsageByType(sort, SortField.Type.DOUBLE);
-                }
-                assert false : "unknown type " + sort.getClass() + ": " + sort;
-                yield 2048;
-            }
-        };
-    }
-
     private static final int FIELD_DOC_SIZE = Math.toIntExact(RamUsageEstimator.shallowSizeOf(FieldDoc.class));
 }