Skip to content

Commit bdbe58e

Browse files
adding startreenode related tests
Signed-off-by: Bharathwaj G <[email protected]>
1 parent c55460f commit bdbe58e

File tree

3 files changed

+537
-191
lines changed

3 files changed

+537
-191
lines changed

server/src/main/java/org/opensearch/index/codec/composite/Composite99DocValuesWriter.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,8 @@ private void mergeStarTreeFields(MergeState mergeState) throws IOException {
195195
}
196196
}
197197
}
198-
final StarTreesBuilder starTreesBuilder = new StarTreesBuilder(state, mapperService);
199-
starTreesBuilder.buildDuringMerge(starTreeSubsPerField);
198+
try (StarTreesBuilder starTreesBuilder = new StarTreesBuilder(state, mapperService)) {
199+
starTreesBuilder.buildDuringMerge(starTreeSubsPerField);
200+
}
200201
}
201202
}

server/src/main/java/org/opensearch/index/compositeindex/datacube/startree/builder/BaseStarTreeBuilder.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ protected BaseStarTreeBuilder(StarTreeField starTreeField, SegmentWriteState sta
120120
public List<MetricAggregatorInfo> generateMetricAggregatorInfos(MapperService mapperService) {
121121
List<MetricAggregatorInfo> metricAggregatorInfos = new ArrayList<>();
122122
for (Metric metric : this.starTreeField.getMetrics()) {
123-
for (MetricStat metricType : metric.getMetrics()) {
123+
for (MetricStat metricStat : metric.getMetrics()) {
124124
IndexNumericFieldData.NumericType numericType;
125125
Mapper fieldMapper = mapperService.documentMapper().mappers().getMapper(metric.getField());
126126
if (fieldMapper instanceof NumberFieldMapper) {
@@ -131,7 +131,7 @@ public List<MetricAggregatorInfo> generateMetricAggregatorInfos(MapperService ma
131131
}
132132

133133
MetricAggregatorInfo metricAggregatorInfo = new MetricAggregatorInfo(
134-
metricType,
134+
metricStat,
135135
metric.getField(),
136136
starTreeField.getName(),
137137
numericType
@@ -457,13 +457,13 @@ public List<SequentialDocValuesIterator> getMetricReaders(SegmentWriteState stat
457457
throws IOException {
458458
List<SequentialDocValuesIterator> metricReaders = new ArrayList<>();
459459
for (Metric metric : this.starTreeField.getMetrics()) {
460-
for (MetricStat metricType : metric.getMetrics()) {
460+
for (MetricStat metricStat : metric.getMetrics()) {
461461
FieldInfo metricFieldInfo = state.fieldInfos.fieldInfo(metric.getField());
462462
if (metricFieldInfo == null) {
463463
metricFieldInfo = getFieldInfo(metric.getField());
464464
}
465465
// TODO
466-
// if (metricType != MetricStat.COUNT) {
466+
// if (metricStat != MetricStat.COUNT) {
467467
// Need not initialize the metric reader for COUNT metric type
468468
SequentialDocValuesIterator metricReader = new SequentialDocValuesIterator(
469469
fieldProducerMap.get(metricFieldInfo.name).getSortedNumeric(metricFieldInfo)
@@ -516,6 +516,10 @@ void build(Iterator<StarTreeDocument> starTreeDocumentIterator) throws IOExcepti
516516

517517
}
518518

519+
TreeNode getRootNode() {
520+
return rootNode;
521+
}
522+
519523
/**
520524
* Adds a document to star-tree
521525
*

0 commit comments

Comments
 (0)