diff --git a/gazelle-dist/pom.xml b/gazelle-dist/pom.xml index 6f085e0ef..cb0a3c14e 100644 --- a/gazelle-dist/pom.xml +++ b/gazelle-dist/pom.xml @@ -55,36 +55,6 @@ - - spark-3.2.1 - - - com.intel.oap - spark-sql-columnar-shims-spark32 - ${project.version} - - - com.intel.oap - spark-sql-columnar-shims-spark321 - ${project.version} - - - - - spark-3.2.2 - - - com.intel.oap - spark-sql-columnar-shims-spark32 - ${project.version} - - - com.intel.oap - spark-sql-columnar-shims-spark322 - ${project.version} - - - diff --git a/native-sql-engine/core/pom.xml b/native-sql-engine/core/pom.xml index ebab7d397..e547f816e 100644 --- a/native-sql-engine/core/pom.xml +++ b/native-sql-engine/core/pom.xml @@ -78,40 +78,6 @@ - - spark-3.2.1 - - - com.intel.oap - spark-sql-columnar-shims-spark32 - ${project.version} - provided - - - com.intel.oap - spark-sql-columnar-shims-spark321 - ${project.version} - provided - - - - - spark-3.2.2 - - - com.intel.oap - spark-sql-columnar-shims-spark32 - ${project.version} - provided - - - com.intel.oap - spark-sql-columnar-shims-spark322 - ${project.version} - provided - - - diff --git a/pom.xml b/pom.xml index ef6bf89f2..3d06eb3c1 100644 --- a/pom.xml +++ b/pom.xml @@ -58,26 +58,6 @@ true - - spark-3.2.1 - - ${spark321.version} - 2.12.15 - - 2.12.0 - true - - - - spark-3.2.2 - - ${spark322.version} - 2.12.15 - - 2.12.0 - true - - hadoop-2.7.4 @@ -142,7 +122,6 @@ 3.1.1 3.1.1 3.2.1 - 3.2.2 2.12.10 1.8 diff --git a/shims/pom.xml b/shims/pom.xml index 2680f1dad..7a913a052 100644 --- a/shims/pom.xml +++ b/shims/pom.xml @@ -80,26 +80,6 @@ spark321 - - spark-3.2.1 - - - - common - spark32 - spark321 - - - - spark-3.2.2 - - - - common - spark32 - spark322 - - diff --git a/shims/spark321/src/main/scala/com/intel/oap/sql/shims/spark321/SparkShimProvider.scala b/shims/spark321/src/main/scala/com/intel/oap/sql/shims/spark321/SparkShimProvider.scala index 15b013189..bdc00d494 100644 --- a/shims/spark321/src/main/scala/com/intel/oap/sql/shims/spark321/SparkShimProvider.scala +++ b/shims/spark321/src/main/scala/com/intel/oap/sql/shims/spark321/SparkShimProvider.scala @@ -20,7 +20,9 @@ import com.intel.oap.sql.shims.{SparkShims, SparkShimDescriptor} object SparkShimProvider { val DESCRIPTOR = SparkShimDescriptor(3, 2, 1) - val DESCRIPTOR_STRINGS = Seq(s"$DESCRIPTOR") + val DESCRIPTOR_SPARK321 = SparkShimDescriptor(3, 2, 1) + val DESCRIPTOR_SPARK322 = SparkShimDescriptor(3, 2, 2) + val DESCRIPTOR_STRINGS = Seq(s"$DESCRIPTOR_SPARK321", s"$DESCRIPTOR_SPARK322") } class SparkShimProvider extends com.intel.oap.sql.shims.SparkShimProvider { diff --git a/shims/spark322/src/main/resources/META-INF/services/com.intel.oap.sql.shims.SparkShimProvider b/shims/spark322/src/main/resources/META-INF/services/com.intel.oap.sql.shims.SparkShimProvider deleted file mode 100644 index 011b41999..000000000 --- a/shims/spark322/src/main/resources/META-INF/services/com.intel.oap.sql.shims.SparkShimProvider +++ /dev/null @@ -1 +0,0 @@ -com.intel.oap.sql.shims.spark322.SparkShimProvider \ No newline at end of file diff --git a/shims/spark322/src/main/scala/com/intel/oap/sql/shims/spark322/Spark322Shims.scala b/shims/spark322/src/main/scala/com/intel/oap/sql/shims/spark322/Spark322Shims.scala deleted file mode 100644 index eeba1d9d0..000000000 --- a/shims/spark322/src/main/scala/com/intel/oap/sql/shims/spark322/Spark322Shims.scala +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2020 Intel Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.intel.oap.sql.shims.spark322 - -import com.intel.oap.sql.shims.ShimDescriptor -import com.intel.oap.sql.shims.spark32.Spark32Shims - -class Spark322Shims extends Spark32Shims { - - override def getShimDescriptor: ShimDescriptor = SparkShimProvider.DESCRIPTOR - -} \ No newline at end of file diff --git a/shims/spark322/src/main/scala/com/intel/oap/sql/shims/spark322/SparkShimProvider.scala b/shims/spark322/src/main/scala/com/intel/oap/sql/shims/spark322/SparkShimProvider.scala deleted file mode 100644 index d89a6558e..000000000 --- a/shims/spark322/src/main/scala/com/intel/oap/sql/shims/spark322/SparkShimProvider.scala +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright 2020 Intel Corporation - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.intel.oap.sql.shims.spark322 - -import com.intel.oap.sql.shims.{SparkShims, SparkShimDescriptor} - -object SparkShimProvider { - val DESCRIPTOR = SparkShimDescriptor(3, 2, 2) - val DESCRIPTOR_STRINGS = Seq(s"$DESCRIPTOR") -} - -class SparkShimProvider extends com.intel.oap.sql.shims.SparkShimProvider { - def createShim: SparkShims = { - new Spark322Shims() - } - - def matches(version: String): Boolean = { - SparkShimProvider.DESCRIPTOR_STRINGS.contains(version) - } -}