nits

Signed-off-by: Sarthak Aggarwal <[email protected]>
opensearch-project · Jul 5, 2024 · a1c8f14 · a1c8f14
1 parent 3e94f68
commit a1c8f14
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/server/src/main/java/org/apache/lucene/index/BaseStarTreeBuilder.java b/server/src/main/java/org/apache/lucene/index/BaseStarTreeBuilder.java
@@ -199,7 +199,7 @@ public List<MetricAggregatorInfo> generateMetricAggregatorInfos(MapperService ma
      * @param dimensionId dimension id
      * @return dimension value
      */
-    public abstract long getDimensionValue(int docId, int dimensionId) throws IOException;
+    public abstract Long getDimensionValue(int docId, int dimensionId) throws IOException;
 
     /**
      * Sorts and aggregates the star-tree document in the segment, and returns a star-tree document iterator for all the
@@ -522,10 +522,10 @@ private Map<Long, StarTreeBuilderUtils.TreeNode> constructNonStarNodes(int start
         throws IOException {
         Map<Long, StarTreeBuilderUtils.TreeNode> nodes = new HashMap<>();
         int nodeStartDocId = startDocId;
-        long nodeDimensionValue = getDimensionValue(startDocId, dimensionId);
+        Long nodeDimensionValue = getDimensionValue(startDocId, dimensionId);
         for (int i = startDocId + 1; i < endDocId; i++) {
-            long dimensionValue = getDimensionValue(i, dimensionId);
-            if (dimensionValue != nodeDimensionValue) {
+            Long dimensionValue = getDimensionValue(i, dimensionId);
+            if (!dimensionValue.equals(nodeDimensionValue)) {
                 StarTreeBuilderUtils.TreeNode child = getNewNode();
                 child.dimensionId = dimensionId;
                 child.dimensionValue = nodeDimensionValue;

diff --git a/.../org/opensearch/index/compositeindex/datacube/startree/builder/OnHeapStarTreeBuilder.java b/.../org/opensearch/index/compositeindex/datacube/startree/builder/OnHeapStarTreeBuilder.java
@@ -64,9 +64,8 @@ public List<StarTreeDocument> getStarTreeDocuments() {
         return starTreeDocuments;
     }
 
-    // TODO: should this be just long?
     @Override
-    public long getDimensionValue(int docId, int dimensionId) throws IOException {
+    public Long getDimensionValue(int docId, int dimensionId) throws IOException {
         return starTreeDocuments.get(docId).dimensions[dimensionId];
     }
 

diff --git a/...g/opensearch/index/compositeindex/datacube/startree/builder/BaseStarTreeBuilderTests.java b/...g/opensearch/index/compositeindex/datacube/startree/builder/BaseStarTreeBuilderTests.java
@@ -171,8 +171,8 @@ public List<StarTreeDocument> getStarTreeDocuments() {
             }
 
             @Override
-            public long getDimensionValue(int docId, int dimensionId) throws IOException {
-                return 0;
+            public Long getDimensionValue(int docId, int dimensionId) throws IOException {
+                return 0L;
             }
 
             @Override