Follow comment

Author: AngersZhuuuu

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/FunctionRegistry.scala

@@ -319,6 +319,9 @@ object FunctionRegistry {
 
   val FUNC_ALIAS = TreeNodeTag[String]("functionAliasName")
 
+  val builtinFunctionScope = "SYSTEM"
+  val userFunctionScope = "USER"
+
   // Note: Whenever we add a new entry here, make sure we also update ExpressionToSQLSuite
   val expressions: Map[String, (ExpressionInfo, FunctionBuilder)] = Map(
     // misc non-aggregate functions

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/catalog/SessionCatalog.scala

@@ -1699,9 +1699,11 @@ class SessionCatalog(
     // The session catalog caches some persistent functions in the FunctionRegistry
     // so there can be duplicates.
     functions.map {
-      case f if FunctionRegistry.functionSet.contains(f) => (f, "SYSTEM")
-      case f if TableFunctionRegistry.functionSet.contains(f) => (f, "SYSTEM")
-      case f => (f, "USER")
+      case f if FunctionRegistry.functionSet.contains(f) =>
+        (f, FunctionRegistry.builtinFunctionScope)
+      case f if TableFunctionRegistry.functionSet.contains(f) =>
+        (f, FunctionRegistry.builtinFunctionScope)
+      case f => (f, FunctionRegistry.userFunctionScope)
     }.distinct
   }
 

sql/core/src/main/scala/org/apache/spark/sql/execution/command/functions.scala

@@ -208,8 +208,9 @@ case class ShowFunctionsCommand(
       sparkSession.sessionState.catalog
         .listFunctions(dbName, pattern.getOrElse("*"))
         .collect {
-          case (f, "USER") if showUserFunctions => f.unquotedString
-          case (f, "SYSTEM") if showSystemFunctions => f.unquotedString
+          case (f, FunctionRegistry.userFunctionScope) if showUserFunctions => f.unquotedString
+          case (f, FunctionRegistry.builtinFunctionScope) if showSystemFunctions =>
+            f.unquotedString
         }
     // Hard code "<>", "!=", "between", "case", and "||"
     // for now as there is no corresponding functions.

sql/hive-thriftserver/src/main/scala/org/apache/spark/sql/hive/thriftserver/SparkGetFunctionsOperation.scala

@@ -86,14 +86,15 @@ private[hive] class SparkGetFunctionsOperation(
       val separateDisplaySystemFunctions =
         sqlContext.conf.getConf(SQLConf.THRIFTSERVER_SEPARATE_DISPLAY_SYSTEM_FUNCTION)
       var matchedBuiltInFunctions = if (separateDisplaySystemFunctions && functionPattern == "*"
-        && matchingDbs.nonEmpty) {
+          && matchingDbs.nonEmpty) {
         FunctionRegistry.functionSet ++ TableFunctionRegistry.functionSet
       } else {
         Set.empty[FunctionIdentifier]
       }
       matchingDbs.foreach { db =>
         catalog.listFunctions(db, functionPattern).foreach {
-          case (funcIdentifier, "SYSTEM") if separateDisplaySystemFunctions =>
+          case (funcIdentifier, FunctionRegistry.`builtinFunctionScope`)
+            if separateDisplaySystemFunctions =>
             if (!matchedBuiltInFunctions.contains(funcIdentifier)) {
               matchedBuiltInFunctions += funcIdentifier
             }
@@ -113,7 +114,7 @@ private[hive] class SparkGetFunctionsOperation(
         val info = catalog.lookupFunctionInfo(functionIdentifier)
         val rowData = Array[AnyRef](
           DEFAULT_HIVE_CATALOG, // FUNCTION_CAT
-          "SYSTEM", // FUNCTION_SCHEM
+          FunctionRegistry.builtinFunctionScope, // FUNCTION_SCHEM
           functionIdentifier.funcName, // FUNCTION_NAME
           s"Usage: ${info.getUsage}\nExtended Usage:${info.getExtended}", // REMARKS
           DatabaseMetaData.functionResultUnknown.asInstanceOf[AnyRef], // FUNCTION_TYPE

sql/hive-thriftserver/src/test/scala/org/apache/spark/sql/hive/thriftserver/SparkMetadataOperationSuite.scala

@@ -242,15 +242,21 @@ class SparkMetadataOperationSuite extends HiveThriftServer2TestBase {
       checkResult(metaData.getFunctions(null, "default", "upPer"), Seq("upper"))
 
       statement.execute(s"SET ${SQLConf.THRIFTSERVER_SEPARATE_DISPLAY_SYSTEM_FUNCTION.key}=true")
-      checkResult(metaData.getFunctions(null, null, "overlay"), Seq("overlay"), "SYSTEM")
-      checkResult(metaData.getFunctions(null, null, "overla*"), Seq("overlay"), "SYSTEM")
-      checkResult(metaData.getFunctions(null, "", "overla*"), Seq("overlay"), "SYSTEM")
-      checkResult(metaData.getFunctions(null, null, "does-not-exist*"), Seq.empty, "SYSTEM")
-      checkResult(metaData.getFunctions(null, "default", "overlay"), Seq("overlay"), "SYSTEM")
+      checkResult(metaData.getFunctions(null, null, "overlay"), Seq("overlay"),
+        FunctionRegistry.builtinFunctionScope)
+      checkResult(metaData.getFunctions(null, null, "overla*"), Seq("overlay"),
+        FunctionRegistry.builtinFunctionScope)
+      checkResult(metaData.getFunctions(null, "", "overla*"), Seq("overlay"),
+        FunctionRegistry.builtinFunctionScope)
+      checkResult(metaData.getFunctions(null, null, "does-not-exist*"), Seq.empty,
+        FunctionRegistry.builtinFunctionScope)
+      checkResult(metaData.getFunctions(null, "default", "overlay"), Seq("overlay"),
+        FunctionRegistry.builtinFunctionScope)
       checkResult(metaData.getFunctions(null, "default", "shift*"),
-        Seq("shiftleft", "shiftright", "shiftrightunsigned"), "SYSTEM")
-      checkResult(metaData.getFunctions(null, "default", "upPer"), Seq("upper"), "SYSTEM")
-
+        Seq("shiftleft", "shiftright", "shiftrightunsigned"),
+        FunctionRegistry.builtinFunctionScope)
+      checkResult(metaData.getFunctions(null, "default", "upPer"), Seq("upper"),
+        FunctionRegistry.builtinFunctionScope)
     }
   }