Spotless apply

Signed-off-by: Finn Carroll <carrofin@amazon.com>
opensearch-project · Aug 14, 2024 · 701ed58 · 701ed58
1 parent 93f4a51
commit 701ed58
Show file tree

Hide file tree

Showing 8 changed files with 47 additions and 20 deletions.
diff --git a/...rc/main/java/org/opensearch/search/aggregations/bucket/composite/CompositeAggregator.java b/...rc/main/java/org/opensearch/search/aggregations/bucket/composite/CompositeAggregator.java
@@ -190,7 +190,9 @@ protected boolean canOptimize() {
             }
 
             @Override
-            protected void prepare() throws IOException { buildRanges(context); }
+            protected void prepare() throws IOException {
+                buildRanges(context);
+            }
 
             protected Rounding getRounding(final long low, final long high) {
                 return valuesSource.getRounding();
@@ -216,7 +218,7 @@ protected int rangeMax() {
             }
 
             @Override
-            protected long getOrd(int rangeIdx){
+            protected long getOrd(int rangeIdx) {
                 long rangeStart = LongPoint.decodeDimension(filterRewriteOptimizationContext.getRanges().getLower(rangeIdx), 0);
                 rangeStart = this.getFieldType().convertNanosToMillis(rangeStart);
                 long ord = bucketOrds.add(0, getRoundingPrepared().round(rangeStart));
@@ -563,7 +565,12 @@ private void processLeafFromQuery(LeafReaderContext ctx, Sort indexSortPrefix) t
 
     @Override
     protected LeafBucketCollector getLeafCollector(LeafReaderContext ctx, LeafBucketCollector sub) throws IOException {
-        boolean optimized = filterRewriteOptimizationContext.tryOptimize(ctx, this::incrementBucketDocCount, sub, segmentMatchAll(context, ctx));
+        boolean optimized = filterRewriteOptimizationContext.tryOptimize(
+            ctx,
+            this::incrementBucketDocCount,
+            sub,
+            segmentMatchAll(context, ctx)
+        );
         if (optimized) throw new CollectionTerminatedException();
 
         finishLeaf();

diff --git a/...c/main/java/org/opensearch/search/aggregations/bucket/filterrewrite/AggregatorBridge.java b/...c/main/java/org/opensearch/search/aggregations/bucket/filterrewrite/AggregatorBridge.java
@@ -83,7 +83,7 @@ protected int rangeMax() {
     /**
      * Translate an index of the packed value range array to an agg bucket ordinal.
      */
-    protected long getOrd(int rangeIdx){
+    protected long getOrd(int rangeIdx) {
         return rangeIdx;
     }
 
@@ -95,8 +95,12 @@ protected long getOrd(int rangeIdx){
      * @param values              the point values (index structure for numeric values) for a segment
      * @param incrementDocCount   a consumer to increment the document count for a range bucket. The First parameter is document count, the second is the key of the bucket
      */
-    public final FilterRewriteOptimizationContext.DebugInfo tryOptimize(PointValues values, BiConsumer<Long, Long> incrementDocCount, PackedValueRanges ranges, final LeafBucketCollector sub)
-        throws IOException {
+    public final FilterRewriteOptimizationContext.DebugInfo tryOptimize(
+        PointValues values,
+        BiConsumer<Long, Long> incrementDocCount,
+        PackedValueRanges ranges,
+        final LeafBucketCollector sub
+    ) throws IOException {
         PointTreeTraversal.RangeAwareIntersectVisitor treeVisitor;
 
         if (sub != null) {

diff --git a/...rg/opensearch/search/aggregations/bucket/filterrewrite/DateHistogramAggregatorBridge.java b/...rg/opensearch/search/aggregations/bucket/filterrewrite/DateHistogramAggregatorBridge.java
@@ -11,7 +11,6 @@
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.search.ScoreMode;
 import org.apache.lucene.search.Weight;
-
 import org.opensearch.common.Rounding;
 import org.opensearch.index.mapper.DateFieldMapper;
 import org.opensearch.index.mapper.MappedFieldType;

diff --git a/...opensearch/search/aggregations/bucket/filterrewrite/FilterRewriteOptimizationContext.java b/...opensearch/search/aggregations/bucket/filterrewrite/FilterRewriteOptimizationContext.java
@@ -14,8 +14,8 @@
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.NumericDocValues;
 import org.apache.lucene.index.PointValues;
-import org.opensearch.search.aggregations.LeafBucketCollector;
 import org.opensearch.index.mapper.DocCountFieldMapper;
+import org.opensearch.search.aggregations.LeafBucketCollector;
 import org.opensearch.search.internal.SearchContext;
 
 import java.io.IOException;
@@ -101,8 +101,12 @@ public PackedValueRanges getRanges() {
      * @param incrementDocCount consume the doc_count results for certain ordinal
      * @param segmentMatchAll if your optimization can prepareFromSegment, you should pass in this flag to decide whether to prepareFromSegment
      */
-    public boolean tryOptimize(final LeafReaderContext leafCtx, final BiConsumer<Long, Long> incrementDocCount, LeafBucketCollector sub, boolean segmentMatchAll)
-        throws IOException {
+    public boolean tryOptimize(
+        final LeafReaderContext leafCtx,
+        final BiConsumer<Long, Long> incrementDocCount,
+        LeafBucketCollector sub,
+        boolean segmentMatchAll
+    ) throws IOException {
         segments.incrementAndGet();
         if (!canOptimize) {
             return false;

diff --git a/.../main/java/org/opensearch/search/aggregations/bucket/filterrewrite/PackedValueRanges.java b/.../main/java/org/opensearch/search/aggregations/bucket/filterrewrite/PackedValueRanges.java
@@ -42,11 +42,11 @@ public static boolean withinUpperBound(byte[] value, byte[] upperBound) {
         return compareByteValue(value, upperBound) < 0;
     }
 
-    public byte[] getLower(int idx){
+    public byte[] getLower(int idx) {
         return lowers[idx];
     }
 
-    public byte[] getUpper(int idx){
+    public byte[] getUpper(int idx) {
         return uppers[idx];
     }
 

diff --git a/...java/org/opensearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregator.java b/...java/org/opensearch/search/aggregations/bucket/histogram/AutoDateHistogramAggregator.java
@@ -167,7 +167,9 @@ protected boolean canOptimize() {
             }
 
             @Override
-            protected void prepare() throws IOException { buildRanges(context); }
+            protected void prepare() throws IOException {
+                buildRanges(context);
+            }
 
             @Override
             protected Rounding getRounding(final long low, final long high) {
@@ -199,7 +201,7 @@ protected Prepared getRoundingPrepared() {
             }
 
             @Override
-            protected long getOrd(int rangeIdx){
+            protected long getOrd(int rangeIdx) {
                 long rangeStart = LongPoint.decodeDimension(filterRewriteOptimizationContext.getRanges().getLower(rangeIdx), 0);
                 rangeStart = this.getFieldType().convertNanosToMillis(rangeStart);
                 long ord = getBucketOrds().add(0, getRoundingPrepared().round(rangeStart));
@@ -243,7 +245,12 @@ public final LeafBucketCollector getLeafCollector(LeafReaderContext ctx, LeafBuc
             return LeafBucketCollector.NO_OP_COLLECTOR;
         }
 
-        boolean optimized = filterRewriteOptimizationContext.tryOptimize(ctx, this::incrementBucketDocCount, sub, segmentMatchAll(context, ctx));
+        boolean optimized = filterRewriteOptimizationContext.tryOptimize(
+            ctx,
+            this::incrementBucketDocCount,
+            sub,
+            segmentMatchAll(context, ctx)
+        );
         if (optimized) throw new CollectionTerminatedException();
 
         final SortedNumericDocValues values = valuesSource.longValues(ctx);

diff --git a/...ain/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java b/...ain/java/org/opensearch/search/aggregations/bucket/histogram/DateHistogramAggregator.java
@@ -126,7 +126,9 @@ protected boolean canOptimize() {
             }
 
             @Override
-            protected void prepare() throws IOException { buildRanges(context); }
+            protected void prepare() throws IOException {
+                buildRanges(context);
+            }
 
             @Override
             protected Rounding getRounding(long low, long high) {
@@ -144,7 +146,7 @@ protected long[] processHardBounds(long[] bounds) {
             }
 
             @Override
-            protected long getOrd(int rangeIdx){
+            protected long getOrd(int rangeIdx) {
                 long rangeStart = LongPoint.decodeDimension(filterRewriteOptimizationContext.getRanges().getLower(rangeIdx), 0);
                 rangeStart = this.getFieldType().convertNanosToMillis(rangeStart);
                 long ord = bucketOrds.add(0, getRoundingPrepared().round(rangeStart));
@@ -173,7 +175,12 @@ public LeafBucketCollector getLeafCollector(LeafReaderContext ctx, LeafBucketCol
             return LeafBucketCollector.NO_OP_COLLECTOR;
         }
 
-        boolean optimized = filterRewriteOptimizationContext.tryOptimize(ctx, this::incrementBucketDocCount, sub, segmentMatchAll(context, ctx));
+        boolean optimized = filterRewriteOptimizationContext.tryOptimize(
+            ctx,
+            this::incrementBucketDocCount,
+            sub,
+            segmentMatchAll(context, ctx)
+        );
         if (optimized) throw new CollectionTerminatedException();
 
         SortedNumericDocValues values = valuesSource.longValues(ctx);

diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/range/RangeAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/range/RangeAggregator.java
@@ -67,7 +67,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.BiConsumer;
-import java.util.function.Function;
 
 import static org.opensearch.core.xcontent.ConstructingObjectParser.optionalConstructorArg;
 
@@ -305,7 +304,7 @@ public ScoreMode scoreMode() {
 
     @Override
     public LeafBucketCollector getLeafCollector(LeafReaderContext ctx, final LeafBucketCollector sub) throws IOException {
-        boolean optimized = filterRewriteOptimizationContext.tryOptimize(ctx, this::incrementBucketDocCount, sub,false);
+        boolean optimized = filterRewriteOptimizationContext.tryOptimize(ctx, this::incrementBucketDocCount, sub, false);
         if (optimized) throw new CollectionTerminatedException();
 
         final SortedNumericDoubleValues values = valuesSource.doubleValues(ctx);