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

Author: elasticsearchmachine

.swp

@@ -12,12 +12,11 @@
 import org.apache.lucene.util.BytesRef;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.exponentialhistogram.BucketIterator;
+import org.elasticsearch.exponentialhistogram.CompressedExponentialHistogram;
 import org.elasticsearch.exponentialhistogram.ExponentialHistogram;
 import org.elasticsearch.exponentialhistogram.ExponentialHistogramCircuitBreaker;
 import org.elasticsearch.exponentialhistogram.ExponentialHistogramGenerator;
 import org.elasticsearch.exponentialhistogram.ExponentialHistogramMerger;
-import org.elasticsearch.xpack.analytics.mapper.IndexWithCount;
-import org.elasticsearch.xpack.exponentialhistogram.CompressedExponentialHistogram;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.BenchmarkMode;
 import org.openjdk.jmh.annotations.Fork;
@@ -32,7 +31,6 @@
 import org.openjdk.jmh.annotations.Warmup;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 import java.util.concurrent.ThreadLocalRandom;
@@ -109,28 +107,24 @@ public void setUp() {
     }
 
     private ExponentialHistogram asCompressedHistogram(ExponentialHistogram histogram) {
-        List<IndexWithCount> negativeBuckets = new ArrayList<>();
-        List<IndexWithCount> positiveBuckets = new ArrayList<>();
-
-        BucketIterator it = histogram.negativeBuckets().iterator();
-        while (it.hasNext()) {
-            negativeBuckets.add(new IndexWithCount(it.peekIndex(), it.peekCount()));
-            it.advance();
-        }
-        it = histogram.positiveBuckets().iterator();
-        while (it.hasNext()) {
-            positiveBuckets.add(new IndexWithCount(it.peekIndex(), it.peekCount()));
-            it.advance();
-        }
-
-        long totalCount = histogram.zeroBucket().count() + histogram.negativeBuckets().valueCount() + histogram.positiveBuckets()
-            .valueCount();
         BytesStreamOutput histoBytes = new BytesStreamOutput();
         try {
-            CompressedExponentialHistogram.writeHistogramBytes(histoBytes, histogram.scale(), negativeBuckets, positiveBuckets);
+            CompressedExponentialHistogram.writeHistogramBytes(
+                histoBytes,
+                histogram.scale(),
+                histogram.negativeBuckets().iterator(),
+                histogram.positiveBuckets().iterator()
+            );
             CompressedExponentialHistogram result = new CompressedExponentialHistogram();
             BytesRef data = histoBytes.bytes().toBytesRef();
-            result.reset(histogram.zeroBucket().zeroThreshold(), totalCount, histogram.sum(), histogram.min(), histogram.max(), data);
+            result.reset(
+                histogram.zeroBucket().zeroThreshold(),
+                histogram.valueCount(),
+                histogram.sum(),
+                histogram.min(),
+                histogram.max(),
+                data
+            );
             return result;
         } catch (IOException e) {
             throw new RuntimeException(e);

benchmarks/src/main/java/org/elasticsearch/benchmark/exponentialhistogram/ExponentialHistogramMergeBench.java

@@ -26,8 +26,8 @@ dependencies {
   implementation project(":libs:plugin-scanner")
   implementation project(":libs:entitlement")
   // TODO: asm is picked up from the plugin scanner and entitlements, we should consolidate so it is not defined twice
-  implementation 'org.ow2.asm:asm:9.8'
-  implementation 'org.ow2.asm:asm-tree:9.8'
+  implementation 'org.ow2.asm:asm:9.9'
+  implementation 'org.ow2.asm:asm-tree:9.9'
 
   api "org.bouncycastle:bcpg-fips:1.0.7.1"
   api "org.bouncycastle:bc-fips:1.0.2.6"

distribution/tools/plugin-cli/build.gradle

@@ -0,0 +1,7 @@
+pr: 132455
+summary: "Make equals include ids for Alias, `TypedAttribute`"
+area: ES|QL
+type: bug
+issues:
+ - 131509
+ - 132634

docs/changelog/132455.yaml

@@ -0,0 +1,5 @@
+pr: 136133
+summary: Implement `network_direction` function
+area: ES|QL
+type: enhancement
+issues: []

docs/changelog/136133.yaml

@@ -0,0 +1,5 @@
+pr: 136386
+summary: Limit concurrent TLS handshakes
+area: Network
+type: enhancement
+issues: []

docs/changelog/136386.yaml

@@ -0,0 +1,5 @@
+pr: 136412
+summary: Add cached tokens to Unified API response
+area: Machine Learning
+type: enhancement
+issues: []

docs/changelog/136412.yaml

@@ -0,0 +1,6 @@
+pr: 136818
+summary: "ESQL: Fix lookup join filter pushdown to use semantic equality"
+area: ES|QL
+type: bug
+issues:
+  - 136599

docs/changelog/136818.yaml

@@ -0,0 +1,5 @@
+pr: 136881
+summary: Disallow `max_inner_product`, swap `dot_product` for `cosine` for int8_hnsw GPU type
+area: Search
+type: bug
+issues: []

docs/changelog/136881.yaml

@@ -0,0 +1,7 @@
+pr: 136961
+summary: Fix `ignore_unmapped` setting when using `geo_shape` query with a pre-indexed
+  shape
+area: Geo
+type: bug
+issues:
+ - 136954