Skip to content

Commit

Permalink
gradle format checks
Browse files Browse the repository at this point in the history 
Signed-off-by: Siddharth Rayabharam <maitreya2954@gmail.com>
  • Loading branch information
@maitreya2954
maitreya2954 committed Sep 13, 2024
1 parent b101ace commit 2658aa2
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 37 deletions.
18 changes: 14 additions & 4 deletions ...c/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregationBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,9 @@ public CardinalityAggregationBuilder executionHint(String executionHint) {
return this;
}

public String executionHint() { return executionHint; }
public String executionHint() {
return executionHint;
}

@Override
protected CardinalityAggregatorFactory innerBuild(
Expand All @@ -176,7 +178,16 @@ protected CardinalityAggregatorFactory innerBuild(
AggregatorFactory parent,
AggregatorFactories.Builder subFactoriesBuilder
) throws IOException {
return new CardinalityAggregatorFactory(name, config, precisionThreshold, executionHint, queryShardContext, parent, subFactoriesBuilder, metadata);
return new CardinalityAggregatorFactory(
name,
config,
precisionThreshold,
executionHint,
queryShardContext,
parent,
subFactoriesBuilder,
metadata
);
}

@Override
Expand All @@ -201,8 +212,7 @@ public boolean equals(Object obj) {
if (obj == null || getClass() != obj.getClass()) return false;
if (super.equals(obj) == false) return false;
CardinalityAggregationBuilder other = (CardinalityAggregationBuilder) obj;
return Objects.equals(precisionThreshold, other.precisionThreshold)
&& Objects.equals(executionHint, other.executionHint);
return Objects.equals(precisionThreshold, other.precisionThreshold) && Objects.equals(executionHint, other.executionHint);
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/java/org/opensearch/search/aggregations/metrics/CardinalityAggregator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ public long cost() {
*
* @opensearch.internal
*/
public static class EmptyCollector extends Collector {
private static class EmptyCollector extends Collector {

@Override
public void collect(int doc, long bucketOrd) {
Expand Down
72 changes: 41 additions & 31 deletions .../src/test/java/org/opensearch/search/aggregations/metrics/CardinalityAggregatorTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,14 @@

package org.opensearch.search.aggregations.metrics;

import org.apache.lucene.document.*;
import org.apache.lucene.document.BinaryDocValuesField;
import org.apache.lucene.document.Field;
import org.apache.lucene.document.IntPoint;
import org.apache.lucene.document.KeywordField;
import org.apache.lucene.document.NumericDocValuesField;
import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.document.SortedNumericDocValuesField;
import org.apache.lucene.document.SortedSetDocValuesField;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
Expand All @@ -52,8 +59,16 @@
import org.opensearch.common.geo.GeoPoint;
import org.opensearch.core.common.breaker.CircuitBreaker;
import org.opensearch.core.indices.breaker.NoneCircuitBreakerService;
import org.opensearch.index.mapper.*;
import org.opensearch.search.aggregations.*;
import org.opensearch.index.mapper.KeywordFieldMapper;
import org.opensearch.index.mapper.MappedFieldType;
import org.opensearch.index.mapper.NumberFieldMapper;
import org.opensearch.index.mapper.RangeFieldMapper;
import org.opensearch.index.mapper.RangeType;
import org.opensearch.search.aggregations.AggregationBuilder;
import org.opensearch.search.aggregations.AggregatorTestCase;
import org.opensearch.search.aggregations.InternalAggregation;
import org.opensearch.search.aggregations.LeafBucketCollector;
import org.opensearch.search.aggregations.MultiBucketConsumerService;
import org.opensearch.search.aggregations.pipeline.PipelineAggregator;
import org.opensearch.search.aggregations.support.AggregationInspectionHelper;

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

CountingAggregator aggregator = new CountingAggregator(new AtomicInteger(), createAggregator(aggregationBuilder, indexSearcher, fieldType));
CountingAggregator aggregator = new CountingAggregator(
new AtomicInteger(),
createAggregator(aggregationBuilder, indexSearcher, fieldType)
);
aggregator.preCollection();
indexSearcher.search(query, aggregator);
aggregator.postCollection();
Expand All @@ -528,17 +546,16 @@ private void testAggregationExecutionHint(

public void testInvalidExecutionHint() throws IOException {
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType("number", NumberFieldMapper.NumberType.LONG);
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("number").executionHint("invalid");
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("number")
.executionHint("invalid");
assertThrows(IllegalArgumentException.class, () -> testAggregationExecutionHint(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
iw.addDocument(singleton(new NumericDocValuesField("number", 7)));
iw.addDocument(singleton(new NumericDocValuesField("number", 8)));
iw.addDocument(singleton(new NumericDocValuesField("number", 9)));
}, card -> {
assertEquals(3, card.getValue(), 0);
assertTrue(AggregationInspectionHelper.hasValue(card));
}, collector -> {
assertTrue(collector instanceof CardinalityAggregator.DirectCollector);
}, fieldType));
}, collector -> { assertTrue(collector instanceof CardinalityAggregator.DirectCollector); }, fieldType));
}

public void testNoExecutionHintWithNumericDocValues() throws IOException {
Expand All @@ -551,77 +568,70 @@ public void testNoExecutionHintWithNumericDocValues() throws IOException {
}, card -> {
assertEquals(3, card.getValue(), 0);
assertTrue(AggregationInspectionHelper.hasValue(card));
}, collector -> {
assertTrue(collector instanceof CardinalityAggregator.DirectCollector);
}, fieldType);
}, collector -> { assertTrue(collector instanceof CardinalityAggregator.DirectCollector); }, fieldType);
}

