Adjust profile tests

Author: javanna

rest-api-spec/build.gradle

@@ -57,6 +57,8 @@ tasks.named("precommit").configure {
 tasks.named("yamlRestCompatTestTransform").configure ({ task ->
   task.replaceValueInMatch("profile.shards.0.dfs.knn.0.query.0.description", "DocAndScoreQuery[0,...][0.009673266,...],0.009673266", "dfs knn vector profiling")
   task.replaceValueInMatch("profile.shards.0.dfs.knn.0.query.0.description", "DocAndScoreQuery[0,...][0.009673266,...],0.009673266", "dfs knn vector profiling with vector_operations_count")
+  task.replaceValueInMatch("profile.shards.0.dfs.knn.0.collector.0.name", "TopScoreDocCollector", "dfs knn vector profiling")
+  task.replaceValueInMatch("profile.shards.0.dfs.knn.0.query.0.description", "TopScoreDocCollector", "dfs knn vector profiling with vector_operations_count")
   task.skipTest("cat.aliases/10_basic/Deprecated local parameter", "CAT APIs not covered by compatibility policy")
   task.skipTest("cat.shards/10_basic/Help", "sync_id is removed in 9.0")
   task.skipTest("search/500_date_range/from, to, include_lower, include_upper deprecated", "deprecated parameters are removed in 9.0")

rest-api-spec/src/yamlRestTest/resources/rest-api-spec/test/search/370_profile.yml

@@ -230,7 +230,6 @@ dfs knn vector profiling:
   - gt: { profile.shards.0.dfs.knn.0.query.0.breakdown.create_weight: 0 }
   - gt: { profile.shards.0.dfs.knn.0.query.0.breakdown.create_weight_count: 0 }
   - gt: { profile.shards.0.dfs.knn.0.rewrite_time: 0 }
-  - match: { profile.shards.0.dfs.knn.0.collector.0.name: "SimpleTopScoreDocCollector" }
   - match: { profile.shards.0.dfs.knn.0.collector.0.reason: "search_top_hits" }
   - gt: { profile.shards.0.dfs.knn.0.collector.0.time_in_nanos: 0 }
 
@@ -275,6 +274,47 @@ dfs knn vector profiling description:
   - match: { hits.total.value: 1 }
   - match: { profile.shards.0.dfs.knn.0.query.0.description: "DocAndScoreQuery[0,...][0.009673266,...],0.009673266" }
 
+---
+dfs knn vector profiling collector name:
+  - requires:
+      cluster_features: "lucene_10_1_upgrade"
+      reason: collector name changed with lucene 10.1
+
+  - do:
+      indices.create:
+        index: images
+        body:
+          settings:
+            index.number_of_shards: 1
+          mappings:
+            properties:
+              image:
+                type: "dense_vector"
+                dims: 3
+                index: true
+                similarity: "l2_norm"
+
+  - do:
+      index:
+        index: images
+        id: "1"
+        refresh: true
+        body:
+          image: [1, 5, -20]
+
+  - do:
+      search:
+        index: images
+        body:
+          profile: true
+          knn:
+            field: "image"
+            query_vector: [-5, 9, -12]
+            k: 1
+            num_candidates: 100
+
+  - match: { profile.shards.0.dfs.knn.0.collector.0.name: "TopScoreDocCollector" }
+
 ---
 dfs knn vector profiling with vector_operations_count:
   - requires:
@@ -335,7 +375,6 @@ dfs knn vector profiling with vector_operations_count:
   - gt: { profile.shards.0.dfs.knn.0.query.0.breakdown.create_weight: 0 }
   - gt: { profile.shards.0.dfs.knn.0.query.0.breakdown.create_weight_count: 0 }
   - gt: { profile.shards.0.dfs.knn.0.rewrite_time: 0 }
-  - match: { profile.shards.0.dfs.knn.0.collector.0.name: "SimpleTopScoreDocCollector" }
   - match: { profile.shards.0.dfs.knn.0.collector.0.reason: "search_top_hits" }
   - gt: { profile.shards.0.dfs.knn.0.collector.0.time_in_nanos: 0 }
 

server/src/main/java/org/elasticsearch/search/SearchFeatures.java

@@ -18,9 +18,10 @@
 public final class SearchFeatures implements FeatureSpecification {
 
     public static final NodeFeature LUCENE_10_0_0_UPGRADE = new NodeFeature("lucene_10_upgrade");
+    public static final NodeFeature LUCENE_10_1_0_UPGRADE = new NodeFeature("lucene_10_1_upgrade");
 
     @Override
     public Set<NodeFeature> getFeatures() {
-        return Set.of(KnnVectorQueryBuilder.K_PARAM_SUPPORTED, LUCENE_10_0_0_UPGRADE);
+        return Set.of(KnnVectorQueryBuilder.K_PARAM_SUPPORTED, LUCENE_10_0_0_UPGRADE, LUCENE_10_1_0_UPGRADE);
     }
 }

server/src/test/java/org/elasticsearch/search/dfs/DfsPhaseTests.java

@@ -86,14 +86,14 @@ public void testSingleKnnSearch() throws IOException {
             List<QueryProfileShardResult> queryProfileShardResult = searchProfileDfsPhaseResult.getQueryProfileShardResult();
             assertNotNull(queryProfileShardResult);
             CollectorResult collectorResult = queryProfileShardResult.get(0).getCollectorResult();
-            assertEquals("SimpleTopScoreDocCollector", (collectorResult.getName()));
+            assertEquals("TopScoreDocCollector", (collectorResult.getName()));
             assertEquals("search_top_hits", (collectorResult.getReason()));
             assertTrue(collectorResult.getTime() > 0);
             List<CollectorResult> children = collectorResult.getChildrenResults();
             if (children.size() > 0) {
                 long totalTime = 0L;
                 for (CollectorResult child : children) {
-                    assertEquals("SimpleTopScoreDocCollector", (child.getName()));
+                    assertEquals("TopScoreDocCollector", (child.getName()));
                     assertEquals("search_top_hits", (child.getReason()));
                     totalTime += child.getTime();
                 }

server/src/test/java/org/elasticsearch/search/profile/query/ProfileCollectorManagerTests.java

@@ -135,7 +135,7 @@ public void testManagerWithSearcher() throws IOException {
             assertEquals(numDocs, topDocs.totalHits.value());
             CollectorResult result = profileCollectorManager.getCollectorTree();
             assertEquals("profiler_reason", result.getReason());
-            assertEquals("SimpleTopScoreDocCollector", result.getName());
+            assertEquals("TopScoreDocCollector", result.getName());
             assertTrue(result.getTime() > 0);
         }
     }