Skip to content

Commit fd02f7d

Browse files
maitreya2954maitreya2954
committed
gradle format checks
Signed-off-by: Siddharth Rayabharam <[email protected]>
1 parent 0bd75bf commit fd02f7d

File tree

4 files changed

+59
-37
lines changed

4 files changed

+59
-37
lines changed

‎server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregationBuilder.java‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,9 @@ public CardinalityAggregationBuilder executionHint(String executionHint) {
167167
return this;
168168
}
169169

170-
public String executionHint() { return executionHint; }
170+
public String executionHint() {
171+
return executionHint;
172+
}
171173

172174
@Override
173175
protected CardinalityAggregatorFactory innerBuild(
@@ -176,7 +178,16 @@ protected CardinalityAggregatorFactory innerBuild(
176178
AggregatorFactory parent,
177179
AggregatorFactories.Builder subFactoriesBuilder
178180
) throws IOException {
179-
return new CardinalityAggregatorFactory(name, config, precisionThreshold, executionHint, queryShardContext, parent, subFactoriesBuilder, metadata);
181+
return new CardinalityAggregatorFactory(
182+
name,
183+
config,
184+
precisionThreshold,
185+
executionHint,
186+
queryShardContext,
187+
parent,
188+
subFactoriesBuilder,
189+
metadata
190+
);
180191
}
181192

182193
@Override
@@ -201,8 +212,7 @@ public boolean equals(Object obj) {
201212
if (obj == null || getClass() != obj.getClass()) return false;
202213
if (super.equals(obj) == false) return false;
203214
CardinalityAggregationBuilder other = (CardinalityAggregationBuilder) obj;
204-
return Objects.equals(precisionThreshold, other.precisionThreshold)
205-
&& Objects.equals(executionHint, other.executionHint);
215+
return Objects.equals(precisionThreshold, other.precisionThreshold) && Objects.equals(executionHint, other.executionHint);
206216
}
207217

208218
@Override

‎server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -463,7 +463,7 @@ public long cost() {
463463
*
464464
* @opensearch.internal
465465
*/
466-
public static class EmptyCollector extends Collector {
466+
private static class EmptyCollector extends Collector {
467467

468468
@Override
469469
public void collect(int doc, long bucketOrd) {

‎server/src/test/java/org/opensearch/search/aggregations/metrics/CardinalityAggregatorTests.java‎

Lines changed: 41 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,14 @@
3232

3333
package org.opensearch.search.aggregations.metrics;
3434

35-
import org.apache.lucene.document.*;
35+
import org.apache.lucene.document.BinaryDocValuesField;
36+
import org.apache.lucene.document.Field;
37+
import org.apache.lucene.document.IntPoint;
38+
import org.apache.lucene.document.KeywordField;
39+
import org.apache.lucene.document.NumericDocValuesField;
40+
import org.apache.lucene.document.SortedDocValuesField;
41+
import org.apache.lucene.document.SortedNumericDocValuesField;
42+
import org.apache.lucene.document.SortedSetDocValuesField;
3643
import org.apache.lucene.index.DirectoryReader;
3744
import org.apache.lucene.index.IndexReader;
3845
import org.apache.lucene.index.IndexWriter;
@@ -52,8 +59,16 @@
5259
import org.opensearch.common.geo.GeoPoint;
5360
import org.opensearch.core.common.breaker.CircuitBreaker;
5461
import org.opensearch.core.indices.breaker.NoneCircuitBreakerService;
55-
import org.opensearch.index.mapper.*;
56-
import org.opensearch.search.aggregations.*;
62+
import org.opensearch.index.mapper.KeywordFieldMapper;
63+
import org.opensearch.index.mapper.MappedFieldType;
64+
import org.opensearch.index.mapper.NumberFieldMapper;
65+
import org.opensearch.index.mapper.RangeFieldMapper;
66+
import org.opensearch.index.mapper.RangeType;
67+
import org.opensearch.search.aggregations.AggregationBuilder;
68+
import org.opensearch.search.aggregations.AggregatorTestCase;
69+
import org.opensearch.search.aggregations.InternalAggregation;
70+
import org.opensearch.search.aggregations.LeafBucketCollector;
71+
import org.opensearch.search.aggregations.MultiBucketConsumerService;
5772
import org.opensearch.search.aggregations.pipeline.PipelineAggregator;
5873
import org.opensearch.search.aggregations.support.AggregationInspectionHelper;
5974

@@ -501,7 +516,10 @@ private void testAggregationExecutionHint(
501516
try (IndexReader indexReader = DirectoryReader.open(directory)) {
502517
IndexSearcher indexSearcher = newSearcher(indexReader, true, true);
503518

504-
CountingAggregator aggregator = new CountingAggregator(new AtomicInteger(), createAggregator(aggregationBuilder, indexSearcher, fieldType));
519+
CountingAggregator aggregator = new CountingAggregator(
520+
new AtomicInteger(),
521+
createAggregator(aggregationBuilder, indexSearcher, fieldType)
522+
);
505523
aggregator.preCollection();
506524
indexSearcher.search(query, aggregator);
507525
aggregator.postCollection();
@@ -528,17 +546,16 @@ private void testAggregationExecutionHint(
528546

529547
public void testInvalidExecutionHint() throws IOException {
530548
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType("number", NumberFieldMapper.NumberType.LONG);
531-
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("number").executionHint("invalid");
549+
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("number")
550+
.executionHint("invalid");
532551
assertThrows(IllegalArgumentException.class, () -> testAggregationExecutionHint(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
533552
iw.addDocument(singleton(new NumericDocValuesField("number", 7)));
534553
iw.addDocument(singleton(new NumericDocValuesField("number", 8)));
535554
iw.addDocument(singleton(new NumericDocValuesField("number", 9)));
536555
}, card -> {
537556
assertEquals(3, card.getValue(), 0);
538557
assertTrue(AggregationInspectionHelper.hasValue(card));
539-
}, collector -> {
540-
assertTrue(collector instanceof CardinalityAggregator.DirectCollector);
541-
}, fieldType));
558+
}, collector -> { assertTrue(collector instanceof CardinalityAggregator.DirectCollector); }, fieldType));
542559
}
543560

544561
public void testNoExecutionHintWithNumericDocValues() throws IOException {
@@ -551,77 +568,70 @@ public void testNoExecutionHintWithNumericDocValues() throws IOException {
551568
}, card -> {
552569
assertEquals(3, card.getValue(), 0);
553570
assertTrue(AggregationInspectionHelper.hasValue(card));
554-
}, collector -> {
555-
assertTrue(collector instanceof CardinalityAggregator.DirectCollector);
556-
}, fieldType);
571+
}, collector -> { assertTrue(collector instanceof CardinalityAggregator.DirectCollector); }, fieldType);
557572
}
558573

559574
public void testDirectExecutionHintWithNumericDocValues() throws IOException {
560575
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType("number", NumberFieldMapper.NumberType.LONG);
561-
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("number").executionHint("direct");
576+
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("number")
577+
.executionHint("direct");
562578
testAggregationExecutionHint(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
563579
iw.addDocument(singleton(new NumericDocValuesField("number", 7)));
564580
iw.addDocument(singleton(new NumericDocValuesField("number", 8)));
565581
iw.addDocument(singleton(new NumericDocValuesField("number", 9)));
566582
}, card -> {
567583
assertEquals(3, card.getValue(), 0);
568584
assertTrue(AggregationInspectionHelper.hasValue(card));
569-
}, collector -> {
570-
assertTrue(collector instanceof CardinalityAggregator.DirectCollector);
571-
}, fieldType);
585+
}, collector -> { assertTrue(collector instanceof CardinalityAggregator.DirectCollector); }, fieldType);
572586
}
573587

