Move function interfaces into a separate package to avoid conflicts.

apache · Nov 18, 2020 · 1721075 · 1721075
1 parent 2eec8e5
commit 1721075
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/sql/catalyst/src/main/java/org/apache/spark/sql/connector/catalog/FunctionCatalog.java b/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.

diff --git a/.../connector/catalog/AggregateFunction.java → .../catalog/functions/AggregateFunction.java b/.../connector/catalog/AggregateFunction.java → .../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;

diff --git a/...ctor/catalog/AggregateFunctionSuite.scala → ...og/functions/AggregateFunctionSuite.scala b/...ctor/catalog/AggregateFunctionSuite.scala → ...og/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}
 

diff --git a/...catalog/AssociativeAggregateFunction.java → ...nctions/AssociativeAggregateFunction.java b/...catalog/AssociativeAggregateFunction.java → ...nctions/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;
 

diff --git a/.../sql/connector/catalog/BoundFunction.java → ...ctor/catalog/functions/BoundFunction.java b/.../sql/connector/catalog/BoundFunction.java → ...ctor/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;

diff --git a/...spark/sql/connector/catalog/Function.java → ...connector/catalog/functions/Function.java b/...spark/sql/connector/catalog/Function.java → ...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;
 

diff --git a/...sql/connector/catalog/ScalarFunction.java → ...tor/catalog/functions/ScalarFunction.java b/...sql/connector/catalog/ScalarFunction.java → ...tor/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;

diff --git a/...ql/connector/catalog/UnboundFunction.java → ...or/catalog/functions/UnboundFunction.java b/...ql/connector/catalog/UnboundFunction.java → ...or/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;