Fix map conflicts

apache · Jun 9, 2024 · 1f83311 · 1f83311
1 parent 9ffbaa4
commit 1f83311
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/core/src/main/java/org/apache/calcite/sql/SqlKind.java b/core/src/main/java/org/apache/calcite/sql/SqlKind.java
@@ -442,6 +442,9 @@ public enum SqlKind {
   /** {@code LEAST} function (Oracle). */
   LEAST,
 
+  /** {@code LOG} function. (Mysql, Spark). */
+  LOG,
+
   /** {@code DATE_ADD} function (BigQuery Semantics). */
   DATE_ADD,
 

diff --git a/core/src/main/java/org/apache/calcite/sql/fun/SqlLibraryOperators.java b/core/src/main/java/org/apache/calcite/sql/fun/SqlLibraryOperators.java
@@ -2209,10 +2209,9 @@ private static RelDataType deriveTypeMapFromEntries(SqlOperatorBinding opBinding
   /** The "LOG(numeric, numeric1)" function. Returns the base numeric1 logarithm of numeric. */
   @LibraryOperator(libraries = {MYSQL, SPARK})
   public static final SqlFunction LOG_MYSQL =
-      SqlBasicFunction.create("LOG",
+      SqlBasicFunction.create(SqlKind.LOG,
           ReturnTypes.DOUBLE_FORCE_NULLABLE,
-          OperandTypes.NUMERIC_OPTIONAL_NUMERIC,
-          SqlFunctionCategory.NUMERIC);
+          OperandTypes.NUMERIC_OPTIONAL_NUMERIC);
 
   /** The "LOG2(numeric)" function. Returns the base 2 logarithm of numeric. */
   @LibraryOperator(libraries = {MYSQL, SPARK})