[GJ -9] Further clean the legacy code (#11)

* change structure of the project * remove datasource * clean unnecessary code
apache · Dec 20, 2021 · 3b4403a · 3b4403a
1 parent 389fb39
commit 3b4403a
Show file tree

Hide file tree

Showing 162 changed files with 9 additions and 979 deletions.
diff --git a/native-sql-engine/cpp/CMakeLists.txt → cpp/CMakeLists.txt b/native-sql-engine/cpp/CMakeLists.txt → cpp/CMakeLists.txt
diff --git a/native-sql-engine/cpp/compile.sh → cpp/compile.sh b/native-sql-engine/cpp/compile.sh → cpp/compile.sh
diff --git a/native-sql-engine/cpp/src/CMakeLists.txt → cpp/src/CMakeLists.txt b/native-sql-engine/cpp/src/CMakeLists.txt → cpp/src/CMakeLists.txt
@@ -80,7 +80,7 @@ set(JEMALLOC_BUILD_VERSION "5.2.1")
 
 find_package(JNI REQUIRED)
 set(source_root_directory ${CMAKE_CURRENT_SOURCE_DIR})
-set(substrait_proto_directory ${CMAKE_CURRENT_SOURCE_DIR}/../../core/src/main/java/com/intel/oap/substrait/binary)
+set(substrait_proto_directory ${CMAKE_CURRENT_SOURCE_DIR}/../../jvm/src/main/java/com/intel/oap/substrait/binary)
 message(STATUS "Set Substrait Directory in ${substrait_proto_directory}")
 
 find_program(CCACHE_FOUND ccache)

diff --git a/...l-engine/cpp/src/common/result_iterator.h → cpp/src/common/result_iterator.h b/...l-engine/cpp/src/common/result_iterator.h → cpp/src/common/result_iterator.h
diff --git a/...e-sql-engine/cpp/src/jni/concurrent_map.h → cpp/src/jni/concurrent_map.h b/...e-sql-engine/cpp/src/jni/concurrent_map.h → cpp/src/jni/concurrent_map.h
diff --git a/native-sql-engine/cpp/src/jni/jni_common.h → cpp/src/jni/jni_common.h b/native-sql-engine/cpp/src/jni/jni_common.h → cpp/src/jni/jni_common.h
diff --git a/native-sql-engine/cpp/src/jni/jni_wrapper.cc → cpp/src/jni/jni_wrapper.cc b/native-sql-engine/cpp/src/jni/jni_wrapper.cc → cpp/src/jni/jni_wrapper.cc
diff --git a/...rc/operators/columnar_to_row_converter.cc → ...rc/operators/columnar_to_row_converter.cc b/...rc/operators/columnar_to_row_converter.cc → ...rc/operators/columnar_to_row_converter.cc
diff --git a/...src/operators/columnar_to_row_converter.h → ...src/operators/columnar_to_row_converter.h b/...src/operators/columnar_to_row_converter.h → ...src/operators/columnar_to_row_converter.h
diff --git a/...ql-engine/cpp/src/proto/protobuf_utils.cc → cpp/src/proto/protobuf_utils.cc b/...ql-engine/cpp/src/proto/protobuf_utils.cc → cpp/src/proto/protobuf_utils.cc
diff --git a/...sql-engine/cpp/src/proto/protobuf_utils.h → cpp/src/proto/protobuf_utils.h b/...sql-engine/cpp/src/proto/protobuf_utils.h → cpp/src/proto/protobuf_utils.h
diff --git a/...l-engine/cpp/src/proto/substrait_utils.cc → cpp/src/proto/substrait_utils.cc b/...l-engine/cpp/src/proto/substrait_utils.cc → cpp/src/proto/substrait_utils.cc
diff --git a/...ql-engine/cpp/src/proto/substrait_utils.h → cpp/src/proto/substrait_utils.h b/...ql-engine/cpp/src/proto/substrait_utils.h → cpp/src/proto/substrait_utils.h
diff --git a/...e-sql-engine/cpp/src/resources/libhdfs.so → cpp/src/resources/libhdfs.so b/...e-sql-engine/cpp/src/resources/libhdfs.so → cpp/src/resources/libhdfs.so
diff --git a/...-sql-engine/cpp/src/resources/libhdfs3.so → cpp/src/resources/libhdfs3.so b/...-sql-engine/cpp/src/resources/libhdfs3.so → cpp/src/resources/libhdfs3.so
diff --git a/...ngine/cpp/src/resources/libprotobuf.so.13 → cpp/src/resources/libprotobuf.so.13 b/...ngine/cpp/src/resources/libprotobuf.so.13 → cpp/src/resources/libprotobuf.so.13
diff --git a/native-sql-engine/core/pom.xml → jvm/pom.xml b/native-sql-engine/core/pom.xml → jvm/pom.xml
@@ -16,16 +16,15 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>com.intel.oap</groupId>
-    <artifactId>native-sql-engine-parent</artifactId>
+    <artifactId>gazelle-jni-parent</artifactId>
     <version>1.2.0-snapshot</version>
-    <relativePath>../../pom.xml</relativePath>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <groupId>com.intel.oap</groupId>
-  <artifactId>spark-columnar-core</artifactId>
+  <artifactId>gazelle-jni-jvm</artifactId>
   <version>1.2.0-snapshot</version>
   <packaging>jar</packaging>
-  <name>OAP Project Spark Columnar Plugin</name>
+  <name>Gazelle Jni</name>
 
   <properties>
     <cpp.dir>../cpp/</cpp.dir>

diff --git a/...oap/execution/ColumnarNativeIterator.java → ...oap/execution/ColumnarNativeIterator.java b/...oap/execution/ColumnarNativeIterator.java → ...oap/execution/ColumnarNativeIterator.java
diff --git a/...el/oap/expression/ArrowColumnarBatch.java → ...el/oap/expression/ArrowColumnarBatch.java b/...el/oap/expression/ArrowColumnarBatch.java → ...el/oap/expression/ArrowColumnarBatch.java
diff --git a/...ces/v2/arrow/NativeSQLMemoryConsumer.java → ...ces/v2/arrow/NativeSQLMemoryConsumer.java b/...ces/v2/arrow/NativeSQLMemoryConsumer.java → ...ces/v2/arrow/NativeSQLMemoryConsumer.java
diff --git a/...rces/v2/arrow/NativeSQLMemoryMetrics.java → ...rces/v2/arrow/NativeSQLMemoryMetrics.java b/...rces/v2/arrow/NativeSQLMemoryMetrics.java → ...rces/v2/arrow/NativeSQLMemoryMetrics.java
diff --git a/...arrow/SparkManagedAllocationListener.java → ...arrow/SparkManagedAllocationListener.java b/...arrow/SparkManagedAllocationListener.java → ...arrow/SparkManagedAllocationListener.java
diff --git a/...rrow/SparkManagedReservationListener.java → ...rrow/SparkManagedReservationListener.java b/...rrow/SparkManagedReservationListener.java → ...rrow/SparkManagedReservationListener.java
diff --git a/...ecution/datasources/v2/arrow/Spiller.java → ...ecution/datasources/v2/arrow/Spiller.java b/...ecution/datasources/v2/arrow/Spiller.java → ...ecution/datasources/v2/arrow/Spiller.java
diff --git a/...om/intel/oap/substrait/binary/Exprs.proto → ...om/intel/oap/substrait/binary/Exprs.proto b/...om/intel/oap/substrait/binary/Exprs.proto → ...om/intel/oap/substrait/binary/Exprs.proto
diff --git a/...tel/oap/substrait/binary/expression.proto → ...tel/oap/substrait/binary/expression.proto b/...tel/oap/substrait/binary/expression.proto → ...tel/oap/substrait/binary/expression.proto
diff --git a/...tel/oap/substrait/binary/extensions.proto → ...tel/oap/substrait/binary/extensions.proto b/...tel/oap/substrait/binary/extensions.proto → ...tel/oap/substrait/binary/extensions.proto
diff --git a/...intel/oap/substrait/binary/function.proto → ...intel/oap/substrait/binary/function.proto b/...intel/oap/substrait/binary/function.proto → ...intel/oap/substrait/binary/function.proto
diff --git a/...ubstrait/binary/parameterized_types.proto → ...ubstrait/binary/parameterized_types.proto b/...ubstrait/binary/parameterized_types.proto → ...ubstrait/binary/parameterized_types.proto
diff --git a/...com/intel/oap/substrait/binary/plan.proto → ...com/intel/oap/substrait/binary/plan.proto b/...com/intel/oap/substrait/binary/plan.proto → ...com/intel/oap/substrait/binary/plan.proto
diff --git a/...ntel/oap/substrait/binary/relations.proto → ...ntel/oap/substrait/binary/relations.proto b/...ntel/oap/substrait/binary/relations.proto → ...ntel/oap/substrait/binary/relations.proto
diff --git a/...ntel/oap/substrait/binary/selection.proto → ...ntel/oap/substrait/binary/selection.proto b/...ntel/oap/substrait/binary/selection.proto → ...ntel/oap/substrait/binary/selection.proto
diff --git a/...com/intel/oap/substrait/binary/type.proto → ...com/intel/oap/substrait/binary/type.proto b/...com/intel/oap/substrait/binary/type.proto → ...com/intel/oap/substrait/binary/type.proto
diff --git a/...p/substrait/binary/type_expressions.proto → ...p/substrait/binary/type_expressions.proto b/...p/substrait/binary/type_expressions.proto → ...p/substrait/binary/type_expressions.proto
diff --git a/...ap/substrait/derivation/BinaryOPNode.java → ...ap/substrait/derivation/BinaryOPNode.java b/...ap/substrait/derivation/BinaryOPNode.java → ...ap/substrait/derivation/BinaryOPNode.java
diff --git a/...rivation/DerivationExpressionBuilder.java → ...rivation/DerivationExpressionBuilder.java b/...rivation/DerivationExpressionBuilder.java → ...rivation/DerivationExpressionBuilder.java
diff --git a/.../derivation/DerivationExpressionNode.java → .../derivation/DerivationExpressionNode.java b/.../derivation/DerivationExpressionNode.java → .../derivation/DerivationExpressionNode.java
diff --git a/...it/derivation/DerivationFP64TypeNode.java → ...it/derivation/DerivationFP64TypeNode.java b/...it/derivation/DerivationFP64TypeNode.java → ...it/derivation/DerivationFP64TypeNode.java
diff --git a/...ait/expression/AggregateFunctionNode.java → ...ait/expression/AggregateFunctionNode.java b/...ait/expression/AggregateFunctionNode.java → ...ait/expression/AggregateFunctionNode.java
diff --git a/...bstrait/expression/DoubleLiteralNode.java → ...bstrait/expression/DoubleLiteralNode.java b/...bstrait/expression/DoubleLiteralNode.java → ...bstrait/expression/DoubleLiteralNode.java
diff --git a/...bstrait/expression/ExpressionBuilder.java → ...bstrait/expression/ExpressionBuilder.java b/...bstrait/expression/ExpressionBuilder.java → ...bstrait/expression/ExpressionBuilder.java
diff --git a/.../substrait/expression/ExpressionNode.java → .../substrait/expression/ExpressionNode.java b/.../substrait/expression/ExpressionNode.java → .../substrait/expression/ExpressionNode.java
diff --git a/...strait/expression/ScalarFunctionNode.java → ...strait/expression/ScalarFunctionNode.java b/...strait/expression/ScalarFunctionNode.java → ...strait/expression/ScalarFunctionNode.java
diff --git a/...p/substrait/expression/SelectionNode.java → ...p/substrait/expression/SelectionNode.java b/...p/substrait/expression/SelectionNode.java → ...p/substrait/expression/SelectionNode.java
diff --git a/...trait/extensions/FunctionMappingNode.java → ...trait/extensions/FunctionMappingNode.java b/...trait/extensions/FunctionMappingNode.java → ...trait/extensions/FunctionMappingNode.java
diff --git a/.../substrait/extensions/MappingBuilder.java → .../substrait/extensions/MappingBuilder.java b/.../substrait/extensions/MappingBuilder.java → .../substrait/extensions/MappingBuilder.java
diff --git a/...oap/substrait/extensions/MappingNode.java → ...oap/substrait/extensions/MappingNode.java b/...oap/substrait/extensions/MappingNode.java → ...oap/substrait/extensions/MappingNode.java
diff --git a/...intel/oap/substrait/plan/PlanBuilder.java → ...intel/oap/substrait/plan/PlanBuilder.java b/...intel/oap/substrait/plan/PlanBuilder.java → ...intel/oap/substrait/plan/PlanBuilder.java
diff --git a/...om/intel/oap/substrait/plan/PlanNode.java → ...om/intel/oap/substrait/plan/PlanNode.java b/...om/intel/oap/substrait/plan/PlanNode.java → ...om/intel/oap/substrait/plan/PlanNode.java
diff --git a/...l/oap/substrait/rel/AggregateRelNode.java → ...l/oap/substrait/rel/AggregateRelNode.java b/...l/oap/substrait/rel/AggregateRelNode.java → ...l/oap/substrait/rel/AggregateRelNode.java
diff --git a/...ntel/oap/substrait/rel/FilterRelNode.java → ...ntel/oap/substrait/rel/FilterRelNode.java b/...ntel/oap/substrait/rel/FilterRelNode.java → ...ntel/oap/substrait/rel/FilterRelNode.java
diff --git a/.../oap/substrait/rel/LocalFilesBuilder.java → .../oap/substrait/rel/LocalFilesBuilder.java b/.../oap/substrait/rel/LocalFilesBuilder.java → .../oap/substrait/rel/LocalFilesBuilder.java
diff --git a/...tel/oap/substrait/rel/LocalFilesNode.java → ...tel/oap/substrait/rel/LocalFilesNode.java b/...tel/oap/substrait/rel/LocalFilesNode.java → ...tel/oap/substrait/rel/LocalFilesNode.java
diff --git a/...tel/oap/substrait/rel/ProjectRelNode.java → ...tel/oap/substrait/rel/ProjectRelNode.java b/...tel/oap/substrait/rel/ProjectRelNode.java → ...tel/oap/substrait/rel/ProjectRelNode.java
diff --git a/.../intel/oap/substrait/rel/ReadRelNode.java → .../intel/oap/substrait/rel/ReadRelNode.java b/.../intel/oap/substrait/rel/ReadRelNode.java → .../intel/oap/substrait/rel/ReadRelNode.java
diff --git a/...m/intel/oap/substrait/rel/RelBuilder.java → ...m/intel/oap/substrait/rel/RelBuilder.java b/...m/intel/oap/substrait/rel/RelBuilder.java → ...m/intel/oap/substrait/rel/RelBuilder.java
diff --git a/.../com/intel/oap/substrait/rel/RelNode.java → .../com/intel/oap/substrait/rel/RelNode.java b/.../com/intel/oap/substrait/rel/RelNode.java → .../com/intel/oap/substrait/rel/RelNode.java
diff --git a/...l/oap/substrait/type/BooleanTypeNode.java → ...l/oap/substrait/type/BooleanTypeNode.java b/...l/oap/substrait/type/BooleanTypeNode.java → ...l/oap/substrait/type/BooleanTypeNode.java
diff --git a/...ntel/oap/substrait/type/FP64TypeNode.java → ...ntel/oap/substrait/type/FP64TypeNode.java b/...ntel/oap/substrait/type/FP64TypeNode.java → ...ntel/oap/substrait/type/FP64TypeNode.java
diff --git a/...el/oap/substrait/type/StringTypeNode.java → ...el/oap/substrait/type/StringTypeNode.java b/...el/oap/substrait/type/StringTypeNode.java → ...el/oap/substrait/type/StringTypeNode.java
diff --git a/.../intel/oap/substrait/type/StructNode.java → .../intel/oap/substrait/type/StructNode.java b/.../intel/oap/substrait/type/StructNode.java → .../intel/oap/substrait/type/StructNode.java
diff --git a/.../intel/oap/substrait/type/TypeBuiler.java → .../intel/oap/substrait/type/TypeBuiler.java b/.../intel/oap/substrait/type/TypeBuiler.java → .../intel/oap/substrait/type/TypeBuiler.java
diff --git a/...om/intel/oap/substrait/type/TypeNode.java → ...om/intel/oap/substrait/type/TypeNode.java b/...om/intel/oap/substrait/type/TypeNode.java → ...om/intel/oap/substrait/type/TypeNode.java
diff --git a/...intel/oap/vectorized/ArrowBufBuilder.java → ...intel/oap/vectorized/ArrowBufBuilder.java b/...intel/oap/vectorized/ArrowBufBuilder.java → ...intel/oap/vectorized/ArrowBufBuilder.java
diff --git a/...ap/vectorized/ArrowColumnarToRowInfo.java → ...ap/vectorized/ArrowColumnarToRowInfo.java b/...ap/vectorized/ArrowColumnarToRowInfo.java → ...ap/vectorized/ArrowColumnarToRowInfo.java
diff --git a/...torized/ArrowColumnarToRowJniWrapper.java → ...torized/ArrowColumnarToRowJniWrapper.java b/...torized/ArrowColumnarToRowJniWrapper.java → ...torized/ArrowColumnarToRowJniWrapper.java
diff --git a/...ctorized/ArrowCompressedStreamReader.java → ...ctorized/ArrowCompressedStreamReader.java b/...ctorized/ArrowCompressedStreamReader.java → ...ctorized/ArrowCompressedStreamReader.java
diff --git a/...oap/vectorized/ArrowFieldNodeBuilder.java → ...oap/vectorized/ArrowFieldNodeBuilder.java b/...oap/vectorized/ArrowFieldNodeBuilder.java → ...oap/vectorized/ArrowFieldNodeBuilder.java
diff --git a/...vectorized/ArrowWritableColumnVector.java → ...vectorized/ArrowWritableColumnVector.java b/...vectorized/ArrowWritableColumnVector.java → ...vectorized/ArrowWritableColumnVector.java
diff --git a/...m/intel/oap/vectorized/BatchIterator.java → ...m/intel/oap/vectorized/BatchIterator.java b/...m/intel/oap/vectorized/BatchIterator.java → ...m/intel/oap/vectorized/BatchIterator.java
diff --git a/...ap/vectorized/CompressedVectorLoader.java → ...ap/vectorized/CompressedVectorLoader.java b/...ap/vectorized/CompressedVectorLoader.java → ...ap/vectorized/CompressedVectorLoader.java
diff --git a/...l/oap/vectorized/ExpressionEvaluator.java → ...l/oap/vectorized/ExpressionEvaluator.java b/...l/oap/vectorized/ExpressionEvaluator.java → ...l/oap/vectorized/ExpressionEvaluator.java
diff --git a/...orized/ExpressionEvaluatorJniWrapper.java → ...orized/ExpressionEvaluatorJniWrapper.java b/...orized/ExpressionEvaluatorJniWrapper.java → ...orized/ExpressionEvaluatorJniWrapper.java
diff --git a/...va/com/intel/oap/vectorized/JniUtils.java → ...va/com/intel/oap/vectorized/JniUtils.java b/...va/com/intel/oap/vectorized/JniUtils.java → ...va/com/intel/oap/vectorized/JniUtils.java
diff --git a/...m/intel/oap/vectorized/MetricsObject.java → ...m/intel/oap/vectorized/MetricsObject.java b/...m/intel/oap/vectorized/MetricsObject.java → ...m/intel/oap/vectorized/MetricsObject.java
diff --git a/...el/oap/vectorized/NativePartitioning.java → ...el/oap/vectorized/NativePartitioning.java b/...el/oap/vectorized/NativePartitioning.java → ...el/oap/vectorized/NativePartitioning.java
diff --git a/.../vectorized/NativeSerializableObject.java → .../vectorized/NativeSerializableObject.java b/.../vectorized/NativeSerializableObject.java → .../vectorized/NativeSerializableObject.java
diff --git a/...tel/oap/vectorized/PartitionFileInfo.java → ...tel/oap/vectorized/PartitionFileInfo.java b/...tel/oap/vectorized/PartitionFileInfo.java → ...tel/oap/vectorized/PartitionFileInfo.java
diff --git a/...el/oap/vectorized/SerializableObject.java → ...el/oap/vectorized/SerializableObject.java b/...el/oap/vectorized/SerializableObject.java → ...el/oap/vectorized/SerializableObject.java
diff --git a/...rized/ShuffleDecompressionJniWrapper.java → ...rized/ShuffleDecompressionJniWrapper.java b/...rized/ShuffleDecompressionJniWrapper.java → ...rized/ShuffleDecompressionJniWrapper.java
diff --git a/...vectorized/ShuffleSplitterJniWrapper.java → ...vectorized/ShuffleSplitterJniWrapper.java b/...vectorized/ShuffleSplitterJniWrapper.java → ...vectorized/ShuffleSplitterJniWrapper.java
diff --git a/...com/intel/oap/vectorized/SplitResult.java → ...com/intel/oap/vectorized/SplitResult.java b/...com/intel/oap/vectorized/SplitResult.java → ...com/intel/oap/vectorized/SplitResult.java
diff --git a/...n/scala/com/intel/oap/GazellePlugin.scala → ...n/scala/com/intel/oap/GazellePlugin.scala b/...n/scala/com/intel/oap/GazellePlugin.scala → ...n/scala/com/intel/oap/GazellePlugin.scala
diff --git a/...a/com/intel/oap/GazellePluginConfig.scala → ...a/com/intel/oap/GazellePluginConfig.scala b/...a/com/intel/oap/GazellePluginConfig.scala → ...a/com/intel/oap/GazellePluginConfig.scala
diff --git a/...ap/execution/ArrowColumnarToRowExec.scala → ...ap/execution/ArrowColumnarToRowExec.scala b/...ap/execution/ArrowColumnarToRowExec.scala → ...ap/execution/ArrowColumnarToRowExec.scala
diff --git a/...on/BasicPhysicalOperatorTransformer.scala → ...on/BasicPhysicalOperatorTransformer.scala b/...on/BasicPhysicalOperatorTransformer.scala → ...on/BasicPhysicalOperatorTransformer.scala
diff --git a/.../execution/BatchScanExecTransformer.scala → .../execution/BatchScanExecTransformer.scala b/.../execution/BatchScanExecTransformer.scala → .../execution/BatchScanExecTransformer.scala
diff --git a/.../oap/execution/BroadcastColumnarRDD.scala → .../oap/execution/BroadcastColumnarRDD.scala b/.../oap/execution/BroadcastColumnarRDD.scala → .../oap/execution/BroadcastColumnarRDD.scala
diff --git a/...on/BroadcastHashJoinExecTransformer.scala → ...on/BroadcastHashJoinExecTransformer.scala b/...on/BroadcastHashJoinExecTransformer.scala → ...on/BroadcastHashJoinExecTransformer.scala
diff --git a/...l/oap/execution/CoalesceBatchesExec.scala → ...l/oap/execution/CoalesceBatchesExec.scala b/...l/oap/execution/CoalesceBatchesExec.scala → ...l/oap/execution/CoalesceBatchesExec.scala
diff --git a/...p/execution/CoalesceExecTransformer.scala → ...p/execution/CoalesceExecTransformer.scala b/...p/execution/CoalesceExecTransformer.scala → ...p/execution/CoalesceExecTransformer.scala
diff --git a/...ution/ColumnarInMemoryTableScanExec.scala → ...ution/ColumnarInMemoryTableScanExec.scala b/...ution/ColumnarInMemoryTableScanExec.scala → ...ution/ColumnarInMemoryTableScanExec.scala
diff --git a/...p/execution/DataToArrowColumnarExec.scala → ...p/execution/DataToArrowColumnarExec.scala b/...p/execution/DataToArrowColumnarExec.scala → ...p/execution/DataToArrowColumnarExec.scala
diff --git a/...oap/execution/ExpandExecTransformer.scala → ...oap/execution/ExpandExecTransformer.scala b/...oap/execution/ExpandExecTransformer.scala → ...oap/execution/ExpandExecTransformer.scala
diff --git a/...cution/HashAggregateExecTransformer.scala → ...cution/HashAggregateExecTransformer.scala b/...cution/HashAggregateExecTransformer.scala → ...cution/HashAggregateExecTransformer.scala
diff --git a/...ap/execution/RowToArrowColumnarExec.scala → ...ap/execution/RowToArrowColumnarExec.scala b/...ap/execution/RowToArrowColumnarExec.scala → ...ap/execution/RowToArrowColumnarExec.scala
diff --git a/...ion/ShuffledHashJoinExecTransformer.scala → ...ion/ShuffledHashJoinExecTransformer.scala b/...ion/ShuffledHashJoinExecTransformer.scala → ...ion/ShuffledHashJoinExecTransformer.scala
diff --git a/...l/oap/execution/SortExecTransformer.scala → ...l/oap/execution/SortExecTransformer.scala b/...l/oap/execution/SortExecTransformer.scala → ...l/oap/execution/SortExecTransformer.scala
diff --git a/...cution/SortMergeJoinExecTransformer.scala → ...cution/SortMergeJoinExecTransformer.scala b/...cution/SortMergeJoinExecTransformer.scala → ...cution/SortMergeJoinExecTransformer.scala
diff --git a/...execution/WholeStageTransformerExec.scala → ...execution/WholeStageTransformerExec.scala b/...execution/WholeStageTransformerExec.scala → ...execution/WholeStageTransformerExec.scala
diff --git a/...oap/execution/WholestageColumnarRDD.scala → ...oap/execution/WholestageColumnarRDD.scala b/...oap/execution/WholestageColumnarRDD.scala → ...oap/execution/WholestageColumnarRDD.scala
@@ -31,8 +31,6 @@ import org.apache.spark.sql.catalyst.expressions.Attribute
 import org.apache.spark.sql.connector.read.{InputPartition, PartitionReaderFactory}
 import org.apache.spark.sql.execution.SparkPlan
 import org.apache.spark.sql.execution.datasources.FilePartition
-import org.apache.spark.sql.execution.datasources.v2.VectorizedFilePartitionReaderHandler
-import org.apache.spark.sql.execution.datasources.v2.parquet.ParquetPartitionReaderFactory
 import org.apache.spark.sql.execution.metric.SQLMetric
 import org.apache.spark.sql.util.ArrowUtils
 import org.apache.spark.sql.util.OASPackageBridge._

diff --git a/...oap/execution/WindowExecTransformer.scala → ...oap/execution/WindowExecTransformer.scala b/...oap/execution/WindowExecTransformer.scala → ...oap/execution/WindowExecTransformer.scala
diff --git a/...ap/expression/ArithmeticTransformer.scala → ...ap/expression/ArithmeticTransformer.scala b/...ap/expression/ArithmeticTransformer.scala → ...ap/expression/ArithmeticTransformer.scala
diff --git a/...ression/BinaryExpressionTransformer.scala → ...ression/BinaryExpressionTransformer.scala b/...ression/BinaryExpressionTransformer.scala → ...ression/BinaryExpressionTransformer.scala
diff --git a/...xpression/BinaryOperatorTransformer.scala → ...xpression/BinaryOperatorTransformer.scala b/...xpression/BinaryOperatorTransformer.scala → ...xpression/BinaryOperatorTransformer.scala
diff --git a/...xpression/BoundReferenceTransformer.scala → ...xpression/BoundReferenceTransformer.scala b/...xpression/BoundReferenceTransformer.scala → ...xpression/BoundReferenceTransformer.scala
diff --git a/...ression/CaseWhenOperatorTransformer.scala → ...ression/CaseWhenOperatorTransformer.scala b/...ression/CaseWhenOperatorTransformer.scala → ...ression/CaseWhenOperatorTransformer.scala
diff --git a/...ression/CoalesceOperatorTransformer.scala → ...ression/CoalesceOperatorTransformer.scala b/...ression/CoalesceOperatorTransformer.scala → ...ression/CoalesceOperatorTransformer.scala
diff --git a/...intel/oap/expression/CodeGeneration.scala → ...intel/oap/expression/CodeGeneration.scala b/...intel/oap/expression/CodeGeneration.scala → ...intel/oap/expression/CodeGeneration.scala
diff --git a/...xpression/ConcatOperatorTransformer.scala → ...xpression/ConcatOperatorTransformer.scala b/...xpression/ConcatOperatorTransformer.scala → ...xpression/ConcatOperatorTransformer.scala
diff --git a/...intel/oap/expression/ConverterUtils.scala → ...intel/oap/expression/ConverterUtils.scala b/...intel/oap/expression/ConverterUtils.scala → ...intel/oap/expression/ConverterUtils.scala
diff --git a/...sion/DateTimeExpressionsTransformer.scala → ...sion/DateTimeExpressionsTransformer.scala b/...sion/DateTimeExpressionsTransformer.scala → ...sion/DateTimeExpressionsTransformer.scala
diff --git a/.../oap/expression/ExpressionConverter.scala → .../oap/expression/ExpressionConverter.scala b/.../oap/expression/ExpressionConverter.scala → .../oap/expression/ExpressionConverter.scala
diff --git a/...ap/expression/ExpressionTransformer.scala → ...ap/expression/ExpressionTransformer.scala b/...ap/expression/ExpressionTransformer.scala → ...ap/expression/ExpressionTransformer.scala
diff --git a/...ap/expression/IfOperatorTransformer.scala → ...ap/expression/IfOperatorTransformer.scala b/...ap/expression/IfOperatorTransformer.scala → ...ap/expression/IfOperatorTransformer.scala
diff --git a/...ap/expression/InOperatorTransformer.scala → ...ap/expression/InOperatorTransformer.scala b/...ap/expression/InOperatorTransformer.scala → ...ap/expression/InOperatorTransformer.scala
diff --git a/...expression/InSetOperatorTransformer.scala → ...expression/InSetOperatorTransformer.scala b/...expression/InSetOperatorTransformer.scala → ...expression/InSetOperatorTransformer.scala
diff --git a/...l/oap/expression/LiteralTransformer.scala → ...l/oap/expression/LiteralTransformer.scala b/...l/oap/expression/LiteralTransformer.scala → ...l/oap/expression/LiteralTransformer.scala
diff --git a/...ression/NamedExpressionsTransformer.scala → ...ression/NamedExpressionsTransformer.scala b/...ression/NamedExpressionsTransformer.scala → ...ression/NamedExpressionsTransformer.scala
diff --git a/...expression/RoundOperatorTransformer.scala → ...expression/RoundOperatorTransformer.scala b/...expression/RoundOperatorTransformer.scala → ...expression/RoundOperatorTransformer.scala
diff --git a/...xpression/ScalarSubqueryTransformer.scala → ...xpression/ScalarSubqueryTransformer.scala b/...xpression/ScalarSubqueryTransformer.scala → ...xpression/ScalarSubqueryTransformer.scala
diff --git a/...pression/TernaryOperatorTransformer.scala → ...pression/TernaryOperatorTransformer.scala b/...pression/TernaryOperatorTransformer.scala → ...pression/TernaryOperatorTransformer.scala
diff --git a/...expression/UnaryOperatorTransformer.scala → ...expression/UnaryOperatorTransformer.scala b/...expression/UnaryOperatorTransformer.scala → ...expression/UnaryOperatorTransformer.scala
diff --git a/...tel/oap/extension/ColumnarOverrides.scala → ...tel/oap/extension/ColumnarOverrides.scala b/...tel/oap/extension/ColumnarOverrides.scala → ...tel/oap/extension/ColumnarOverrides.scala
diff --git a/...tel/oap/extension/StrategyOverrides.scala → ...tel/oap/extension/StrategyOverrides.scala b/...tel/oap/extension/StrategyOverrides.scala → ...tel/oap/extension/StrategyOverrides.scala
diff --git a/...xtension/columnar/ColumnarGuardRule.scala → ...xtension/columnar/ColumnarGuardRule.scala b/...xtension/columnar/ColumnarGuardRule.scala → ...xtension/columnar/ColumnarGuardRule.scala
diff --git a/...orized/ArrowColumnarBatchSerializer.scala → ...orized/ArrowColumnarBatchSerializer.scala b/...orized/ArrowColumnarBatchSerializer.scala → ...orized/ArrowColumnarBatchSerializer.scala
diff --git a/...orized/CloseableColumnBatchIterator.scala → ...orized/CloseableColumnBatchIterator.scala b/...orized/CloseableColumnBatchIterator.scala → ...orized/CloseableColumnBatchIterator.scala
diff --git a/...k/shuffle/ColumnarShuffleDependency.scala → ...k/shuffle/ColumnarShuffleDependency.scala b/...k/shuffle/ColumnarShuffleDependency.scala → ...k/shuffle/ColumnarShuffleDependency.scala
diff --git a/...spark/shuffle/ColumnarShuffleWriter.scala → ...spark/shuffle/ColumnarShuffleWriter.scala b/...spark/shuffle/ColumnarShuffleWriter.scala → ...spark/shuffle/ColumnarShuffleWriter.scala
diff --git a/...shuffle/sort/ColumnarShuffleManager.scala → ...shuffle/sort/ColumnarShuffleManager.scala b/...shuffle/sort/ColumnarShuffleManager.scala → ...shuffle/sort/ColumnarShuffleManager.scala
diff --git a/...ution/ColumnarBroadcastExchangeExec.scala → ...ution/ColumnarBroadcastExchangeExec.scala b/...ution/ColumnarBroadcastExchangeExec.scala → ...ution/ColumnarBroadcastExchangeExec.scala
diff --git a/...ution/ColumnarCollapseCodegenStages.scala → ...ution/ColumnarCollapseCodegenStages.scala b/...ution/ColumnarCollapseCodegenStages.scala → ...ution/ColumnarCollapseCodegenStages.scala
diff --git a/...park/sql/execution/ColumnarExchange.scala → ...park/sql/execution/ColumnarExchange.scala b/...park/sql/execution/ColumnarExchange.scala → ...park/sql/execution/ColumnarExchange.scala
diff --git a/...ql/execution/ColumnarHashedRelation.scala → ...ql/execution/ColumnarHashedRelation.scala b/...ql/execution/ColumnarHashedRelation.scala → ...ql/execution/ColumnarHashedRelation.scala
diff --git a/.../execution/ColumnarInMemoryRelation.scala → .../execution/ColumnarInMemoryRelation.scala b/.../execution/ColumnarInMemoryRelation.scala → .../execution/ColumnarInMemoryRelation.scala
diff --git a/...ecution/ColumnarShuffleExchangeExec.scala → ...ecution/ColumnarShuffleExchangeExec.scala b/...ecution/ColumnarShuffleExchangeExec.scala → ...ecution/ColumnarShuffleExchangeExec.scala
diff --git a/.../execution/ShuffledColumnarBatchRDD.scala → .../execution/ShuffledColumnarBatchRDD.scala b/.../execution/ShuffledColumnarBatchRDD.scala → .../execution/ShuffledColumnarBatchRDD.scala
diff --git a/...tion/adaptive/AdaptiveSparkPlanExec.scala → ...tion/adaptive/AdaptiveSparkPlanExec.scala b/...tion/adaptive/AdaptiveSparkPlanExec.scala → ...tion/adaptive/AdaptiveSparkPlanExec.scala
diff --git a/...ive/ColumnarCustomShuffleReaderExec.scala → ...ive/ColumnarCustomShuffleReaderExec.scala b/...ive/ColumnarCustomShuffleReaderExec.scala → ...ive/ColumnarCustomShuffleReaderExec.scala
diff --git a/...tasources/v2/arrow/SparkMemoryUtils.scala → ...tasources/v2/arrow/SparkMemoryUtils.scala b/...tasources/v2/arrow/SparkMemoryUtils.scala → ...tasources/v2/arrow/SparkMemoryUtils.scala
diff --git a/...tasources/v2/arrow/SparkSchemaUtils.scala → ...tasources/v2/arrow/SparkSchemaUtils.scala b/...tasources/v2/arrow/SparkSchemaUtils.scala → ...tasources/v2/arrow/SparkSchemaUtils.scala
diff --git a/...tasources/v2/arrow/SparkVectorUtils.scala → ...tasources/v2/arrow/SparkVectorUtils.scala b/...tasources/v2/arrow/SparkVectorUtils.scala → ...tasources/v2/arrow/SparkVectorUtils.scala
diff --git a/...thon/ArrowEvalPythonExecTransformer.scala → ...thon/ArrowEvalPythonExecTransformer.scala b/...thon/ArrowEvalPythonExecTransformer.scala → ...thon/ArrowEvalPythonExecTransformer.scala
diff --git a/...on/python/ColumnarArrowPythonRunner.scala → ...on/python/ColumnarArrowPythonRunner.scala b/...on/python/ColumnarArrowPythonRunner.scala → ...on/python/ColumnarArrowPythonRunner.scala
diff --git a/...rg/apache/spark/sql/util/ArrowUtils.scala → ...rg/apache/spark/sql/util/ArrowUtils.scala b/...rg/apache/spark/sql/util/ArrowUtils.scala → ...rg/apache/spark/sql/util/ArrowUtils.scala
diff --git a/...che/spark/sql/util/OASPackageBridge.scala → ...che/spark/sql/util/OASPackageBridge.scala b/...che/spark/sql/util/OASPackageBridge.scala → ...che/spark/sql/util/OASPackageBridge.scala
diff --git a/...apache/spark/sql/util/StructTypeFWD.scala → ...apache/spark/sql/util/StructTypeFWD.scala b/...apache/spark/sql/util/StructTypeFWD.scala → ...apache/spark/sql/util/StructTypeFWD.scala
diff --git a/...he/spark/storage/memory/MemoryStore.scala → ...he/spark/storage/memory/MemoryStore.scala b/...he/spark/storage/memory/MemoryStore.scala → ...he/spark/storage/memory/MemoryStore.scala
diff --git a/...g/apache/spark/util/ExecutorManager.scala → ...g/apache/spark/util/ExecutorManager.scala b/...g/apache/spark/util/ExecutorManager.scala → ...g/apache/spark/util/ExecutorManager.scala
diff --git a/...apache/spark/util/UserAddedJarUtils.scala → ...apache/spark/util/UserAddedJarUtils.scala b/...apache/spark/util/UserAddedJarUtils.scala → ...apache/spark/util/UserAddedJarUtils.scala
diff --git a/...-sql-engine/core/src/main/java/com/intel/oap/datasource/VectorizedParquetArrowReader.java b/...-sql-engine/core/src/main/java/com/intel/oap/datasource/VectorizedParquetArrowReader.java