rebasing with main

Signed-off-by: Sandesh Kumar <sandeshkr419@gmail.com>
sandeshkr419 · Sep 5, 2024 · b5cf274 · b5cf274
1 parent 1c027e0
commit b5cf274
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 10 deletions.
diff --git a/server/src/main/java/org/opensearch/search/aggregations/metrics/AvgAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/metrics/AvgAggregator.java
@@ -34,13 +34,13 @@
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.SortedNumericDocValues;
 import org.apache.lucene.search.ScoreMode;
+import org.apache.lucene.util.NumericUtils;
 import org.opensearch.common.lease.Releasables;
 import org.opensearch.common.util.BigArrays;
 import org.opensearch.common.util.DoubleArray;
 import org.opensearch.common.util.LongArray;
 import org.opensearch.index.codec.composite.CompositeIndexFieldInfo;
 import org.opensearch.index.compositeindex.datacube.MetricStat;
-import org.opensearch.index.compositeindex.datacube.startree.aggregators.numerictype.StarTreeNumericTypeConverters;
 import org.opensearch.index.compositeindex.datacube.startree.index.StarTreeValues;
 import org.opensearch.index.compositeindex.datacube.startree.utils.StarTreeUtils;
 import org.opensearch.index.fielddata.SortedNumericDoubleValues;
@@ -184,7 +184,7 @@ public void collect(int doc, long bucket) throws IOException {
                     kahanSummation.reset(sum, compensation);
 
                     for (int i = 0; i < valueCount; i++) {
-                        double value = StarTreeNumericTypeConverters.sortableLongtoDouble(values.nextValue());
+                        double value = NumericUtils.sortableLongToDouble(values.nextValue());
                         kahanSummation.add(value);
                     }
 

diff --git a/server/src/main/java/org/opensearch/search/aggregations/metrics/MaxAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/metrics/MaxAggregator.java
@@ -38,12 +38,12 @@
 import org.apache.lucene.search.CollectionTerminatedException;
 import org.apache.lucene.search.ScoreMode;
 import org.apache.lucene.util.Bits;
+import org.apache.lucene.util.NumericUtils;
 import org.opensearch.common.lease.Releasables;
 import org.opensearch.common.util.BigArrays;
 import org.opensearch.common.util.DoubleArray;
 import org.opensearch.index.codec.composite.CompositeIndexFieldInfo;
 import org.opensearch.index.compositeindex.datacube.MetricStat;
-import org.opensearch.index.compositeindex.datacube.startree.aggregators.numerictype.StarTreeNumericTypeConverters;
 import org.opensearch.index.compositeindex.datacube.startree.index.StarTreeValues;
 import org.opensearch.index.compositeindex.datacube.startree.utils.StarTreeUtils;
 import org.opensearch.index.fielddata.NumericDoubleValues;
@@ -186,7 +186,7 @@ public void collect(int doc, long bucket) throws IOException {
                     maxes.fill(from, maxes.size(), Double.NEGATIVE_INFINITY);
                 }
                 if (values.advanceExact(doc)) {
-                    final double value = StarTreeNumericTypeConverters.sortableLongtoDouble(values.nextValue());
+                    final double value = NumericUtils.sortableLongToDouble(values.nextValue());
                     double max = maxes.get(bucket);
                     max = Math.max(max, value);
                     maxes.set(bucket, max);

diff --git a/server/src/main/java/org/opensearch/search/aggregations/metrics/MinAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/metrics/MinAggregator.java
@@ -38,12 +38,12 @@
 import org.apache.lucene.search.CollectionTerminatedException;
 import org.apache.lucene.search.ScoreMode;
 import org.apache.lucene.util.Bits;
+import org.apache.lucene.util.NumericUtils;
 import org.opensearch.common.lease.Releasables;
 import org.opensearch.common.util.BigArrays;
 import org.opensearch.common.util.DoubleArray;
 import org.opensearch.index.codec.composite.CompositeIndexFieldInfo;
 import org.opensearch.index.compositeindex.datacube.MetricStat;
-import org.opensearch.index.compositeindex.datacube.startree.aggregators.numerictype.StarTreeNumericTypeConverters;
 import org.opensearch.index.compositeindex.datacube.startree.index.StarTreeValues;
 import org.opensearch.index.compositeindex.datacube.startree.utils.StarTreeUtils;
 import org.opensearch.index.fielddata.NumericDoubleValues;
@@ -183,7 +183,7 @@ public void collect(int doc, long bucket) throws IOException {
                     mins.fill(from, mins.size(), Double.POSITIVE_INFINITY);
                 }
                 if (values.advanceExact(doc)) {
-                    final double value = StarTreeNumericTypeConverters.sortableLongtoDouble(values.nextValue());
+                    final double value = NumericUtils.sortableLongToDouble(values.nextValue());
                     double min = mins.get(bucket);
                     min = Math.min(min, value);
                     mins.set(bucket, min);

diff --git a/server/src/main/java/org/opensearch/search/aggregations/metrics/SumAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/metrics/SumAggregator.java
@@ -34,12 +34,12 @@
 import org.apache.lucene.index.LeafReaderContext;
 import org.apache.lucene.index.SortedNumericDocValues;
 import org.apache.lucene.search.ScoreMode;
+import org.apache.lucene.util.NumericUtils;
 import org.opensearch.common.lease.Releasables;
 import org.opensearch.common.util.BigArrays;
 import org.opensearch.common.util.DoubleArray;
 import org.opensearch.index.codec.composite.CompositeIndexFieldInfo;
 import org.opensearch.index.compositeindex.datacube.MetricStat;
-import org.opensearch.index.compositeindex.datacube.startree.aggregators.numerictype.StarTreeNumericTypeConverters;
 import org.opensearch.index.compositeindex.datacube.startree.index.StarTreeValues;
 import org.opensearch.index.compositeindex.datacube.startree.utils.StarTreeUtils;
 import org.opensearch.index.fielddata.SortedNumericDoubleValues;
@@ -164,7 +164,7 @@ public void collect(int doc, long bucket) throws IOException {
                     kahanSummation.reset(sum, compensation);
 
                     for (int i = 0; i < valuesCount; i++) {
-                        double value = StarTreeNumericTypeConverters.sortableLongtoDouble(values.nextValue());
+                        double value = NumericUtils.sortableLongToDouble(values.nextValue());
                         kahanSummation.add(value);
                     }
 

diff --git a/...rg/opensearch/index/codec/composite99/datacube/startree/StarTreeDocValuesFormatTests.java b/...rg/opensearch/index/codec/composite99/datacube/startree/StarTreeDocValuesFormatTests.java
@@ -111,8 +111,7 @@ protected Codec getCodec() {
         return codec;
     }
 
-    // TODO: Awaiting a fix in indexing - disabling test for meantime
-    private void testStarTreeDocValues() throws IOException {
+    public void testStarTreeDocValues() throws IOException {
         Directory directory = newDirectory();
         IndexWriterConfig conf = newIndexWriterConfig(null);
         conf.setMergePolicy(newLogMergePolicy());