Move minExcludeNaN, maxExcludeNaN to MoreMath

trinodb · Mar 11, 2022 · 291b65d · 291b65d
1 parent 8063841
commit 291b65d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 22 deletions.
diff --git a/core/trino-main/src/main/java/io/trino/cost/StatisticRange.java b/core/trino-main/src/main/java/io/trino/cost/StatisticRange.java
@@ -17,6 +17,8 @@
 
 import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
+import static io.trino.util.MoreMath.maxExcludeNaN;
+import static io.trino.util.MoreMath.minExcludeNaN;
 import static java.lang.Double.NaN;
 import static java.lang.Double.isFinite;
 import static java.lang.Double.isInfinite;
@@ -173,28 +175,6 @@ public StatisticRange addAndCollapseDistinctValues(StatisticRange other)
         return new StatisticRange(minExcludeNaN(low, other.low), maxExcludeNaN(high, other.high), newDistinctValues);
     }
 
-    private static double minExcludeNaN(double v1, double v2)
-    {
-        if (isNaN(v1)) {
-            return v2;
-        }
-        if (isNaN(v2)) {
-            return v1;
-        }
-        return min(v1, v2);
-    }
-
-    private static double maxExcludeNaN(double v1, double v2)
-    {
-        if (isNaN(v1)) {
-            return v2;
-        }
-        if (isNaN(v2)) {
-            return v1;
-        }
-        return max(v1, v2);
-    }
-
     @Override
     public boolean equals(Object o)
     {

diff --git a/core/trino-main/src/main/java/io/trino/util/MoreMath.java b/core/trino-main/src/main/java/io/trino/util/MoreMath.java
@@ -122,4 +122,26 @@ public static double averageExcludingNaNs(double first, double second)
         }
         return firstNonNaN(first, second);
     }
+
+    public static double minExcludeNaN(double v1, double v2)
+    {
+        if (isNaN(v1)) {
+            return v2;
+        }
+        if (isNaN(v2)) {
+            return v1;
+        }
+        return min(v1, v2);
+    }
+
+    public static double maxExcludeNaN(double v1, double v2)
+    {
+        if (isNaN(v1)) {
+            return v2;
+        }
+        if (isNaN(v2)) {
+            return v1;
+        }
+        return max(v1, v2);
+    }
 }