move

Author: cloud-fan

sql/catalyst/pom.xml

@@ -114,6 +114,10 @@
       <version>2.7.3</version>
       <type>jar</type>
     </dependency>
+    <dependency>
+      <groupId>org.apache.arrow</groupId>
+      <artifactId>arrow-vector</artifactId>
+    </dependency>
   </dependencies>
   <build>
     <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>

…s/v2/reader/SupportsPushDownFilters.java …s/v2/reader/SupportsPushDownFilters.javasql/core/src/main/java/org/apache/spark/sql/sources/v2/reader/SupportsPushDownFilters.java renamed to sql/catalyst/src/main/java/org/apache/spark/sql/sources/v2/reader/SupportsPushDownFilters.java sql/core/src/main/java/org/apache/spark/sql/sources/v2/reader/SupportsPushDownFilters.java renamed to sql/catalyst/src/main/java/org/apache/spark/sql/sources/v2/reader/SupportsPushDownFilters.java

@@ -25,7 +25,6 @@
  * push down filters to the data source and reduce the size of the data to be read.
  */
 @Evolving
-// TODO: create data source v2 filter API and move this interface to the catalyst module.
 public interface SupportsPushDownFilters extends ScanBuilder {
 
   /**

sql/catalyst/src/main/java/org/apache/spark/sql/sources/v2/writer/SupportsDynamicOverwrite.java

@@ -25,7 +25,7 @@
  * write does not contain data will remain unchanged.
  * <p>
  * This is provided to implement SQL compatible with Hive table operations but is not recommended.
- * Instead, use the {@code SupportsOverwrite overwrite by filter API} to explicitly replace data.
+ * Instead, use the {@link SupportsOverwrite overwrite by filter API} to explicitly replace data.
  */
 public interface SupportsDynamicOverwrite extends WriteBuilder {
   /**

…sources/v2/writer/SupportsOverwrite.java …sources/v2/writer/SupportsOverwrite.javasql/core/src/main/java/org/apache/spark/sql/sources/v2/writer/SupportsOverwrite.java renamed to sql/catalyst/src/main/java/org/apache/spark/sql/sources/v2/writer/SupportsOverwrite.java sql/core/src/main/java/org/apache/spark/sql/sources/v2/writer/SupportsOverwrite.java renamed to sql/catalyst/src/main/java/org/apache/spark/sql/sources/v2/writer/SupportsOverwrite.java

@@ -26,7 +26,6 @@
  * Overwriting data by filter will delete any data that matches the filter and replace it with data
  * that is committed in the write.
  */
-// TODO: create data source v2 filter API and move this interface to the catalyst module.
 public interface SupportsOverwrite extends WriteBuilder, SupportsTruncate {
   /**
    * Configures a write to replace data matching the filters with data committed in the write.

…ark/sql/execution/ArrowColumnVector.java …rk/sql/vectorized/ArrowColumnVector.javasql/core/src/main/java/org/apache/spark/sql/execution/ArrowColumnVector.java renamed to sql/catalyst/src/main/java/org/apache/spark/sql/vectorized/ArrowColumnVector.java sql/core/src/main/java/org/apache/spark/sql/execution/ArrowColumnVector.java renamed to sql/catalyst/src/main/java/org/apache/spark/sql/vectorized/ArrowColumnVector.java

@@ -15,19 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.spark.sql.execution;
+package org.apache.spark.sql.vectorized;
 
 import io.netty.buffer.ArrowBuf;
 import org.apache.arrow.vector.*;
 import org.apache.arrow.vector.complex.*;
 import org.apache.arrow.vector.holders.NullableVarCharHolder;
 
 import org.apache.spark.annotation.Evolving;
-import org.apache.spark.sql.execution.arrow.ArrowUtils;
+import org.apache.spark.sql.util.ArrowUtils;
 import org.apache.spark.sql.types.*;
-import org.apache.spark.sql.vectorized.ColumnVector;
-import org.apache.spark.sql.vectorized.ColumnarArray;
-import org.apache.spark.sql.vectorized.ColumnarMap;
 import org.apache.spark.unsafe.types.UTF8String;
 
 /**

…g/apache/spark/sql/sources/filters.scala …g/apache/spark/sql/sources/filters.scalasql/core/src/main/scala/org/apache/spark/sql/sources/filters.scala renamed to sql/catalyst/src/main/scala/org/apache/spark/sql/sources/filters.scala sql/core/src/main/scala/org/apache/spark/sql/sources/filters.scala renamed to sql/catalyst/src/main/scala/org/apache/spark/sql/sources/filters.scala

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.spark.sql.execution.arrow
+package org.apache.spark.sql.util
 
 import scala.collection.JavaConverters._
 

…ark/sql/execution/arrow/ArrowUtils.scala …g/apache/spark/sql/util/ArrowUtils.scalasql/core/src/main/scala/org/apache/spark/sql/execution/arrow/ArrowUtils.scala renamed to sql/catalyst/src/main/scala/org/apache/spark/sql/util/ArrowUtils.scala sql/core/src/main/scala/org/apache/spark/sql/execution/arrow/ArrowUtils.scala renamed to sql/catalyst/src/main/scala/org/apache/spark/sql/util/ArrowUtils.scala

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.spark.sql.execution.arrow
+package org.apache.spark.sql.util
 
-import org.apache.arrow.vector.types.pojo.{ArrowType, Field, FieldType, Schema}
+import org.apache.arrow.vector.types.pojo.ArrowType
 
 import org.apache.spark.SparkFunSuite
 import org.apache.spark.sql.catalyst.util.DateTimeUtils

…ql/execution/arrow/ArrowUtilsSuite.scala …che/spark/sql/util/ArrowUtilsSuite.scalasql/core/src/test/scala/org/apache/spark/sql/execution/arrow/ArrowUtilsSuite.scala renamed to sql/catalyst/src/test/scala/org/apache/spark/sql/util/ArrowUtilsSuite.scala sql/core/src/test/scala/org/apache/spark/sql/execution/arrow/ArrowUtilsSuite.scala renamed to sql/catalyst/src/test/scala/org/apache/spark/sql/util/ArrowUtilsSuite.scala

@@ -112,10 +112,6 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.arrow</groupId>
-      <artifactId>arrow-vector</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-asm7-shaded</artifactId>

sql/core/pom.xml

@@ -33,9 +33,9 @@ import org.apache.spark.api.java.JavaRDD
 import org.apache.spark.network.util.JavaUtils
 import org.apache.spark.sql.{DataFrame, SQLContext}
 import org.apache.spark.sql.catalyst.InternalRow
-import org.apache.spark.sql.execution.ArrowColumnVector
 import org.apache.spark.sql.types._
-import org.apache.spark.sql.vectorized.{ColumnarBatch, ColumnVector}
+import org.apache.spark.sql.util.ArrowUtils
+import org.apache.spark.sql.vectorized.{ArrowColumnVector, ColumnarBatch, ColumnVector}
 import org.apache.spark.util.{ByteBufferOutputStream, Utils}