Merge remote-tracking branch 'origin/main' into lucene_snapshot_10

Author: elasticsearchmachine

muted-tests.yml

@@ -306,6 +306,30 @@ tests:
 - class: org.elasticsearch.integration.KibanaUserRoleIntegTests
   method: testValidateQuery
   issue: https://github.com/elastic/elasticsearch/issues/113328
+- class: org.elasticsearch.index.mapper.LongRangeFieldMapperTests
+  method: testSyntheticSourceKeepArrays
+  issue: https://github.com/elastic/elasticsearch/issues/113335
+- class: org.elasticsearch.xpack.security.support.SecurityIndexManagerIntegTests
+  method: testOnIndexAvailableForSearchIndexAlreadyAvailable
+  issue: https://github.com/elastic/elasticsearch/issues/113336
+- class: org.elasticsearch.xpack.security.authz.SecurityScrollTests
+  method: testScrollIsPerUser
+  issue: https://github.com/elastic/elasticsearch/issues/113338
+- class: org.elasticsearch.index.mapper.IntegerRangeFieldMapperTests
+  method: testSyntheticSourceKeepAll
+  issue: https://github.com/elastic/elasticsearch/issues/113339
+- class: org.elasticsearch.xpack.test.rest.XPackRestIT
+  method: test {p0=analytics/top_metrics/sort by scaled float field}
+  issue: https://github.com/elastic/elasticsearch/issues/113340
+- class: org.elasticsearch.integration.KibanaUserRoleIntegTests
+  method: testFieldMappings
+  issue: https://github.com/elastic/elasticsearch/issues/113341
+- class: org.elasticsearch.smoketest.DocsClientYamlTestSuiteIT
+  method: test {yaml=reference/ccr/apis/follow/post-resume-follow/line_84}
+  issue: https://github.com/elastic/elasticsearch/issues/113343
+- class: org.elasticsearch.integration.KibanaUserRoleIntegTests
+  method: testSearchAndMSearch
+  issue: https://github.com/elastic/elasticsearch/issues/113345
 
 # Examples:
 #

server/src/main/java/org/elasticsearch/index/codec/tsdb/ES87TSDBDocValuesConsumer.java

@@ -562,7 +562,7 @@ public SortedNumericDocValues getSortedNumeric(FieldInfo field) throws IOExcepti
                     int i, docValueCount;
 
                     @Override
-                    public long nextValue() throws IOException {
+                    public long nextValue() {
                         return ords[i++];
                     }
 
@@ -572,7 +572,7 @@ public int docValueCount() {
                     }
 
                     @Override
-                    public boolean advanceExact(int target) throws IOException {
+                    public boolean advanceExact(int target) {
                         throw new UnsupportedOperationException();
                     }
 

server/src/main/java/org/elasticsearch/index/fielddata/AbstractBinaryDocValues.java

@@ -10,13 +10,9 @@
 package org.elasticsearch.index.fielddata;
 
 import org.apache.lucene.index.BinaryDocValues;
-import org.apache.lucene.search.DocIdSetIterator;
-
-import java.io.IOException;
 
 /**
- * Base implementation that throws an {@link IOException} for the
- * {@link DocIdSetIterator} APIs. This impl is safe to use for sorting and
+ * Base implementation. This impl is safe to use for sorting and
  * aggregations, which only use {@link #advanceExact(int)} and
  * {@link #binaryValue()}.
  */
@@ -28,12 +24,12 @@ public int docID() {
     }
 
     @Override
-    public int nextDoc() throws IOException {
+    public int nextDoc() {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public int advance(int target) throws IOException {
+    public int advance(int target) {
         throw new UnsupportedOperationException();
     }
 

server/src/main/java/org/elasticsearch/index/fielddata/AbstractNumericDocValues.java

@@ -23,12 +23,12 @@
 public abstract class AbstractNumericDocValues extends NumericDocValues {
 
     @Override
-    public int nextDoc() throws IOException {
+    public int nextDoc() {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public int advance(int target) throws IOException {
+    public int advance(int target) {
         throw new UnsupportedOperationException();
     }
 

server/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedDocValues.java

@@ -23,12 +23,12 @@
 public abstract class AbstractSortedDocValues extends SortedDocValues {
 
     @Override
-    public int nextDoc() throws IOException {
+    public int nextDoc() {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public int advance(int target) throws IOException {
+    public int advance(int target) {
         throw new UnsupportedOperationException();
     }
 

server/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedNumericDocValues.java

@@ -33,7 +33,7 @@ public int nextDoc() throws IOException {
     }
 
     @Override
-    public int advance(int target) throws IOException {
+    public int advance(int target) {
         throw new UnsupportedOperationException();
     }
 

server/src/main/java/org/elasticsearch/index/fielddata/AbstractSortedSetDocValues.java

@@ -28,12 +28,12 @@ public int docID() {
     }
 
     @Override
-    public int nextDoc() throws IOException {
+    public int nextDoc() {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public int advance(int target) throws IOException {
+    public int advance(int target) {
         throw new UnsupportedOperationException();
     }
 

server/src/main/java/org/elasticsearch/index/fielddata/AbstractSortingNumericDocValues.java

@@ -36,12 +36,12 @@ public int docID() {
     }
 
     @Override
-    public int nextDoc() throws IOException {
+    public int nextDoc() {
         throw new UnsupportedOperationException();
     }
 
     @Override
-    public int advance(int target) throws IOException {
+    public int advance(int target) {
         throw new UnsupportedOperationException();
     }
 

server/src/main/java/org/elasticsearch/index/fielddata/BinaryScriptFieldData.java

@@ -66,9 +66,5 @@ public long ramBytesUsed() {
             return 0;
         }
 
-        @Override
-        public void close() {
-
-        }
     }
 }

server/src/main/java/org/elasticsearch/index/fielddata/DoubleScriptFieldData.java

@@ -43,7 +43,7 @@ public DoubleScriptFieldData build(IndexFieldDataCache cache, CircuitBreakerServ
     }
 
     private final String fieldName;
-    DoubleFieldScript.LeafFactory leafFactory;
+    final DoubleFieldScript.LeafFactory leafFactory;
     private final ToScriptFieldFactory<SortedNumericDoubleValues> toScriptFieldFactory;
 
     private DoubleScriptFieldData(