Move function interfaces into a separate package to avoid conflicts.

Author: rdblue

sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/FunctionCatalog.java

@@ -19,6 +19,7 @@
 
 import org.apache.spark.sql.catalyst.analysis.NoSuchFunctionException;
 import org.apache.spark.sql.catalyst.analysis.NoSuchNamespaceException;
+import org.apache.spark.sql.connector.catalog.functions.UnboundFunction;
 
 /**
  * Catalog methods for working with Functions.

…connector/catalog/AggregateFunction.java …catalog/functions/AggregateFunction.javasql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/AggregateFunction.java renamed to sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/functions/AggregateFunction.java sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/AggregateFunction.java renamed to sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/functions/AggregateFunction.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.spark.sql.connector.catalog;
+package org.apache.spark.sql.connector.catalog.functions;
 
 import org.apache.spark.sql.catalyst.InternalRow;
 import org.apache.spark.sql.types.DataType;

…tor/catalog/AggregateFunctionSuite.scala …g/functions/AggregateFunctionSuite.scalasql/catalyst/src/test/java/org/apache/spark/sql/connector/catalog/AggregateFunctionSuite.scala renamed to sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/functions/AggregateFunctionSuite.scala sql/catalyst/src/test/java/org/apache/spark/sql/connector/catalog/AggregateFunctionSuite.scala renamed to sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/functions/AggregateFunctionSuite.scala

@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 
-package org.apache.spark.sql.connector.catalog
+package org.apache.spark.sql.connector.catalog.functions
 
-import org.apache.spark.SparkFunSuite
 import org.apache.spark.sql.catalyst.InternalRow
 import org.apache.spark.sql.types.{DataType, IntegerType, LongType, StructType}
 

…atalog/AssociativeAggregateFunction.java …ctions/AssociativeAggregateFunction.javasql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/AssociativeAggregateFunction.java renamed to sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/functions/AssociativeAggregateFunction.java sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/AssociativeAggregateFunction.java renamed to sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/functions/AssociativeAggregateFunction.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.spark.sql.connector.catalog;
+package org.apache.spark.sql.connector.catalog.functions;
 
 import java.io.Serializable;
 

…sql/connector/catalog/BoundFunction.java …tor/catalog/functions/BoundFunction.javasql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/BoundFunction.java renamed to sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/functions/BoundFunction.java sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/BoundFunction.java renamed to sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/functions/BoundFunction.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.spark.sql.connector.catalog;
+package org.apache.spark.sql.connector.catalog.functions;
 
 import org.apache.spark.sql.types.DataType;
 import org.apache.spark.sql.types.IntegerType;

…park/sql/connector/catalog/Function.java …onnector/catalog/functions/Function.javasql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/Function.java renamed to sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/functions/Function.java sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/Function.java renamed to sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/functions/Function.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.spark.sql.connector.catalog;
+package org.apache.spark.sql.connector.catalog.functions;
 
 import java.io.Serializable;
 

…ql/connector/catalog/ScalarFunction.java …or/catalog/functions/ScalarFunction.javasql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/ScalarFunction.java renamed to sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/functions/ScalarFunction.java sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/ScalarFunction.java renamed to sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/functions/ScalarFunction.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.spark.sql.connector.catalog;
+package org.apache.spark.sql.connector.catalog.functions;
 
 import org.apache.spark.sql.catalyst.InternalRow;
 import org.apache.spark.sql.types.DataType;

…l/connector/catalog/UnboundFunction.java …r/catalog/functions/UnboundFunction.javasql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/UnboundFunction.java renamed to sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/functions/UnboundFunction.java sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/UnboundFunction.java renamed to sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/functions/UnboundFunction.java

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.spark.sql.connector.catalog;
+package org.apache.spark.sql.connector.catalog.functions;
 
 import org.apache.spark.sql.types.StructType;