Merge branch 'main' into esql/remove_redundant_sort

Author: luigidellaquila

.github/workflows/comment-on-asciidoc-changes.yml

@@ -0,0 +1,21 @@
+---
+name: Comment on PR for .asciidoc changes
+
+on:
+  # We need to use pull_request_target to be able to comment on PRs from forks
+  pull_request_target:
+    types:
+      - synchronize
+      - opened
+      - reopened
+    branches:
+      - main
+      - master
+      - "9.0"
+
+jobs:
+  comment-on-asciidoc-change:
+    permissions:
+      contents: read
+      pull-requests: write
+    uses: elastic/docs-builder/.github/workflows/comment-on-asciidoc-changes.yml@main

branches.json

@@ -7,9 +7,6 @@
     {
       "branch": "8.16"
     },
-    {
-      "branch": "9.0"
-    },
     {
       "branch": "8.17"
     },

build-tools-internal/version.properties

@@ -1,5 +1,5 @@
 elasticsearch     = 9.0.0
-lucene            = 10.0.0
+lucene            = 10.1.0
 
 bundled_jdk_vendor = openjdk
 bundled_jdk = 23+37@3c5b90190c68498b986a97f276efd28a

docs/Versions.asciidoc

@@ -1,8 +1,8 @@
 
 include::{docs-root}/shared/versions/stack/{source_branch}.asciidoc[]
 
-:lucene_version:        10.0.0
-:lucene_version_path:   10_0_0
+:lucene_version:        10.1.0
+:lucene_version_path:   10_1_0
 :jdk:                   11.0.2
 :jdk_major:             11
 :build_type:            tar

docs/changelog/119308.yaml

@@ -0,0 +1,5 @@
+pr: 119308
+summary: Upgrade to Lucene 10.1.0
+area: Search
+type: upgrade
+issues: []

docs/reference/search/profile.asciidoc

@@ -176,7 +176,7 @@ The API returns the following result:
                 "time_in_nanos": 775274,
                 "children" : [
                   {
-                    "name": "SimpleTopScoreDocCollector",
+                    "name": "TopScoreDocCollector",
                     "reason": "search_top_hits",
                     "time_in_nanos": 775274
                   }
@@ -537,7 +537,7 @@ Looking at the previous example:
     "time_in_nanos": 775274,
     "children" : [
       {
-        "name": "SimpleTopScoreDocCollector",
+        "name": "TopScoreDocCollector",
         "reason": "search_top_hits",
         "time_in_nanos": 775274
       }
@@ -551,7 +551,7 @@ Looking at the previous example:
 
 
 We see a top-level collector named `QueryPhaseCollector` which holds a child
-`SimpleTopScoreDocCollector`. `SimpleTopScoreDocCollector` is the  default
+`TopScoreDocCollector`. `TopScoreDocCollector` is the  default
 "scoring and sorting" `Collector` used by {es}. The `reason` field attempts
 to give a plain English description of the class name. The `time_in_nanos`
 is similar to the time in the Query tree: a wall-clock time inclusive of all
@@ -751,7 +751,7 @@ The API returns the following result:
                 "time_in_nanos": 1945072,
                 "children": [
                   {
-                    "name": "SimpleTopScoreDocCollector",
+                    "name": "TopScoreDocCollector",
                     "reason": "search_top_hits",
                     "time_in_nanos": 22577
                   },
@@ -788,7 +788,7 @@ major portions of the query are represented:
 2. The second `TermQuery` (message:search) represents the `post_filter` query.
 
 The Collector tree is fairly straightforward, showing how a single
-QueryPhaseCollector that holds the normal scoring SimpleTopScoreDocCollector
+QueryPhaseCollector that holds the normal scoring TopScoreDocCollector
 used to collect top hits, as well as BucketCollectorWrapper to run all scoped
 aggregations.
 
@@ -1332,7 +1332,7 @@ One of the `dfs.knn` sections for a shard looks like the following:
         "rewrite_time" : 1275732,
         "collector" : [
             {
-                "name" : "SimpleTopScoreDocCollector",
+                "name" : "TopScoreDocCollector",
                 "reason" : "search_top_hits",
                 "time_in_nanos" : 17163
             }

docs/reference/troubleshooting/common-issues/disk-usage-exceeded.asciidoc

@@ -127,12 +127,14 @@ its {cloud}/ec-api-console.html[Elasticsearch API Console] to later
 with this resolution flow on {ess}, kindly reach out to
 https://support.elastic.co[Elastic Support] for assistance.
 
-== Prevent watermark errors
+[discrete]
+[[fix-watermark-errors-prevent]]
+=== Prevent watermark errors
 
-To avoid watermark errors in future, , perform one of the following actions:
+To avoid watermark errors in future, perform one of the following actions:
 
 * If you're using {ess}, {ece}, or {eck}: Enable <<xpack-autoscaling,autoscaling>>.
 
 * Set up {kibana-ref}/kibana-alerts.html[stack monitoring alerts] on top of
 <<monitor-elasticsearch-cluster,{es} monitoring>> to be notified before
-the flood-stage watermark is reached.
+the flood-stage watermark is reached.

gradle/verification-metadata.xml

@@ -11,6 +11,7 @@ apply plugin: 'elasticsearch.build'
 
 dependencies {
   compileOnly project(':libs:entitlement')
+  compileOnly project(':libs:core')
   implementation 'org.ow2.asm:asm:9.7.1'
   testImplementation project(":test:framework")
   testImplementation project(":libs:entitlement:bridge")

libs/entitlement/asm-provider/build.gradle

@@ -14,5 +14,7 @@
     requires org.objectweb.asm;
     requires org.elasticsearch.entitlement;
 
+    requires static org.elasticsearch.base; // for SuppressForbidden
+
     provides InstrumentationService with InstrumentationServiceImpl;
 }