From d7772ac766bb07f5f7486bb9deffe2ad2a929a54 Mon Sep 17 00:00:00 2001 From: Finn Carroll Date: Fri, 2 Aug 2024 15:00:45 -0700 Subject: [PATCH] Spotless apply Signed-off-by: Finn Carroll --- .../BKDTreeMultiRangesTraverseBenchmark.java | 56 ++++++++++--------- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/benchmarks/src/main/java/org/opensearch/benchmark/search/aggregations/BKDTreeMultiRangesTraverseBenchmark.java b/benchmarks/src/main/java/org/opensearch/benchmark/search/aggregations/BKDTreeMultiRangesTraverseBenchmark.java index cefc388059ef0..0ef0a261cecd0 100644 --- a/benchmarks/src/main/java/org/opensearch/benchmark/search/aggregations/BKDTreeMultiRangesTraverseBenchmark.java +++ b/benchmarks/src/main/java/org/opensearch/benchmark/search/aggregations/BKDTreeMultiRangesTraverseBenchmark.java @@ -31,6 +31,22 @@ package org.opensearch.benchmark.search.aggregations; +import org.apache.lucene.document.Field; +import org.apache.lucene.document.IntField; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.IndexReader; +import org.apache.lucene.index.IndexWriter; +import org.apache.lucene.index.IndexWriterConfig; +import org.apache.lucene.index.LeafReaderContext; +import org.apache.lucene.index.PointValues; +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.FSDirectory; +import org.opensearch.common.logging.LogConfigurator; +import org.opensearch.index.mapper.MappedFieldType; +import org.opensearch.index.mapper.NumberFieldMapper; +import org.opensearch.index.mapper.NumericPointEncoder; +import org.opensearch.search.optimization.filterrewrite.Ranges; +import org.opensearch.search.optimization.filterrewrite.TreeTraversal; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Fork; @@ -40,34 +56,15 @@ import org.openjdk.jmh.annotations.Param; import org.openjdk.jmh.annotations.Scope; import org.openjdk.jmh.annotations.Setup; -import org.openjdk.jmh.annotations.Warmup; import org.openjdk.jmh.annotations.State; import org.openjdk.jmh.annotations.TearDown; - -import org.apache.lucene.index.PointValues; -import org.apache.lucene.document.Field; -import org.apache.lucene.document.IntField; -import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.IndexReader; -import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.index.LeafReaderContext; -import org.apache.lucene.store.Directory; -import org.apache.lucene.store.FSDirectory; +import org.openjdk.jmh.annotations.Warmup; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.util.HashMap; import java.util.List; - -import org.opensearch.common.logging.LogConfigurator; -import org.opensearch.index.mapper.MappedFieldType; -import org.opensearch.index.mapper.NumberFieldMapper; -import org.opensearch.index.mapper.NumericPointEncoder; -import org.opensearch.search.optimization.filterrewrite.Ranges; -import org.opensearch.search.optimization.filterrewrite.TreeTraversal; - import java.util.Map; import java.util.Random; import java.util.concurrent.TimeUnit; @@ -131,7 +128,7 @@ public void setup() throws IOException { MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType("val", NumberFieldMapper.NumberType.INTEGER); NumericPointEncoder numericPointEncoder = (NumericPointEncoder) fieldType; - int bucketWidth = valMax/buckets; + int bucketWidth = valMax / buckets; byte[][] lowers = new byte[buckets][]; byte[][] uppers = new byte[buckets][]; for (int i = 0; i < buckets; i++) { @@ -155,13 +152,18 @@ public void tearDown() throws IOException { public Map> multiRangeTraverseTree(treeState state) throws Exception { Map> mockIDCollect = new HashMap<>(); - TreeTraversal.RangeAwareIntersectVisitor treeVisitor = new TreeTraversal.DocCollectRangeAwareIntersectVisitor(state.pointTree, state.ranges, state.maxNumNonZeroRanges, (activeIndex, docID) -> { - if (mockIDCollect.containsKey(activeIndex)) { - mockIDCollect.get(activeIndex).add(docID); - } else { - mockIDCollect.put(activeIndex, List.of(docID)); + TreeTraversal.RangeAwareIntersectVisitor treeVisitor = new TreeTraversal.DocCollectRangeAwareIntersectVisitor( + state.pointTree, + state.ranges, + state.maxNumNonZeroRanges, + (activeIndex, docID) -> { + if (mockIDCollect.containsKey(activeIndex)) { + mockIDCollect.get(activeIndex).add(docID); + } else { + mockIDCollect.put(activeIndex, List.of(docID)); + } } - }); + ); multiRangesTraverse(treeVisitor); return mockIDCollect;