nits

Signed-off-by: Sarthak Aggarwal <[email protected]>
sarthakaggarwal97 · Aug 30, 2024 · 7a67510 · 7a67510
1 parent ab9ae10
commit 7a67510
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 49 deletions.
diff --git a/...va/org/opensearch/index/compositeindex/datacube/startree/builder/BaseStarTreeBuilder.java b/...va/org/opensearch/index/compositeindex/datacube/startree/builder/BaseStarTreeBuilder.java
@@ -227,7 +227,7 @@ public void build(
             String dimension = dimensionsSplitOrder.get(i).getField();
             FieldInfo dimensionFieldInfo = writeState.fieldInfos.fieldInfo(dimension);
             if (dimensionFieldInfo == null) {
-                dimensionFieldInfo = getFieldInfo(dimension, 0);
+                dimensionFieldInfo = getFieldInfo(dimension, DocValuesType.SORTED_NUMERIC, 0);
             }
             dimensionReaders[i] = new SequentialDocValuesIterator(
                 fieldProducerMap.get(dimensionFieldInfo.name).getSortedNumeric(dimensionFieldInfo)
@@ -320,6 +320,7 @@ private void createSortedDocValuesIndices(DocValuesConsumer docValuesConsumer, A
                     starTreeField.getName(),
                     starTreeField.getDimensionsOrder().get(i).getField()
                 ),
+                DocValuesType.SORTED_NUMERIC,
                 fieldNumberAcrossStarTrees.getAndIncrement()
             );
             dimensionFieldInfoList[i] = fi;
@@ -333,6 +334,7 @@ private void createSortedDocValuesIndices(DocValuesConsumer docValuesConsumer, A
                     metricAggregatorInfos.get(i).getField(),
                     metricAggregatorInfos.get(i).getMetricStat().getTypeName()
                 ),
+                DocValuesType.SORTED_NUMERIC,
                 fieldNumberAcrossStarTrees.getAndIncrement()
             );
 

diff --git a/...ava/org/opensearch/index/compositeindex/datacube/startree/fileformats/StarTreeWriter.java b/...ava/org/opensearch/index/compositeindex/datacube/startree/fileformats/StarTreeWriter.java
@@ -11,7 +11,7 @@
 import org.opensearch.index.compositeindex.datacube.startree.StarTreeField;
 import org.opensearch.index.compositeindex.datacube.startree.aggregators.MetricAggregatorInfo;
 import org.opensearch.index.compositeindex.datacube.startree.fileformats.data.StarTreeDataWriter;
-import org.opensearch.index.compositeindex.datacube.startree.fileformats.meta.StarTreeMetaWriter;
+import org.opensearch.index.compositeindex.datacube.startree.fileformats.meta.StarTreeMetadataWriter;
 import org.opensearch.index.compositeindex.datacube.startree.node.InMemoryTreeNode;
 
 import java.io.IOException;
