Refactor ip comparator to comparator

Signed-off-by: Yuanchun Shen <yuanchu@amazon.com>

Author: yuancu

core/src/main/java/org/opensearch/sql/expression/function/PPLBuiltinOperators.java

@@ -71,7 +71,7 @@
 import org.opensearch.sql.expression.function.udf.datetime.WeekdayFunction;
 import org.opensearch.sql.expression.function.udf.datetime.YearweekFunction;
 import org.opensearch.sql.expression.function.udf.ip.CidrMatchFunction;
-import org.opensearch.sql.expression.function.udf.ip.CompareIpFunction;
+import org.opensearch.sql.expression.function.udf.CompareFunctions;
 import org.opensearch.sql.expression.function.udf.math.CRC32Function;
 import org.opensearch.sql.expression.function.udf.math.ConvFunction;
 import org.opensearch.sql.expression.function.udf.math.DivideFunction;
@@ -107,12 +107,12 @@ public class PPLBuiltinOperators extends ReflectiveSqlOperatorTable {
   public static final SqlOperator CIDRMATCH = new CidrMatchFunction().toUDF("CIDRMATCH");
 
   // Comparing functions
-  public static final SqlOperator NOT_EQUALS = CompareIpFunction.notEquals().toUDF("NOT_EQUALS");
-  public static final SqlOperator EQUALS = CompareIpFunction.equals().toUDF("EQUALS");
-  public static final SqlOperator GREATER = CompareIpFunction.greater().toUDF("GREATER");
-  public static final SqlOperator GTE = CompareIpFunction.greaterOrEquals().toUDF("GTE");
-  public static final SqlOperator LESS = CompareIpFunction.less().toUDF("LESS");
-  public static final SqlOperator LTE = CompareIpFunction.lessOrEquals().toUDF("LTE");
+  public static final SqlOperator NOT_EQUALS = CompareFunctions.notEquals().toUDF("NOT_EQUALS");
+  public static final SqlOperator EQUALS = CompareFunctions.equals().toUDF("EQUALS");
+  public static final SqlOperator GREATER = CompareFunctions.greater().toUDF("GREATER");
+  public static final SqlOperator GTE = CompareFunctions.greaterOrEquals().toUDF("GTE");
+  public static final SqlOperator LESS = CompareFunctions.less().toUDF("LESS");
+  public static final SqlOperator LTE = CompareFunctions.lessOrEquals().toUDF("LTE");
 
   // Condition function
   public static final SqlOperator EARLIEST = new EarliestFunction().toUDF("EARLIEST");

core/src/main/java/org/opensearch/sql/expression/function/udf/ip/CompareIpFunction.java renamed to core/src/main/java/org/opensearch/sql/expression/function/udf/CompareFunctions.java

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-package org.opensearch.sql.expression.function.udf.ip;
+package org.opensearch.sql.expression.function.udf;
 
 import java.util.List;
 import org.apache.calcite.adapter.enumerable.NotNullImplementor;
@@ -22,44 +22,43 @@
 import org.opensearch.sql.expression.function.UDFOperandMetadata;
 
 /**
- * {@code compare(ip1, ip2)} compares two IP addresses using a provided op.
+ * {@code compare(value1, value2)} compares two values. It extends Calcite's built-in comparators by
+ * supporting IP comparison.
  *
  * <p>Signature:
  *
  * <ul>
- *   <li>(IP, STRING) -> BOOLEAN
- *   <li>(STRING, IP) -> BOOLEAN
- *   <li>(IP, IP) -> BOOLEAN
+ *   <li>(COMPARABLE, COMPARABLE) -> BOOLEAN
  * </ul>
  */
-public class CompareIpFunction extends ImplementorUDF {
+public class CompareFunctions extends ImplementorUDF {
 
-  private CompareIpFunction(ComparisonType comparisonType) {
+  private CompareFunctions(ComparisonType comparisonType) {
     super(new CompareImplementor(comparisonType), NullPolicy.ANY);
   }
 
-  public static CompareIpFunction less() {
-    return new CompareIpFunction(ComparisonType.LESS);
+  public static CompareFunctions less() {
+    return new CompareFunctions(ComparisonType.LESS);
   }
 
-  public static CompareIpFunction greater() {
-    return new CompareIpFunction(ComparisonType.GREATER);
+  public static CompareFunctions greater() {
+    return new CompareFunctions(ComparisonType.GREATER);
   }
 
-  public static CompareIpFunction lessOrEquals() {
-    return new CompareIpFunction(ComparisonType.LESS_OR_EQUAL);
+  public static CompareFunctions lessOrEquals() {
+    return new CompareFunctions(ComparisonType.LESS_OR_EQUAL);
   }
 
-  public static CompareIpFunction greaterOrEquals() {
-    return new CompareIpFunction(ComparisonType.GREATER_OR_EQUAL);
+  public static CompareFunctions greaterOrEquals() {
+    return new CompareFunctions(ComparisonType.GREATER_OR_EQUAL);
   }
 
-  public static CompareIpFunction equals() {
-    return new CompareIpFunction(ComparisonType.EQUALS);
+  public static CompareFunctions equals() {
+    return new CompareFunctions(ComparisonType.EQUALS);
   }
 
-  public static CompareIpFunction notEquals() {
-    return new CompareIpFunction(ComparisonType.NOT_EQUALS);
+  public static CompareFunctions notEquals() {
+    return new CompareFunctions(ComparisonType.NOT_EQUALS);
   }
 
   @Override