Skip to content

Commit 2d7dfb1

Browse files
committed
add missing asserts, increase code coverage
Signed-off-by: Sandesh Kumar <sandeshkr419@gmail.com>
1 parent ad3ee18 commit 2d7dfb1

File tree

4 files changed

+13
-21
lines changed

4 files changed

+13
-21
lines changed

CHANGELOG-3.0.md

-21
This file was deleted.

server/src/main/java/org/opensearch/search/aggregations/bucket/range/RangeAggregator.java

+3
Original file line numberDiff line numberDiff line change
@@ -547,6 +547,9 @@ private void computeMatchingRange(RangeAggregator.Range[] ranges, int lowBound,
547547
}
548548
}
549549

550+
assert startLo == lowBound || value >= maxTo[startLo - 1];
551+
assert endHi == ranges.length - 1 || value < ranges[endHi + 1].from;
552+
550553
this.startLo = startLo;
551554
this.endHi = endHi;
552555
}

server/src/test/java/org/opensearch/search/SearchServiceStarTreeTests.java

+7
Original file line numberDiff line numberDiff line change
@@ -727,6 +727,7 @@ public void testQueryParsingForRangeAggregations() throws IOException {
727727
);
728728
String KEYWORD_FIELD = "clientip";
729729
String NUMERIC_FIELD = "size";
730+
String NUMERIC_FIELD_NOT_ORDERED_DIMENSION = "rank";
730731

731732
MaxAggregationBuilder maxAggNoSub = max("max").field(FIELD_NAME);
732733
SumAggregationBuilder sumAggSub = sum("sum").field(FIELD_NAME).subAggregation(maxAggNoSub);
@@ -794,6 +795,12 @@ public void testQueryParsingForRangeAggregations() throws IOException {
794795
sourceBuilder = new SearchSourceBuilder().size(0).query(new TermQueryBuilder(FIELD_NAME, 1)).aggregation(rangeAggregationBuilder);
795796
assertStarTreeContext(request, sourceBuilder, null, -1);
796797

798+
// Case 5: Range Aggregation on field not in ordered dimensions, should not use star tree
799+
rangeAggregationBuilder = range("range").field(NUMERIC_FIELD_NOT_ORDERED_DIMENSION).addRange(0, 100).subAggregation(medianAgg);
800+
baseQuery = new MatchAllQueryBuilder();
801+
sourceBuilder = new SearchSourceBuilder().size(0).query(baseQuery).aggregation(rangeAggregationBuilder);
802+
assertStarTreeContext(request, sourceBuilder, null, -1);
803+
797804
setStarTreeIndexSetting(null);
798805
}
799806

server/src/test/java/org/opensearch/search/aggregations/startree/NumericTermsAggregatorTests.java

+3
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,9 @@ public static XContentBuilder getExpandedMapping(int maxLeafDocs, boolean skipSt
323323
b.startObject("size");
324324
b.field("type", "float");
325325
b.endObject();
326+
b.startObject("rank");
327+
b.field("type", "integer");
328+
b.endObject();
326329
b.startObject("geoip");
327330
b.startObject("properties");
328331
b.startObject("country_name");

0 commit comments

Comments
 (0)