@@ -69,7 +69,7 @@ public void writeStarTreeMetadata(
         long dataFilePointer,
         long dataFileLength
     ) throws IOException {
-        StarTreeMetaWriter.writeStarTreeMetadata(
+        StarTreeMetadataWriter.writeStarTreeMetadata(
             metaOut,
             starTreeField,
             metricAggregatorInfos,

diff --git a/.../fileformats/meta/StarTreeMetaWriter.java → ...eformats/meta/StarTreeMetadataWriter.java b/.../fileformats/meta/StarTreeMetaWriter.java → ...eformats/meta/StarTreeMetadataWriter.java
@@ -29,9 +29,9 @@
  *
  * @opensearch.experimental
  */
-public class StarTreeMetaWriter {
+public class StarTreeMetadataWriter {
 
-    private static final Logger logger = LogManager.getLogger(StarTreeMetaWriter.class);
+    private static final Logger logger = LogManager.getLogger(StarTreeMetadataWriter.class);
 
     /**
      * Writes the star-tree metadata.

diff --git a/.../opensearch/index/compositeindex/datacube/startree/utils/SequentialDocValuesIterator.java b/.../opensearch/index/compositeindex/datacube/startree/utils/SequentialDocValuesIterator.java
@@ -9,7 +9,6 @@
 
 package org.opensearch.index.compositeindex.datacube.startree.utils;
 
-import org.apache.lucene.index.DocValues;
 import org.apache.lucene.index.SortedNumericDocValues;
 import org.apache.lucene.search.DocIdSetIterator;
 import org.opensearch.common.annotation.ExperimentalApi;
@@ -48,32 +47,6 @@ public SequentialDocValuesIterator(DocIdSetIterator docIdSetIterator) {
         this.docIdSetIterator = docIdSetIterator;
     }
 
-    /**
-     * Constructs a new SequentialDocValuesIterator instance with an empty sorted numeric.
-     *
-     */
-    public SequentialDocValuesIterator() {
-        this.docIdSetIterator = DocValues.emptySortedNumeric();
-    }
-
-    /**
-     * Returns the value associated with the latest document.
-     *
-     * @return the value associated with the latest document
-     */
-    public Long getDocValue() {
-        return docValue;
-    }
-
-    /**
-     * Sets the value associated with the latest document.
-     *
-     * @param docValue the value to be associated with the latest document
-     */
-    public void setDocValue(Long docValue) {
-        this.docValue = docValue;
-    }
-
     /**
      * Returns the id of the latest document.
      *
@@ -88,7 +61,7 @@ public int getDocId() {
      *
      * @param docId the ID of the latest document
      */
-    public void setDocId(int docId) {
+    private void setDocId(int docId) {
         this.docId = docId;
     }
 

diff --git a/.../main/java/org/opensearch/index/compositeindex/datacube/startree/utils/StarTreeUtils.java b/.../main/java/org/opensearch/index/compositeindex/datacube/startree/utils/StarTreeUtils.java
@@ -74,22 +74,12 @@ public static FieldInfo[] getFieldInfoList(List<String> fields) {
         int fieldNumber = 0;
 
         for (String fieldName : fields) {
-            fieldInfoList[fieldNumber] = getFieldInfo(fieldName, fieldNumber);
+            fieldInfoList[fieldNumber] = getFieldInfo(fieldName, DocValuesType.SORTED_NUMERIC, fieldNumber);
             fieldNumber++;
         }
         return fieldInfoList;
     }
 
-    /**
-     * Get new field info instance for a given field name and field number
-     * @param fieldName name of the field
-     * @param fieldNumber number of the field
-     * @return new field info instance
-     */
-    public static FieldInfo getFieldInfo(String fieldName, int fieldNumber) {
-        return getFieldInfo(fieldName, DocValuesType.SORTED_NUMERIC, fieldNumber);
-    }
-
     /**
      * Get new field info instance for a given field name and field number
      * @param fieldName name of the field

diff --git a/server/src/main/java/org/opensearch/index/engine/SegmentsStats.java b/server/src/main/java/org/opensearch/index/engine/SegmentsStats.java
@@ -98,10 +98,10 @@ public class SegmentsStats implements Writeable, ToXContentFragment {
         Map.entry("tvd", "Term Vector Documents"),
         Map.entry("tvf", "Term Vector Fields"),
         Map.entry("liv", "Live Documents"),
-        Map.entry(Composite99DocValuesFormat.DATA_EXTENSION, "Term Vector Index"),
-        Map.entry(Composite99DocValuesFormat.META_EXTENSION, "Term Vector Documents"),
-        Map.entry(Composite99DocValuesFormat.DATA_DOC_VALUES_EXTENSION, "Term Vector Fields"),
-        Map.entry(Composite99DocValuesFormat.META_DOC_VALUES_EXTENSION, "Live Documents"),
+        Map.entry(Composite99DocValuesFormat.DATA_EXTENSION, "Composite Index"),
+        Map.entry(Composite99DocValuesFormat.META_EXTENSION, "Composite Index"),
+        Map.entry(Composite99DocValuesFormat.DATA_DOC_VALUES_EXTENSION, "Composite Index DocValues"),
+        Map.entry(Composite99DocValuesFormat.META_DOC_VALUES_EXTENSION, "Composite Index DocValues"),
         Map.entry(FuzzyFilterPostingsFormat.FUZZY_FILTER_FILE_EXTENSION, "Fuzzy Filter")
     );
 

diff --git a/.../java/org/opensearch/index/compositeindex/datacube/startree/utils/StarTreeUtilsTests.java b/.../java/org/opensearch/index/compositeindex/datacube/startree/utils/StarTreeUtilsTests.java
@@ -52,7 +52,7 @@ public void testGetFieldInfoList() {
     public void testGetFieldInfo() {
         String fieldName = UUID.randomUUID().toString();
         int fieldNumber = randomInt();
-        assertFieldInfos(StarTreeUtils.getFieldInfo(fieldName, fieldNumber), fieldName, fieldNumber);
+        assertFieldInfos(StarTreeUtils.getFieldInfo(fieldName, DocValuesType.SORTED_NUMERIC, fieldNumber), fieldName, fieldNumber);
 
     }