574588
public void testOrdinalsExecutionHintWithNumericDocValues() throws IOException {
575589
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType("number", NumberFieldMapper.NumberType.LONG);
576-
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("number").executionHint("ordinals");
590+
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("number")
591+
.executionHint("ordinals");
577592
testAggregationExecutionHint(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
578593
iw.addDocument(singleton(new NumericDocValuesField("number", 7)));
579594
iw.addDocument(singleton(new NumericDocValuesField("number", 8)));
580595
iw.addDocument(singleton(new NumericDocValuesField("number", 9)));
581596
}, card -> {
582597
assertEquals(3, card.getValue(), 0);
583598
assertTrue(AggregationInspectionHelper.hasValue(card));
584-
}, collector -> {
585-
assertTrue(collector instanceof CardinalityAggregator.DirectCollector);
586-
}, fieldType);
599+
}, collector -> { assertTrue(collector instanceof CardinalityAggregator.DirectCollector); }, fieldType);
587600
}
588601

589602
public void testNoExecutionHintWithByteValues() throws IOException {
590603
MappedFieldType fieldType = new KeywordFieldMapper.KeywordFieldType("field");
591-
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("field").executionHint("direct");
604+
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("field")
605+
.executionHint("direct");
592606
testAggregationExecutionHint(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
593607
iw.addDocument(singleton(new SortedDocValuesField("field", new BytesRef())));
594608
}, card -> {
595609
assertEquals(1, card.getValue(), 0);
596610
assertTrue(AggregationInspectionHelper.hasValue(card));
597-
}, collector -> {
598-
assertTrue(collector instanceof CardinalityAggregator.OrdinalsCollector);
599-
}, fieldType);
611+
}, collector -> { assertTrue(collector instanceof CardinalityAggregator.OrdinalsCollector); }, fieldType);
600612
}
601613

