Merge remote-tracking branch 'origin/main' into bugfix/esql-knn-options-change

# Conflicts:
#	x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/action/EsqlCapabilities.java

Author: elasticsearchmachine

.gitattributes

@@ -4,12 +4,13 @@ CHANGELOG.asciidoc  merge=union
 # Windows
 build-tools-internal/src/test/resources/org/elasticsearch/gradle/internal/release/*.asciidoc text eol=lf
 
+# ESQL parsing and source generated related assets
 x-pack/plugin/esql/compute/src/main/generated/** linguist-generated=true
 x-pack/plugin/esql/compute/src/main/generated-src/** linguist-generated=true
 x-pack/plugin/esql/src/main/antlr/*.tokens linguist-generated=true
 x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/*.interp linguist-generated=true
-x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseLexer*.java linguist-generated=true
-x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/EsqlBaseParser*.java linguist-generated=true
+x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/*BaseLexer*.java linguist-generated=true
+x-pack/plugin/esql/src/main/java/org/elasticsearch/xpack/esql/parser/*BaseParser*.java linguist-generated=true
 x-pack/plugin/esql/src/main/generated/** linguist-generated=true
 x-pack/plugin/esql/src/main/generated-src/** linguist-generated=true
 

…k/vector/ComputeNeighboursBenchmark.java …tization/ComputeNeighboursBenchmark.javabenchmarks/src/main/java/org/elasticsearch/benchmark/vector/ComputeNeighboursBenchmark.java renamed to benchmarks/src/main/java/org/elasticsearch/benchmark/vector/quantization/ComputeNeighboursBenchmark.java benchmarks/src/main/java/org/elasticsearch/benchmark/vector/ComputeNeighboursBenchmark.java renamed to benchmarks/src/main/java/org/elasticsearch/benchmark/vector/quantization/ComputeNeighboursBenchmark.java

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-package org.elasticsearch.benchmark.vector;
+package org.elasticsearch.benchmark.vector.quantization;
 
 import org.elasticsearch.common.logging.LogConfigurator;
 import org.elasticsearch.index.codec.vectors.cluster.NeighborHood;

…r/OptimizedScalarQuantizerBenchmark.java …n/OptimizedScalarQuantizerBenchmark.javabenchmarks/src/main/java/org/elasticsearch/benchmark/vector/OptimizedScalarQuantizerBenchmark.java renamed to benchmarks/src/main/java/org/elasticsearch/benchmark/vector/quantization/OptimizedScalarQuantizerBenchmark.java benchmarks/src/main/java/org/elasticsearch/benchmark/vector/OptimizedScalarQuantizerBenchmark.java renamed to benchmarks/src/main/java/org/elasticsearch/benchmark/vector/quantization/OptimizedScalarQuantizerBenchmark.java

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-package org.elasticsearch.benchmark.vector;
+package org.elasticsearch.benchmark.vector.quantization;
 
 import org.apache.lucene.index.VectorSimilarityFunction;
 import org.elasticsearch.common.logging.LogConfigurator;

…chmark/vector/PackAsBinaryBenchmark.java …/quantization/PackAsBinaryBenchmark.javabenchmarks/src/main/java/org/elasticsearch/benchmark/vector/PackAsBinaryBenchmark.java renamed to benchmarks/src/main/java/org/elasticsearch/benchmark/vector/quantization/PackAsBinaryBenchmark.java benchmarks/src/main/java/org/elasticsearch/benchmark/vector/PackAsBinaryBenchmark.java renamed to benchmarks/src/main/java/org/elasticsearch/benchmark/vector/quantization/PackAsBinaryBenchmark.java

@@ -6,7 +6,7 @@
  * your election, the "Elastic License 2.0", the "GNU Affero General Public
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
-package org.elasticsearch.benchmark.vector;
+package org.elasticsearch.benchmark.vector.quantization;
 
 import org.elasticsearch.common.logging.LogConfigurator;
 import org.elasticsearch.index.codec.vectors.BQVectorUtils;

…k/vector/TransposeHalfByteBenchmark.java …tization/TransposeHalfByteBenchmark.javabenchmarks/src/main/java/org/elasticsearch/benchmark/vector/TransposeHalfByteBenchmark.java renamed to benchmarks/src/main/java/org/elasticsearch/benchmark/vector/quantization/TransposeHalfByteBenchmark.java benchmarks/src/main/java/org/elasticsearch/benchmark/vector/TransposeHalfByteBenchmark.java renamed to benchmarks/src/main/java/org/elasticsearch/benchmark/vector/quantization/TransposeHalfByteBenchmark.java

@@ -6,7 +6,7 @@
  * your election, the "Elastic License 2.0", the "GNU Affero General Public
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
-package org.elasticsearch.benchmark.vector;
+package org.elasticsearch.benchmark.vector.quantization;
 
 import org.elasticsearch.common.logging.LogConfigurator;
 import org.elasticsearch.index.codec.vectors.BQVectorUtils;

…chmark/vector/DistanceBulkBenchmark.java …r/VectorScorerDistanceBulkBenchmark.javabenchmarks/src/main/java/org/elasticsearch/benchmark/vector/DistanceBulkBenchmark.java renamed to benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerDistanceBulkBenchmark.java benchmarks/src/main/java/org/elasticsearch/benchmark/vector/DistanceBulkBenchmark.java renamed to benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerDistanceBulkBenchmark.java

@@ -6,7 +6,7 @@
  * your election, the "Elastic License 2.0", the "GNU Affero General Public
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
-package org.elasticsearch.benchmark.vector;
+package org.elasticsearch.benchmark.vector.scorer;
 
 import org.apache.lucene.util.VectorUtil;
 import org.apache.lucene.util.quantization.OptimizedScalarQuantizer;
@@ -38,7 +38,7 @@
 @Measurement(iterations = 5, time = 1)
 // engage some noise reduction
 @Fork(value = 1)
-public class DistanceBulkBenchmark {
+public class VectorScorerDistanceBulkBenchmark {
 
     static {
         LogConfigurator.configureESLogging(); // native access requires logging to be initialized

…rk/vector/DistanceFunctionBenchmark.java …ctorScorerDistanceFunctionBenchmark.javabenchmarks/src/main/java/org/elasticsearch/benchmark/vector/DistanceFunctionBenchmark.java renamed to benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerDistanceFunctionBenchmark.java benchmarks/src/main/java/org/elasticsearch/benchmark/vector/DistanceFunctionBenchmark.java renamed to benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerDistanceFunctionBenchmark.java

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-package org.elasticsearch.benchmark.vector;
+package org.elasticsearch.benchmark.vector.scorer;
 
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.logging.LogConfigurator;
@@ -49,9 +49,9 @@
 @Measurement(iterations = 2)
 @BenchmarkMode(Mode.AverageTime)
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
-@OperationsPerInvocation(DistanceFunctionBenchmark.OPERATIONS)
+@OperationsPerInvocation(VectorScorerDistanceFunctionBenchmark.OPERATIONS)
 @State(Scope.Benchmark)
-public class DistanceFunctionBenchmark {
+public class VectorScorerDistanceFunctionBenchmark {
 
     public static final int OPERATIONS = 25000;
 
@@ -223,7 +223,7 @@ public void findBenchmarkImpl() {
     }
 
     @Fork(1)
-    @Benchmark
+    // @Benchmark
     public void benchmark(Blackhole blackhole) {
         for (int i = 0; i < OPERATIONS; ++i) {
             blackhole.consume(benchmarkImpl.getAsDouble());

…enchmark/vector/Int4ScorerBenchmark.java …or/scorer/VectorScorerInt4Benchmark.javabenchmarks/src/main/java/org/elasticsearch/benchmark/vector/Int4ScorerBenchmark.java renamed to benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerInt4Benchmark.java benchmarks/src/main/java/org/elasticsearch/benchmark/vector/Int4ScorerBenchmark.java renamed to benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerInt4Benchmark.java

@@ -6,7 +6,7 @@
  * your election, the "Elastic License 2.0", the "GNU Affero General Public
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
-package org.elasticsearch.benchmark.vector;
+package org.elasticsearch.benchmark.vector.scorer;
 
 import org.apache.lucene.index.VectorSimilarityFunction;
 import org.apache.lucene.store.Directory;
@@ -48,7 +48,7 @@
 @Measurement(iterations = 5, time = 1)
 // engage some noise reduction
 @Fork(value = 1)
-public class Int4ScorerBenchmark {
+public class VectorScorerInt4Benchmark {
 
     static {
         LogConfigurator.configureESLogging(); // native access requires logging to be initialized

…enchmark/vector/Int7ScorerBenchmark.java …or/scorer/VectorScorerInt7Benchmark.javabenchmarks/src/main/java/org/elasticsearch/benchmark/vector/Int7ScorerBenchmark.java renamed to benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerInt7Benchmark.java benchmarks/src/main/java/org/elasticsearch/benchmark/vector/Int7ScorerBenchmark.java renamed to benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerInt7Benchmark.java

@@ -6,7 +6,7 @@
  * your election, the "Elastic License 2.0", the "GNU Affero General Public
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
-package org.elasticsearch.benchmark.vector;
+package org.elasticsearch.benchmark.vector.scorer;
 
 import org.apache.lucene.index.VectorSimilarityFunction;
 import org.apache.lucene.store.Directory;
@@ -48,7 +48,7 @@
 @Measurement(iterations = 5, time = 1)
 // engage some noise reduction
 @Fork(value = 1)
-public class Int7ScorerBenchmark {
+public class VectorScorerInt7Benchmark {
 
     static {
         LogConfigurator.configureESLogging(); // native access requires logging to be initialized

…nchmark/vector/Int7uScorerBenchmark.java …r/scorer/VectorScorerInt7uBenchmark.javabenchmarks/src/main/java/org/elasticsearch/benchmark/vector/Int7uScorerBenchmark.java renamed to benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerInt7uBenchmark.java benchmarks/src/main/java/org/elasticsearch/benchmark/vector/Int7uScorerBenchmark.java renamed to benchmarks/src/main/java/org/elasticsearch/benchmark/vector/scorer/VectorScorerInt7uBenchmark.java

@@ -7,7 +7,7 @@
  * License v3.0 only", or the "Server Side Public License, v 1".
  */
 
-package org.elasticsearch.benchmark.vector;
+package org.elasticsearch.benchmark.vector.scorer;
 
 import org.apache.lucene.codecs.lucene99.Lucene99ScalarQuantizedVectorScorer;
 import org.apache.lucene.codecs.lucene99.OffHeapQuantizedByteVectorValues;
@@ -59,12 +59,12 @@
  * implementations;: scalar, lucene's panama-ized, and Elasticsearch's native.
  * Run with ./gradlew -p benchmarks run --args 'Int7uScorerBenchmark'
  */
-public class Int7uScorerBenchmark {
+public class VectorScorerInt7uBenchmark {
 
     static {
         LogConfigurator.configureESLogging(); // native access requires logging to be initialized
         if (supportsHeapSegments() == false) {
-            final Logger LOG = LogManager.getLogger(Int7uScorerBenchmark.class);
+            final Logger LOG = LogManager.getLogger(VectorScorerInt7uBenchmark.class);
             LOG.warn("*Query targets cannot run on " + "JDK " + Runtime.version());
         }
     }