From f3769528657ced497af07f26fcc73c8c80c7071b Mon Sep 17 00:00:00 2001 From: Benjamin Trent <4357155+benwtrent@users.noreply.github.com> Date: Thu, 9 Oct 2025 17:04:52 -0400 Subject: [PATCH 1/2] Minor removal of unused code for diskbbq --- .../codec/vectors/diskbbq/ES920DiskBBQVectorsReader.java | 6 +++--- .../codec/vectors/diskbbq/ES920DiskBBQVectorsWriter.java | 3 --- .../vectors/diskbbq/next/ESNextDiskBBQVectorsWriter.java | 3 --- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/index/codec/vectors/diskbbq/ES920DiskBBQVectorsReader.java b/server/src/main/java/org/elasticsearch/index/codec/vectors/diskbbq/ES920DiskBBQVectorsReader.java index 7d8a563c99f7f..e8ba62042e849 100644 --- a/server/src/main/java/org/elasticsearch/index/codec/vectors/diskbbq/ES920DiskBBQVectorsReader.java +++ b/server/src/main/java/org/elasticsearch/index/codec/vectors/diskbbq/ES920DiskBBQVectorsReader.java @@ -351,8 +351,9 @@ private static void score( public PostingVisitor getPostingVisitor(FieldInfo fieldInfo, IndexInput indexInput, float[] target, Bits acceptDocs) throws IOException { FieldEntry entry = fields.get(fieldInfo.number); - final int maxPostingListSize = indexInput.readVInt(); - return new MemorySegmentPostingsVisitor(target, indexInput, entry, fieldInfo, maxPostingListSize, acceptDocs); + // max postings list size, no longer utilized + indexInput.readVInt(); + return new MemorySegmentPostingsVisitor(target, indexInput, entry, fieldInfo, acceptDocs); } @Override @@ -397,7 +398,6 @@ private static class MemorySegmentPostingsVisitor implements PostingVisitor { IndexInput indexInput, FieldEntry entry, FieldInfo fieldInfo, - int maxPostingListSize, Bits acceptDocs ) throws IOException { this.target = target; diff --git a/server/src/main/java/org/elasticsearch/index/codec/vectors/diskbbq/ES920DiskBBQVectorsWriter.java b/server/src/main/java/org/elasticsearch/index/codec/vectors/diskbbq/ES920DiskBBQVectorsWriter.java index 7f77f0de22bc7..7a46335effbcf 100644 --- a/server/src/main/java/org/elasticsearch/index/codec/vectors/diskbbq/ES920DiskBBQVectorsWriter.java +++ b/server/src/main/java/org/elasticsearch/index/codec/vectors/diskbbq/ES920DiskBBQVectorsWriter.java @@ -531,8 +531,6 @@ public int size() { public CentroidAssignments calculateCentroids(FieldInfo fieldInfo, FloatVectorValues floatVectorValues, float[] globalCentroid) throws IOException { - long nanoTime = System.nanoTime(); - // TODO: consider hinting / bootstrapping hierarchical kmeans with the prior segments centroids CentroidAssignments centroidAssignments = buildCentroidAssignments(floatVectorValues, vectorPerCluster); float[][] centroids = centroidAssignments.centroids(); @@ -549,7 +547,6 @@ public CentroidAssignments calculateCentroids(FieldInfo fieldInfo, FloatVectorVa } if (logger.isDebugEnabled()) { - logger.debug("calculate centroids and assign vectors time ms: {}", (System.nanoTime() - nanoTime) / 1000000.0); logger.debug("final centroid count: {}", centroids.length); } return centroidAssignments; diff --git a/server/src/main/java/org/elasticsearch/index/codec/vectors/diskbbq/next/ESNextDiskBBQVectorsWriter.java b/server/src/main/java/org/elasticsearch/index/codec/vectors/diskbbq/next/ESNextDiskBBQVectorsWriter.java index 13d6fb4cd93da..8ca99101d7503 100644 --- a/server/src/main/java/org/elasticsearch/index/codec/vectors/diskbbq/next/ESNextDiskBBQVectorsWriter.java +++ b/server/src/main/java/org/elasticsearch/index/codec/vectors/diskbbq/next/ESNextDiskBBQVectorsWriter.java @@ -519,8 +519,6 @@ public int size() { public CentroidAssignments calculateCentroids(FieldInfo fieldInfo, FloatVectorValues floatVectorValues, float[] globalCentroid) throws IOException { - long nanoTime = System.nanoTime(); - // TODO: consider hinting / bootstrapping hierarchical kmeans with the prior segments centroids CentroidAssignments centroidAssignments = buildCentroidAssignments(floatVectorValues, vectorPerCluster); float[][] centroids = centroidAssignments.centroids(); @@ -537,7 +535,6 @@ public CentroidAssignments calculateCentroids(FieldInfo fieldInfo, FloatVectorVa } if (logger.isDebugEnabled()) { - logger.debug("calculate centroids and assign vectors time ms: {}", (System.nanoTime() - nanoTime) / 1000000.0); logger.debug("final centroid count: {}", centroids.length); } return centroidAssignments; From 5b4e7ea7d800bc427a26fa4ee379bdd5ac52c9cf Mon Sep 17 00:00:00 2001 From: elasticsearchmachine Date: Thu, 9 Oct 2025 21:15:01 +0000 Subject: [PATCH 2/2] [CI] Auto commit changes from spotless --- .../codec/vectors/diskbbq/ES920DiskBBQVectorsReader.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/index/codec/vectors/diskbbq/ES920DiskBBQVectorsReader.java b/server/src/main/java/org/elasticsearch/index/codec/vectors/diskbbq/ES920DiskBBQVectorsReader.java index e8ba62042e849..ddafe6b6ab743 100644 --- a/server/src/main/java/org/elasticsearch/index/codec/vectors/diskbbq/ES920DiskBBQVectorsReader.java +++ b/server/src/main/java/org/elasticsearch/index/codec/vectors/diskbbq/ES920DiskBBQVectorsReader.java @@ -393,13 +393,8 @@ private static class MemorySegmentPostingsVisitor implements PostingVisitor { final float[] correctiveValues = new float[3]; final long quantizedVectorByteSize; - MemorySegmentPostingsVisitor( - float[] target, - IndexInput indexInput, - FieldEntry entry, - FieldInfo fieldInfo, - Bits acceptDocs - ) throws IOException { + MemorySegmentPostingsVisitor(float[] target, IndexInput indexInput, FieldEntry entry, FieldInfo fieldInfo, Bits acceptDocs) + throws IOException { this.target = target; this.indexInput = indexInput; this.entry = entry;