602614
public void testDirectExecutionHintWithByteValues() throws IOException {
603615
MappedFieldType fieldType = new KeywordFieldMapper.KeywordFieldType("field");
604-
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("field").executionHint("direct");
616+
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("field")
617+
.executionHint("direct");
605618
testAggregationExecutionHint(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
606619
iw.addDocument(singleton(new SortedDocValuesField("field", new BytesRef())));
607620
}, card -> {
608621
assertEquals(1, card.getValue(), 0);
609622
assertTrue(AggregationInspectionHelper.hasValue(card));
610-
}, collector -> {
611-
assertTrue(collector instanceof CardinalityAggregator.OrdinalsCollector);
612-
}, fieldType);
623+
}, collector -> { assertTrue(collector instanceof CardinalityAggregator.OrdinalsCollector); }, fieldType);
613624
}
614625

615626
public void testOrdinalsExecutionHintWithByteValues() throws IOException {
616627
MappedFieldType fieldType = new KeywordFieldMapper.KeywordFieldType("field");
617-
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("field").executionHint("ordinals");
628+
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("field")
629+
.executionHint("ordinals");
618630
testAggregationExecutionHint(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
619631
iw.addDocument(singleton(new SortedDocValuesField("field", new BytesRef())));
620632
}, card -> {
621633
assertEquals(1, card.getValue(), 0);
622634
assertTrue(AggregationInspectionHelper.hasValue(card));
623-
}, collector -> {
624-
assertTrue(collector instanceof CardinalityAggregator.OrdinalsCollector);
625-
}, fieldType);
635+
}, collector -> { assertTrue(collector instanceof CardinalityAggregator.OrdinalsCollector); }, fieldType);
626636
}
627637
}

‎test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1169,7 +1169,9 @@ public AtomicInteger getCollectCount() {
11691169
return collectCounter;
11701170
}
11711171

1172-
public LeafBucketCollector getSelectedCollector() { return selectedCollector; }
1172+
public LeafBucketCollector getSelectedCollector() {
1173+
return selectedCollector;
1174+
}
11731175

11741176
@Override
11751177
public void close() {

0 commit comments

Comments
 (0)