addressing comments

Signed-off-by: Bharathwaj G <[email protected]>
opensearch-project · Jun 28, 2024 · 95e8d25 · 95e8d25
1 parent 0a28513
commit 95e8d25
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/distribution/src/config/jvm.options b/distribution/src/config/jvm.options
@@ -85,3 +85,4 @@ ${error.file}
 
 # HDFS ForkJoinPool.common() support by SecurityManager
 -Djava.util.concurrent.ForkJoinPool.common.threadFactory=org.opensearch.secure_sm.SecuredForkJoinWorkerThreadFactory
+-Dopensearch.experimental.feature.composite_index.star_tree.enabled=true
diff --git a/...e/startree/StarTreeMappingIntegTests.java → ...earch/index/mapper/StarTreeMapper1IT.java b/...e/startree/StarTreeMappingIntegTests.java → ...earch/index/mapper/StarTreeMapper1IT.java
@@ -6,7 +6,7 @@
  * compatible open source license.
  */
 
-package org.opensearch.index.compositeindex.datacube.startree;
+package org.opensearch.index.mapper;
 
 import org.opensearch.action.support.master.AcknowledgedResponse;
 import org.opensearch.common.Rounding;
@@ -18,9 +18,7 @@
 import org.opensearch.index.compositeindex.CompositeIndexSettings;
 import org.opensearch.index.compositeindex.datacube.DateDimension;
 import org.opensearch.index.compositeindex.datacube.MetricStat;
-import org.opensearch.index.mapper.CompositeMappedFieldType;
-import org.opensearch.index.mapper.MapperParsingException;
-import org.opensearch.index.mapper.StarTreeMapper;
+import org.opensearch.index.compositeindex.datacube.startree.StarTreeFieldConfiguration;
 import org.opensearch.indices.IndicesService;
 import org.opensearch.test.OpenSearchIntegTestCase;
 import org.junit.After;
@@ -35,7 +33,10 @@
 import static org.opensearch.common.xcontent.XContentFactory.jsonBuilder;
 import static org.opensearch.test.hamcrest.OpenSearchAssertions.assertAcked;
 
-public class StarTreeMappingIntegTests extends OpenSearchIntegTestCase {
+/**
+ * Integration tests for star tree mapper
+ */
+public class StarTreeMapper1IT extends OpenSearchIntegTestCase {
     private static final String TEST_INDEX = "test";
 
     private static XContentBuilder createMinimalTestMapping(boolean invalidDim, boolean invalidMetric, boolean keywordDim) {
@@ -360,5 +361,4 @@ public final void cleanupNodeSettings() {
                 .setTransientSettings(Settings.builder().putNull("*"))
         );
     }
-
 }
diff --git a/server/src/main/java/org/opensearch/index/mapper/StarTreeMapper.java b/server/src/main/java/org/opensearch/index/mapper/StarTreeMapper.java
@@ -91,9 +91,7 @@ public static class Builder extends ParametrizedFieldMapper.Builder {
                 paramMap.remove(ORDERED_DIMENSIONS);
                 List<Metric> metrics = buildMetrics(name, paramMap, context);
                 paramMap.remove(METRICS);
-                if (paramMap.containsKey(CompositeDataCubeFieldType.NAME)) {
-                    paramMap.remove(CompositeDataCubeFieldType.NAME);
-                }
+                paramMap.remove(CompositeDataCubeFieldType.NAME);
                 for (String dim : skipStarInDims) {
                     if (dimensions.stream().filter(d -> d.getField().equals(dim)).findAny().isEmpty()) {
                         throw new IllegalArgumentException(
Original file line number	Diff line number	Diff line change
Expand Up		@@ -85,3 +85,4 @@ ${error.file}

		# HDFS ForkJoinPool.common() support by SecurityManager
		-Djava.util.concurrent.ForkJoinPool.common.threadFactory=org.opensearch.secure_sm.SecuredForkJoinWorkerThreadFactory
		-Dopensearch.experimental.feature.composite_index.star_tree.enabled=true