Fix map conflicts

apache · Jun 9, 2024 · 65b6705 · 65b6705
1 parent f2bfe34
commit 65b6705
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 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
@@ -445,6 +445,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
@@ -2227,10 +2227,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})

diff --git a/site/_docs/reference.md b/site/_docs/reference.md
@@ -2789,7 +2789,7 @@ In the following:
 | f s | LEN(string)                                  | Equivalent to `CHAR_LENGTH(string)`
 | b f s | LENGTH(string)                             | Equivalent to `CHAR_LENGTH(string)`
 | h s | LEVENSHTEIN(string1, string2)                | Returns the Levenshtein distance between *string1* and *string2*
-| b   | LOG(numeric1 [, numeric2 ])                  | Returns the logarithm of *numeric1* to base *numeric2*, or base e if *numeric2* is not present
+| b | LOG(numeric1 [, numeric2 ])                    | Returns the logarithm of *numeric1* to base *numeric2*, or base e if *numeric2* is not present
 | m s | LOG(numeric1 [, numeric2 ])                  | Returns the logarithm of *numeric1* to base *numeric2*, or base e if *numeric2* is not present, or null if *numeric1* is 0
 | m s | LOG2(numeric)                                | Returns the base 2 logarithm of *numeric*
 | b o s | LPAD(string, length [, pattern ])          | Returns a string or bytes value that consists of *string* prepended to *length* with *pattern*