server/src/main/java/org/opensearch/index/codec/freshstartree/builder/BaseSingleTreeBuilder.java

@@ -147,7 +147,7 @@ public abstract class BaseSingleTreeBuilder {
         }
 
         // TODO : Removing hardcoding
-        _maxLeafRecords = 1; // builderConfig.getMaxLeafRecords();
+        _maxLeafRecords = 10000; // builderConfig.getMaxLeafRecords();
     }
 
     private void constructStarTree(StarTreeBuilderUtils.TreeNode node, int startDocId, int endDocId) throws IOException {
@@ -317,7 +317,6 @@ private void createDocValuesIndices(DocValuesConsumer docValuesConsumer) throws
 
         for (int docId = 0; docId < _numDocs; docId++) {
             Record record = getStarTreeRecord(docId);
-            //logger.info("Record during doc values indices : {} ", record.toString());
             for (int i = 0; i < record._dimensions.length; i++) {
                 long val = record._dimensions[i];
                 pendingDimArr[i].add(val);

server/src/main/java/org/opensearch/index/codec/freshstartree/builder/StarTreeBuilderUtils.java

@@ -116,7 +116,6 @@ private static void writeNodes(IndexOutput output, TreeNode rootNode) throws IOE
     }
 
     private static void writeNode(IndexOutput output, TreeNode node, int firstChildId, int lastChildId) throws IOException {
-        //logger.info("Builder util : dim id : {} , dim value : {}", node._dimensionId, node._dimensionValue);
         output.writeInt(node._dimensionId);
         output.writeLong(node._dimensionValue);
         output.writeInt(node._startDocId);

server/src/main/java/org/opensearch/index/codec/freshstartree/codec/Lucene90DocValuesProducerCopy.java

@@ -16,8 +16,6 @@
  */
 package org.opensearch.index.codec.freshstartree.codec;
 
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.lucene.codecs.CodecUtil;
 import org.apache.lucene.codecs.DocValuesProducer;
 import org.apache.lucene.codecs.lucene90.IndexedDISI;
@@ -49,8 +47,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.opensearch.index.codec.freshstartree.query.StarTreeFilter;
-
 
 /**
  * Created a copy to initialize producer without field info stored in state which is the case for
@@ -60,8 +56,6 @@
  */
 public class Lucene90DocValuesProducerCopy extends DocValuesProducer {
 
-    private static final Logger logger = LogManager.getLogger(Lucene90DocValuesProducerCopy.class);
-
     private final Map<String, NumericEntry> numerics;
     private final Map<String, SortedNumericEntry> sortedNumerics;
     private final IndexInput data;

server/src/main/java/org/opensearch/index/codec/freshstartree/codec/StarTreeDocValuesReader.java

@@ -17,8 +17,6 @@
 package org.opensearch.index.codec.freshstartree.codec;
 
 import java.util.LinkedHashMap;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 import org.apache.lucene.codecs.CodecUtil;
 import org.apache.lucene.codecs.DocValuesProducer;
 import org.apache.lucene.index.BinaryDocValues;
@@ -37,13 +35,10 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import org.opensearch.index.codec.freshstartree.query.StarTreeFilter;
 
 
 /** Custom star tree doc values reader */
 public class StarTreeDocValuesReader extends DocValuesProducer {
-    private static final Logger logger = LogManager.getLogger(StarTreeDocValuesReader.class);
-
     private DocValuesProducer delegate;
 
     private IndexInput data;
@@ -76,9 +71,7 @@ public NumericDocValues getNumeric(FieldInfo field) throws IOException {
 
     @Override
     public StarTreeAggregatedValues getAggregatedDocValues() throws IOException {
-        // starTree.printTree(new HashMap<>());
         List<String> dimensionsSplitOrder = starTree.getDimensionNames();
-        //logger.info("Dimension order {}", dimensionsSplitOrder);
         for (int i = 0; i < dimensionsSplitOrder.size(); i++) {
             dimensionValues.put(dimensionsSplitOrder.get(i), valuesProducer.getNumeric(dimensionsSplitOrder.get(i) + "_dim"));
         }

server/src/main/java/org/opensearch/index/codec/freshstartree/node/OffHeapStarTree.java

@@ -28,8 +28,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.StringJoiner;
-import org.opensearch.index.codec.freshstartree.builder.OffHeapBufferedSingleTreeBuilder;
-
 
 /** Off heap implementation of star tree. */
 public class OffHeapStarTree implements StarTree {

server/src/main/java/org/opensearch/index/codec/freshstartree/query/StarTreeFilter.java

@@ -166,8 +166,7 @@ private StarTreeResult traverseStarTree() throws IOException {
             // If all predicate columns and group-by columns are matched, we can use aggregated document
             if (remainingPredicateColumns.isEmpty() && remainingGroupByColumns.isEmpty()) {
                 adder = docsWithField.grow(1);
-                int aggrDocId = starTreeNode.getAggregatedDocId();
-                adder.add(aggrDocId);
+                adder.add(starTreeNode.getAggregatedDocId());
                 continue;
             }
 
@@ -179,7 +178,6 @@ private StarTreeResult traverseStarTree() throws IOException {
             if (starTreeNode.isLeaf()) {
                 for (long i = starTreeNode.getStartDocId(); i < starTreeNode.getEndDocId(); i++) {
                     adder = docsWithField.grow(1);
-                    logger.info("Adding normal doc id {}", i);
                     adder.add((int) i);
                 }
                 continue;