public void testDirectExecutionHintWithNumericDocValues() throws IOException {
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType("number", NumberFieldMapper.NumberType.LONG);
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("number").executionHint("direct");
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("number")
.executionHint("direct");
testAggregationExecutionHint(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
iw.addDocument(singleton(new NumericDocValuesField("number", 7)));
iw.addDocument(singleton(new NumericDocValuesField("number", 8)));
iw.addDocument(singleton(new NumericDocValuesField("number", 9)));
}, card -> {
assertEquals(3, card.getValue(), 0);
assertTrue(AggregationInspectionHelper.hasValue(card));
}, collector -> {
assertTrue(collector instanceof CardinalityAggregator.DirectCollector);
}, fieldType);
}, collector -> { assertTrue(collector instanceof CardinalityAggregator.DirectCollector); }, fieldType);
}

public void testOrdinalsExecutionHintWithNumericDocValues() throws IOException {
MappedFieldType fieldType = new NumberFieldMapper.NumberFieldType("number", NumberFieldMapper.NumberType.LONG);
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("number").executionHint("ordinals");
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("number")
.executionHint("ordinals");
testAggregationExecutionHint(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
iw.addDocument(singleton(new NumericDocValuesField("number", 7)));
iw.addDocument(singleton(new NumericDocValuesField("number", 8)));
iw.addDocument(singleton(new NumericDocValuesField("number", 9)));
}, card -> {
assertEquals(3, card.getValue(), 0);
assertTrue(AggregationInspectionHelper.hasValue(card));
}, collector -> {
assertTrue(collector instanceof CardinalityAggregator.DirectCollector);
}, fieldType);
}, collector -> { assertTrue(collector instanceof CardinalityAggregator.DirectCollector); }, fieldType);
}

public void testNoExecutionHintWithByteValues() throws IOException {
MappedFieldType fieldType = new KeywordFieldMapper.KeywordFieldType("field");
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("field").executionHint("direct");
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("field")
.executionHint("direct");
testAggregationExecutionHint(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
iw.addDocument(singleton(new SortedDocValuesField("field", new BytesRef())));
}, card -> {
assertEquals(1, card.getValue(), 0);
assertTrue(AggregationInspectionHelper.hasValue(card));
}, collector -> {
assertTrue(collector instanceof CardinalityAggregator.OrdinalsCollector);
}, fieldType);
}, collector -> { assertTrue(collector instanceof CardinalityAggregator.OrdinalsCollector); }, fieldType);
}

public void testDirectExecutionHintWithByteValues() throws IOException {
MappedFieldType fieldType = new KeywordFieldMapper.KeywordFieldType("field");
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("field").executionHint("direct");
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("field")
.executionHint("direct");
testAggregationExecutionHint(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
iw.addDocument(singleton(new SortedDocValuesField("field", new BytesRef())));
}, card -> {
assertEquals(1, card.getValue(), 0);
assertTrue(AggregationInspectionHelper.hasValue(card));
}, collector -> {
assertTrue(collector instanceof CardinalityAggregator.OrdinalsCollector);
}, fieldType);
}, collector -> { assertTrue(collector instanceof CardinalityAggregator.OrdinalsCollector); }, fieldType);
}

public void testOrdinalsExecutionHintWithByteValues() throws IOException {
MappedFieldType fieldType = new KeywordFieldMapper.KeywordFieldType("field");
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("field").executionHint("ordinals");
final CardinalityAggregationBuilder aggregationBuilder = new CardinalityAggregationBuilder("_name").field("field")
.executionHint("ordinals");
testAggregationExecutionHint(aggregationBuilder, new MatchAllDocsQuery(), iw -> {
iw.addDocument(singleton(new SortedDocValuesField("field", new BytesRef())));
}, card -> {
assertEquals(1, card.getValue(), 0);
assertTrue(AggregationInspectionHelper.hasValue(card));
}, collector -> {
assertTrue(collector instanceof CardinalityAggregator.OrdinalsCollector);
}, fieldType);
}, collector -> { assertTrue(collector instanceof CardinalityAggregator.OrdinalsCollector); }, fieldType);
}
}
4 changes: 3 additions & 1 deletion test/framework/src/main/java/org/opensearch/search/aggregations/AggregatorTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1169,7 +1169,9 @@ public AtomicInteger getCollectCount() {
return collectCounter;
}

public LeafBucketCollector getSelectedCollector() { return selectedCollector; }
public LeafBucketCollector getSelectedCollector() {
return selectedCollector;
}

@Override
public void close() {
Expand Down

0 comments on commit 2658aa2

Please sign in to comment.