Skip to content

Commit 41a9e69

Browse files
Fix check style errors
Signed-off-by: Anand Pravinbhai Patel <[email protected]>
1 parent a2f5dd7 commit 41a9e69

File tree

3 files changed

+22
-13
lines changed

3 files changed

+22
-13
lines changed

server/src/main/java/org/opensearch/search/DefaultSearchContext.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1280,7 +1280,8 @@ private boolean evaluateCardinalityAggregationHybridCollectorEnabled() {
12801280

12811281
private long evaluateCardinalityAggregationHybridCollectorMemoryThreshold() {
12821282
if (clusterService != null) {
1283-
ByteSizeValue threshold = clusterService.getClusterSettings().get(CardinalityAggregator.CARDINALITY_AGGREGATION_HYBRID_COLLECTOR_MEMORY_THRESHOLD);
1283+
ByteSizeValue threshold = clusterService.getClusterSettings()
1284+
.get(CardinalityAggregator.CARDINALITY_AGGREGATION_HYBRID_COLLECTOR_MEMORY_THRESHOLD);
12841285
return threshold.getBytes();
12851286
}
12861287
return Runtime.getRuntime().maxMemory() / 100; // 1% default

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

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
import org.opensearch.common.util.BitMixer;
6464
import org.opensearch.common.util.LongArray;
6565
import org.opensearch.common.util.ObjectArray;
66-
import org.opensearch.core.common.unit.ByteSizeUnit;
6766
import org.opensearch.core.common.unit.ByteSizeValue;
6867
import org.opensearch.core.rest.RestStatus;
6968
import org.opensearch.index.fielddata.SortedBinaryDocValues;
@@ -94,17 +93,23 @@ public class CardinalityAggregator extends NumericMetricsAggregator.SingleValue
9493
/**
9594
* Setting to enable/disable hybrid collector for cardinality aggregation.
9695
*/
97-
public static final Setting<Boolean> CARDINALITY_AGGREGATION_HYBRID_COLLECTOR_ENABLED =
98-
Setting.boolSetting("search.aggregations.cardinality.hybrid_collector.enabled", true,
99-
Setting.Property.NodeScope, Setting.Property.Dynamic);
96+
public static final Setting<Boolean> CARDINALITY_AGGREGATION_HYBRID_COLLECTOR_ENABLED = Setting.boolSetting(
97+
"search.aggregations.cardinality.hybrid_collector.enabled",
98+
true,
99+
Setting.Property.NodeScope,
100+
Setting.Property.Dynamic
101+
);
100102

101103
/**
102104
* Setting for hybrid collector memory threshold. Supports both percentage (e.g., "1%")
103105
* and absolute values (e.g., "10mb", "1gb").
104106
*/
105-
public static final Setting<ByteSizeValue> CARDINALITY_AGGREGATION_HYBRID_COLLECTOR_MEMORY_THRESHOLD =
106-
Setting.memorySizeSetting("search.aggregations.cardinality.hybrid_collector.memory_threshold",
107-
"1%", Setting.Property.NodeScope, Setting.Property.Dynamic);
107+
public static final Setting<ByteSizeValue> CARDINALITY_AGGREGATION_HYBRID_COLLECTOR_MEMORY_THRESHOLD = Setting.memorySizeSetting(
108+
"search.aggregations.cardinality.hybrid_collector.memory_threshold",
109+
"1%",
110+
Setting.Property.NodeScope,
111+
Setting.Property.Dynamic
112+
);
108113

109114
final CardinalityAggregatorFactory.ExecutionMode executionMode;
110115
final int precision;
@@ -812,8 +817,13 @@ static class HybridCollector extends Collector {
812817
private final OrdinalsCollector ordinalsCollector;
813818
private boolean switchedToDirectCollector = false;
814819

815-
HybridCollector(HyperLogLogPlusPlus counts, SortedSetDocValues ordinalValues,
816-
MurmurHash3Values hashValues, BigArrays bigArrays, long memoryThreshold) {
820+
HybridCollector(
821+
HyperLogLogPlusPlus counts,
822+
SortedSetDocValues ordinalValues,
823+
MurmurHash3Values hashValues,
824+
BigArrays bigArrays,
825+
long memoryThreshold
826+
) {
817827
this.counts = counts;
818828
this.hashValues = hashValues;
819829
this.memoryThreshold = memoryThreshold;

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -723,9 +723,7 @@ public void testHybridCollectorDisabledWithKeywordField() throws IOException {
723723
}, card -> {
724724
assertEquals(2.0, card.getValue(), 0.1);
725725
assertTrue(AggregationInspectionHelper.hasValue(card));
726-
}, collector -> {
727-
assertTrue(collector instanceof OrdinalsCollector);
728-
}, fieldType, false, 1024L * 1024L);
726+
}, collector -> { assertTrue(collector instanceof OrdinalsCollector); }, fieldType, false, 1024L * 1024L);
729727
}
730728

731729
public void testHybridCollectorMemoryThresholdExceeded() throws IOException {

0 commit comments

Comments
 (0)