Skip to content

Commit c9e00bc

Browse files
committed
move ArrowColumnVector to internal package
1 parent ab4f40c commit c9e00bc

8 files changed

Lines changed: 16 additions & 9 deletions

File tree

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.spark.sql.vectorized;
18+
package org.apache.spark.sql.execution;
1919

2020
import io.netty.buffer.ArrowBuf;
2121
import org.apache.arrow.vector.*;
@@ -25,6 +25,9 @@
2525
import org.apache.spark.annotation.Evolving;
2626
import org.apache.spark.sql.execution.arrow.ArrowUtils;
2727
import org.apache.spark.sql.types.*;
28+
import org.apache.spark.sql.vectorized.ColumnVector;
29+
import org.apache.spark.sql.vectorized.ColumnarArray;
30+
import org.apache.spark.sql.vectorized.ColumnarMap;
2831
import org.apache.spark.unsafe.types.UTF8String;
2932

3033
/**

sql/core/src/main/scala/org/apache/spark/sql/execution/arrow/ArrowConverters.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,9 @@ import org.apache.spark.api.java.JavaRDD
3333
import org.apache.spark.network.util.JavaUtils
3434
import org.apache.spark.sql.{DataFrame, SQLContext}
3535
import org.apache.spark.sql.catalyst.InternalRow
36+
import org.apache.spark.sql.execution.ArrowColumnVector
3637
import org.apache.spark.sql.types._
37-
import org.apache.spark.sql.vectorized.{ArrowColumnVector, ColumnarBatch, ColumnVector}
38+
import org.apache.spark.sql.vectorized.{ColumnarBatch, ColumnVector}
3839
import org.apache.spark.util.{ByteBufferOutputStream, Utils}
3940

4041

sql/core/src/main/scala/org/apache/spark/sql/execution/python/ArrowPythonRunner.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,10 @@ import org.apache.arrow.vector.ipc.{ArrowStreamReader, ArrowStreamWriter}
2929
import org.apache.spark._
3030
import org.apache.spark.api.python._
3131
import org.apache.spark.sql.catalyst.InternalRow
32+
import org.apache.spark.sql.execution.ArrowColumnVector
3233
import org.apache.spark.sql.execution.arrow.{ArrowUtils, ArrowWriter}
3334
import org.apache.spark.sql.types._
34-
import org.apache.spark.sql.vectorized.{ArrowColumnVector, ColumnarBatch, ColumnVector}
35+
import org.apache.spark.sql.vectorized.{ColumnarBatch, ColumnVector}
3536
import org.apache.spark.util.Utils
3637

3738
/**

sql/core/src/main/scala/org/apache/spark/sql/execution/python/FlatMapGroupsInPandasExec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import org.apache.spark.rdd.RDD
2626
import org.apache.spark.sql.catalyst.InternalRow
2727
import org.apache.spark.sql.catalyst.expressions._
2828
import org.apache.spark.sql.catalyst.plans.physical.{AllTuples, ClusteredDistribution, Distribution, Partitioning}
29-
import org.apache.spark.sql.execution.{GroupedIterator, SparkPlan, UnaryExecNode}
29+
import org.apache.spark.sql.execution.{ArrowColumnVector, GroupedIterator, SparkPlan, UnaryExecNode}
3030
import org.apache.spark.sql.execution.arrow.ArrowUtils
3131
import org.apache.spark.sql.types.StructType
32-
import org.apache.spark.sql.vectorized.{ArrowColumnVector, ColumnarBatch, ColumnVector}
32+
import org.apache.spark.sql.vectorized.ColumnarBatch
3333

3434
/**
3535
* Physical node for [[org.apache.spark.sql.catalyst.plans.logical.FlatMapGroupsInPandas]]

sql/core/src/main/scala/org/apache/spark/sql/execution/r/ArrowRRunner.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ import org.apache.spark.api.r._
3131
import org.apache.spark.api.r.SpecialLengths
3232
import org.apache.spark.broadcast.Broadcast
3333
import org.apache.spark.sql.catalyst.InternalRow
34+
import org.apache.spark.sql.execution.ArrowColumnVector
3435
import org.apache.spark.sql.execution.arrow.{ArrowUtils, ArrowWriter}
3536
import org.apache.spark.sql.types.StructType
36-
import org.apache.spark.sql.vectorized.{ArrowColumnVector, ColumnarBatch, ColumnVector}
37+
import org.apache.spark.sql.vectorized.{ColumnarBatch, ColumnVector}
3738
import org.apache.spark.util.Utils
3839

3940

sql/core/src/test/scala/org/apache/spark/sql/execution/arrow/ArrowWriterSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ package org.apache.spark.sql.execution.arrow
2020
import org.apache.spark.SparkFunSuite
2121
import org.apache.spark.sql.catalyst.InternalRow
2222
import org.apache.spark.sql.catalyst.util.ArrayData
23+
import org.apache.spark.sql.execution.ArrowColumnVector
2324
import org.apache.spark.sql.types._
24-
import org.apache.spark.sql.vectorized.ArrowColumnVector
2525
import org.apache.spark.unsafe.types.UTF8String
2626

2727
class ArrowWriterSuite extends SparkFunSuite {

sql/core/src/test/scala/org/apache/spark/sql/execution/vectorized/ArrowColumnVectorSuite.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ import org.apache.arrow.vector._
2121
import org.apache.arrow.vector.complex._
2222

2323
import org.apache.spark.SparkFunSuite
24+
import org.apache.spark.sql.execution.ArrowColumnVector
2425
import org.apache.spark.sql.execution.arrow.ArrowUtils
2526
import org.apache.spark.sql.types._
26-
import org.apache.spark.sql.vectorized.ArrowColumnVector
2727
import org.apache.spark.unsafe.types.UTF8String
2828

2929
class ArrowColumnVectorSuite extends SparkFunSuite {

sql/core/src/test/scala/org/apache/spark/sql/execution/vectorized/ColumnarBatchSuite.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,10 @@ import org.apache.spark.SparkFunSuite
3131
import org.apache.spark.memory.MemoryMode
3232
import org.apache.spark.sql.{RandomDataGenerator, Row}
3333
import org.apache.spark.sql.catalyst.InternalRow
34+
import org.apache.spark.sql.execution.ArrowColumnVector
3435
import org.apache.spark.sql.execution.arrow.ArrowUtils
3536
import org.apache.spark.sql.types._
36-
import org.apache.spark.sql.vectorized.{ArrowColumnVector, ColumnarBatch, ColumnVector}
37+
import org.apache.spark.sql.vectorized.ColumnarBatch
3738
import org.apache.spark.unsafe.Platform
3839
import org.apache.spark.unsafe.types.CalendarInterval
3940

0 commit comments

Comments
 (0)