fixes for multiple star trees and added tests

Signed-off-by: Sarthak Aggarwal <[email protected]>
sarthakaggarwal97 · Sep 29, 2024 · 024e21a · 024e21a
1 parent d510b12
commit 024e21a
Show file tree

Hide file tree

Showing 4 changed files with 434 additions and 32 deletions.
diff --git a/...ain/java/org/opensearch/index/codec/composite/composite99/Composite99DocValuesWriter.java b/...ain/java/org/opensearch/index/codec/composite/composite99/Composite99DocValuesWriter.java
@@ -35,7 +35,6 @@
 import org.opensearch.index.mapper.CompositeMappedFieldType;
 import org.opensearch.index.mapper.DocCountFieldMapper;
 import org.opensearch.index.mapper.MapperService;
-import org.opensearch.index.mapper.StarTreeMapper;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -221,12 +220,8 @@ private void createCompositeIndicesIfPossible(DocValuesProducer valuesProducer,
         }
         // we have all the required fields to build composite fields
         if (compositeFieldSet.isEmpty()) {
-            for (CompositeMappedFieldType mappedType : compositeMappedFieldTypes) {
-                if (mappedType instanceof StarTreeMapper.StarTreeFieldType) {
-                    try (StarTreesBuilder starTreesBuilder = new StarTreesBuilder(state, mapperService, fieldNumberAcrossCompositeFields)) {
-                        starTreesBuilder.build(metaOut, dataOut, fieldProducerMap, composite99DocValuesConsumer);
-                    }
-                }
+            try (StarTreesBuilder starTreesBuilder = new StarTreesBuilder(state, mapperService, fieldNumberAcrossCompositeFields)) {
+                starTreesBuilder.build(metaOut, dataOut, fieldProducerMap, composite99DocValuesConsumer);
             }
         }
     }
@@ -295,16 +290,12 @@ private void mergeStarTreeFields(MergeState mergeState) throws IOException {
                     if (compositeIndexValues instanceof StarTreeValues) {
                         StarTreeValues starTreeValues = (StarTreeValues) compositeIndexValues;
                         List<StarTreeValues> fieldsList = starTreeSubsPerField.getOrDefault(fieldInfo.getField(), new ArrayList<>());
-                        if (starTreeField == null) {
-                            starTreeField = starTreeValues.getStarTreeField();
-                        }
+                        starTreeField = starTreeValues.getStarTreeField();
                         // assert star tree configuration is same across segments
-                        else {
-                            if (starTreeField.equals(starTreeValues.getStarTreeField()) == false) {
-                                throw new IllegalArgumentException(
-                                    "star tree field configuration must match the configuration of the field being merged"
-                                );
-                            }
+                        if (starTreeField.equals(starTreeValues.getStarTreeField()) == false) {
+                            throw new IllegalArgumentException(
+                                "star tree field configuration must match the configuration of the field being merged"
+                            );
                         }
                         fieldsList.add(starTreeValues);
                         starTreeSubsPerField.put(fieldInfo.getField(), fieldsList);

diff --git a/...ain/java/org/opensearch/index/compositeindex/datacube/startree/StarTreeIndexSettings.java b/...ain/java/org/opensearch/index/compositeindex/datacube/startree/StarTreeIndexSettings.java
@@ -35,7 +35,7 @@ public class StarTreeIndexSettings {
         "index.composite_index.star_tree.max_fields",
         1,
         1,
-        1,
+        2,
         Setting.Property.IndexScope,
         Setting.Property.Final
     );