From 5dc32e800d126b254b89a32e0906c6eaa4882e7b Mon Sep 17 00:00:00 2001 From: Gera Shegalov Date: Thu, 21 Oct 2021 08:01:04 -0700 Subject: [PATCH] Implemenent a Spark 3.2.1-SNAPSHOT Shim Signed-off-by: Gera Shegalov --- dist/pom.xml | 22 ++++- .../rapids-shuffle.md | 1 + jenkins/spark-nightly-build.sh | 2 + jenkins/spark-premerge-build.sh | 1 + pom.xml | 43 +++++++++- shims/pom.xml | 4 + shims/spark321/pom.xml | 86 +++++++++++++++++++ .../rapids/shims/spark321/Spark321Shims.scala | 24 ++++++ .../spark321/SparkShimServiceProvider.scala | 35 ++++++++ .../spark321/RapidsShuffleManager.scala | 26 ++++++ .../RapidsShuffleInternalManager.scala | 60 +++++++++++++ .../shims/spark321/Spark321ShimsSuite.scala | 41 +++++++++ .../spark/rapids/shims/v2/HashUtils.scala | 0 .../shims/v2/OffsetWindowFunctionMeta.scala | 0 .../shims/v2/ShimAQEShuffleReadExec.scala | 0 .../rapids/shims/v2/ShimDataSourceRDD.scala | 0 .../spark/rapids/shims/v2/Spark32XShims.scala | 0 .../spark/rapids/shims/v2/TreeNode.scala | 0 .../spark/rapids/shims/v2/TypeSigUtil.scala | 0 .../spark/rapids/shims/v2/YearParseUtil.scala | 0 .../spark/rapids/shims/v2/gpuWindows.scala | 0 .../shims/v2/GpuShuffleBlockResolver.scala | 0 .../shims/v2/ShuffledBatchRDDUtil.scala | 0 .../v2/api/python/ShimBasePythonRunner.scala | 0 .../v2/storage/ShimDiskBlockManager.scala | 0 .../sql/execution/ShimTrampolineUtil.scala | 0 .../shims/v2/ShimVectorizedColumnReader.scala | 0 .../rapids/shims/v2/Spark32XShimsUtils.scala | 0 .../rapids/shims/v2/datetimeExpressions.scala | 0 29 files changed, 342 insertions(+), 3 deletions(-) create mode 100644 shims/spark321/pom.xml create mode 100644 shims/spark321/src/main/scala/com/nvidia/spark/rapids/shims/spark321/Spark321Shims.scala create mode 100644 shims/spark321/src/main/scala/com/nvidia/spark/rapids/shims/spark321/SparkShimServiceProvider.scala create mode 100644 shims/spark321/src/main/scala/com/nvidia/spark/rapids/spark321/RapidsShuffleManager.scala create mode 100644 shims/spark321/src/main/scala/org/apache/spark/sql/rapids/shims/spark321/RapidsShuffleInternalManager.scala create mode 100644 shims/spark321/src/test/scala/com/nvidia/spark/rapids/shims/spark321/Spark321ShimsSuite.scala rename sql-plugin/src/main/{320 => 320+}/scala/com/nvidia/spark/rapids/shims/v2/HashUtils.scala (100%) rename sql-plugin/src/main/{320 => 320+}/scala/com/nvidia/spark/rapids/shims/v2/OffsetWindowFunctionMeta.scala (100%) rename sql-plugin/src/main/{320 => 320+}/scala/com/nvidia/spark/rapids/shims/v2/ShimAQEShuffleReadExec.scala (100%) rename sql-plugin/src/main/{320 => 320+}/scala/com/nvidia/spark/rapids/shims/v2/ShimDataSourceRDD.scala (100%) rename sql-plugin/src/main/{320 => 320+}/scala/com/nvidia/spark/rapids/shims/v2/Spark32XShims.scala (100%) rename sql-plugin/src/main/{320 => 320+}/scala/com/nvidia/spark/rapids/shims/v2/TreeNode.scala (100%) rename sql-plugin/src/main/{320 => 320+}/scala/com/nvidia/spark/rapids/shims/v2/TypeSigUtil.scala (100%) rename sql-plugin/src/main/{320 => 320+}/scala/com/nvidia/spark/rapids/shims/v2/YearParseUtil.scala (100%) rename sql-plugin/src/main/{320 => 320+}/scala/com/nvidia/spark/rapids/shims/v2/gpuWindows.scala (100%) rename sql-plugin/src/main/{320 => 320+}/scala/org/apache/spark/rapids/shims/v2/GpuShuffleBlockResolver.scala (100%) rename sql-plugin/src/main/{320 => 320+}/scala/org/apache/spark/rapids/shims/v2/ShuffledBatchRDDUtil.scala (100%) rename sql-plugin/src/main/{320 => 320+}/scala/org/apache/spark/rapids/shims/v2/api/python/ShimBasePythonRunner.scala (100%) rename sql-plugin/src/main/{320 => 320+}/scala/org/apache/spark/rapids/shims/v2/storage/ShimDiskBlockManager.scala (100%) rename sql-plugin/src/main/{320 => 320+}/scala/org/apache/spark/sql/execution/ShimTrampolineUtil.scala (100%) rename sql-plugin/src/main/{320 => 320+}/scala/org/apache/spark/sql/execution/datasources/parquet/rapids/shims/v2/ShimVectorizedColumnReader.scala (100%) rename sql-plugin/src/main/{320 => 320+}/scala/org/apache/spark/sql/rapids/shims/v2/Spark32XShimsUtils.scala (100%) rename sql-plugin/src/main/{320 => 320+}/scala/org/apache/spark/sql/rapids/shims/v2/datetimeExpressions.scala (100%) diff --git a/dist/pom.xml b/dist/pom.xml index ce9699e51aa..84c09f0f3eb 100644 --- a/dist/pom.xml +++ b/dist/pom.xml @@ -519,6 +519,15 @@ false ${project.build.directory}/deps + + com.nvidia + rapids-4-spark-aggregator_${scala.binary.version} + spark321 + ${project.version} + jar + false + ${project.build.directory}/deps + true ${project.build.directory}/deps @@ -542,7 +551,7 @@ + value="301,302,303,311,312,313,320,321,311cdh"/> false ${project.build.directory}/deps + + com.nvidia + rapids-4-spark-aggregator_${scala.binary.version} + spark321 + ${project.version} + jar + false + ${project.build.directory}/deps + com.nvidia rapids-4-spark-aggregator_${scala.binary.version} @@ -702,7 +720,7 @@ + value="301,302,303,304,311,312,313,320,321,311cdh,301db,311db"/> ${project.basedir}/src/main/301+-nondb/scala ${project.basedir}/src/main/311+-all/scala ${project.basedir}/src/main/311+-nondb/scala - ${project.basedir}/src/main/320/scala + ${project.basedir}/src/main/320+/scala + + + + + + + + + aggregator + tests-spark310+ + + + + release321 + + + buildver + 321 + + + + ${spark321.version} + ${spark321.version} + + + + + org.codehaus.mojo + build-helper-maven-plugin + + + add-profile-src-31+ + add-source + generate-sources + + + ${project.basedir}/src/main/301+-nondb/scala + ${project.basedir}/src/main/311+-all/scala + ${project.basedir}/src/main/311+-nondb/scala + ${project.basedir}/src/main/320+/scala @@ -665,6 +705,7 @@ 3.1.2 3.1.3-SNAPSHOT 3.2.0 + 3.2.1-SNAPSHOT 3.6.0 4.3.0 3.2.0 diff --git a/shims/pom.xml b/shims/pom.xml index 07d358c454a..e48cc2fa8d0 100644 --- a/shims/pom.xml +++ b/shims/pom.xml @@ -81,6 +81,10 @@ release320 spark320 + + release321 + spark321 + diff --git a/shims/spark321/pom.xml b/shims/spark321/pom.xml new file mode 100644 index 00000000000..3d0bed7eaab --- /dev/null +++ b/shims/spark321/pom.xml @@ -0,0 +1,86 @@ + + + + 4.0.0 + + + com.nvidia + rapids-4-spark-shims_2.12 + 21.12.0-SNAPSHOT + ../pom.xml + + rapids-4-spark-shims-spark321_2.12 + RAPIDS Accelerator for Apache Spark SQL Plugin Spark 3.2.1 Shim + The RAPIDS SQL plugin for Apache Spark 3.2.1 Shim + 21.12.0-SNAPSHOT + + + + + + + + + + + maven-antrun-plugin + + + dependency + generate-resources + + + + + + + + + + + + + run + + + + + + + + + + ${project.build.directory}/extra-resources + + + src/main/resources + + + + + + + org.apache.spark + spark-sql_${scala.binary.version} + ${spark321.version} + provided + + + diff --git a/shims/spark321/src/main/scala/com/nvidia/spark/rapids/shims/spark321/Spark321Shims.scala b/shims/spark321/src/main/scala/com/nvidia/spark/rapids/shims/spark321/Spark321Shims.scala new file mode 100644 index 00000000000..0700419b01c --- /dev/null +++ b/shims/spark321/src/main/scala/com/nvidia/spark/rapids/shims/spark321/Spark321Shims.scala @@ -0,0 +1,24 @@ +/* + * Copyright (c) 2021, NVIDIA 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.nvidia.spark.rapids.shims.spark321 + +import com.nvidia.spark.rapids._ +import com.nvidia.spark.rapids.shims.v2._ + +class Spark321Shims extends Spark32XShims { + override def getSparkShimVersion: ShimVersion = SparkShimServiceProvider.VERSION +} diff --git a/shims/spark321/src/main/scala/com/nvidia/spark/rapids/shims/spark321/SparkShimServiceProvider.scala b/shims/spark321/src/main/scala/com/nvidia/spark/rapids/shims/spark321/SparkShimServiceProvider.scala new file mode 100644 index 00000000000..a908de99d2e --- /dev/null +++ b/shims/spark321/src/main/scala/com/nvidia/spark/rapids/shims/spark321/SparkShimServiceProvider.scala @@ -0,0 +1,35 @@ +/* + * Copyright (c) 2021, NVIDIA 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.nvidia.spark.rapids.shims.spark321 + +import com.nvidia.spark.rapids.{SparkShims, SparkShimVersion} + +object SparkShimServiceProvider { + val VERSION = SparkShimVersion(3, 2, 1) + val VERSIONNAMES = Seq(s"$VERSION", s"$VERSION-SNAPSHOT") +} + +class SparkShimServiceProvider extends com.nvidia.spark.rapids.SparkShimServiceProvider { + + def matchesVersion(version: String): Boolean = { + SparkShimServiceProvider.VERSIONNAMES.contains(version) + } + + def buildShim: SparkShims = { + new Spark321Shims() + } +} diff --git a/shims/spark321/src/main/scala/com/nvidia/spark/rapids/spark321/RapidsShuffleManager.scala b/shims/spark321/src/main/scala/com/nvidia/spark/rapids/spark321/RapidsShuffleManager.scala new file mode 100644 index 00000000000..81c6607da7d --- /dev/null +++ b/shims/spark321/src/main/scala/com/nvidia/spark/rapids/spark321/RapidsShuffleManager.scala @@ -0,0 +1,26 @@ +/* + * Copyright (c) 2021, NVIDIA 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.nvidia.spark.rapids.spark321 + +import org.apache.spark.SparkConf +import org.apache.spark.sql.rapids.shims.spark321.ProxyRapidsShuffleInternalManager + +/** A shuffle manager optimized for the RAPIDS Plugin for Apache Spark. */ +sealed class RapidsShuffleManager( + conf: SparkConf, + isDriver: Boolean) extends ProxyRapidsShuffleInternalManager(conf, isDriver) { +} diff --git a/shims/spark321/src/main/scala/org/apache/spark/sql/rapids/shims/spark321/RapidsShuffleInternalManager.scala b/shims/spark321/src/main/scala/org/apache/spark/sql/rapids/shims/spark321/RapidsShuffleInternalManager.scala new file mode 100644 index 00000000000..bd95635ee05 --- /dev/null +++ b/shims/spark321/src/main/scala/org/apache/spark/sql/rapids/shims/spark321/RapidsShuffleInternalManager.scala @@ -0,0 +1,60 @@ +/* + * Copyright (c) 2021, NVIDIA 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 org.apache.spark.sql.rapids.shims.spark321 + +import org.apache.spark.{SparkConf, TaskContext} +import org.apache.spark.shuffle._ +import org.apache.spark.sql.rapids.{ProxyRapidsShuffleInternalManagerBase, RapidsShuffleInternalManagerBase} + +/** + * A shuffle manager optimized for the RAPIDS Plugin For Apache Spark. + * @note This is an internal class to obtain access to the private + * `ShuffleManager` and `SortShuffleManager` classes. + */ +class RapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean) + extends RapidsShuffleInternalManagerBase(conf, isDriver) { + + def getReader[K, C]( + handle: ShuffleHandle, + startMapIndex: Int, + endMapIndex: Int, + startPartition: Int, + endPartition: Int, + context: TaskContext, + metrics: ShuffleReadMetricsReporter): ShuffleReader[K, C] = { + getReaderInternal(handle, startMapIndex, endMapIndex, startPartition, endPartition, context, + metrics) + } +} + + +class ProxyRapidsShuffleInternalManager(conf: SparkConf, isDriver: Boolean) + extends ProxyRapidsShuffleInternalManagerBase(conf, isDriver) with ShuffleManager { + + def getReader[K, C]( + handle: ShuffleHandle, + startMapIndex: Int, + endMapIndex: Int, + startPartition: Int, + endPartition: Int, + context: TaskContext, + metrics: ShuffleReadMetricsReporter + ): ShuffleReader[K, C] = { + self.getReader(handle, startMapIndex, endMapIndex, startPartition, endPartition, context, + metrics) + } +} \ No newline at end of file diff --git a/shims/spark321/src/test/scala/com/nvidia/spark/rapids/shims/spark321/Spark321ShimsSuite.scala b/shims/spark321/src/test/scala/com/nvidia/spark/rapids/shims/spark321/Spark321ShimsSuite.scala new file mode 100644 index 00000000000..9864abc52cb --- /dev/null +++ b/shims/spark321/src/test/scala/com/nvidia/spark/rapids/shims/spark321/Spark321ShimsSuite.scala @@ -0,0 +1,41 @@ +/* + * Copyright (c) 2021, NVIDIA 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.nvidia.spark.rapids.shims.spark321; + +import com.nvidia.spark.rapids.{ShimLoader, SparkShims, SparkShimVersion, TypeSig} +import org.scalatest.FunSuite + +import org.apache.spark.sql.types.{DayTimeIntervalType, YearMonthIntervalType} + +class Spark321ShimsSuite extends FunSuite { + val sparkShims: SparkShims = new SparkShimServiceProvider().buildShim + test("spark shims version") { + assert(sparkShims.getSparkShimVersion === SparkShimVersion(3, 2, 1)) + } + + test("shuffle manager class") { + assert(ShimLoader.getRapidsShuffleManagerClass === + classOf[com.nvidia.spark.rapids.spark321.RapidsShuffleManager].getCanonicalName) + } + + test("TypeSig321") { + val check = TypeSig.DAYTIME + TypeSig.YEARMONTH + assert(check.isSupportedByPlugin(DayTimeIntervalType(), false) == true) + assert(check.isSupportedByPlugin(YearMonthIntervalType(), false) == true) + } + +} diff --git a/sql-plugin/src/main/320/scala/com/nvidia/spark/rapids/shims/v2/HashUtils.scala b/sql-plugin/src/main/320+/scala/com/nvidia/spark/rapids/shims/v2/HashUtils.scala similarity index 100% rename from sql-plugin/src/main/320/scala/com/nvidia/spark/rapids/shims/v2/HashUtils.scala rename to sql-plugin/src/main/320+/scala/com/nvidia/spark/rapids/shims/v2/HashUtils.scala diff --git a/sql-plugin/src/main/320/scala/com/nvidia/spark/rapids/shims/v2/OffsetWindowFunctionMeta.scala b/sql-plugin/src/main/320+/scala/com/nvidia/spark/rapids/shims/v2/OffsetWindowFunctionMeta.scala similarity index 100% rename from sql-plugin/src/main/320/scala/com/nvidia/spark/rapids/shims/v2/OffsetWindowFunctionMeta.scala rename to sql-plugin/src/main/320+/scala/com/nvidia/spark/rapids/shims/v2/OffsetWindowFunctionMeta.scala diff --git a/sql-plugin/src/main/320/scala/com/nvidia/spark/rapids/shims/v2/ShimAQEShuffleReadExec.scala b/sql-plugin/src/main/320+/scala/com/nvidia/spark/rapids/shims/v2/ShimAQEShuffleReadExec.scala similarity index 100% rename from sql-plugin/src/main/320/scala/com/nvidia/spark/rapids/shims/v2/ShimAQEShuffleReadExec.scala rename to sql-plugin/src/main/320+/scala/com/nvidia/spark/rapids/shims/v2/ShimAQEShuffleReadExec.scala diff --git a/sql-plugin/src/main/320/scala/com/nvidia/spark/rapids/shims/v2/ShimDataSourceRDD.scala b/sql-plugin/src/main/320+/scala/com/nvidia/spark/rapids/shims/v2/ShimDataSourceRDD.scala similarity index 100% rename from sql-plugin/src/main/320/scala/com/nvidia/spark/rapids/shims/v2/ShimDataSourceRDD.scala rename to sql-plugin/src/main/320+/scala/com/nvidia/spark/rapids/shims/v2/ShimDataSourceRDD.scala diff --git a/sql-plugin/src/main/320/scala/com/nvidia/spark/rapids/shims/v2/Spark32XShims.scala b/sql-plugin/src/main/320+/scala/com/nvidia/spark/rapids/shims/v2/Spark32XShims.scala similarity index 100% rename from sql-plugin/src/main/320/scala/com/nvidia/spark/rapids/shims/v2/Spark32XShims.scala rename to sql-plugin/src/main/320+/scala/com/nvidia/spark/rapids/shims/v2/Spark32XShims.scala diff --git a/sql-plugin/src/main/320/scala/com/nvidia/spark/rapids/shims/v2/TreeNode.scala b/sql-plugin/src/main/320+/scala/com/nvidia/spark/rapids/shims/v2/TreeNode.scala similarity index 100% rename from sql-plugin/src/main/320/scala/com/nvidia/spark/rapids/shims/v2/TreeNode.scala rename to sql-plugin/src/main/320+/scala/com/nvidia/spark/rapids/shims/v2/TreeNode.scala diff --git a/sql-plugin/src/main/320/scala/com/nvidia/spark/rapids/shims/v2/TypeSigUtil.scala b/sql-plugin/src/main/320+/scala/com/nvidia/spark/rapids/shims/v2/TypeSigUtil.scala similarity index 100% rename from sql-plugin/src/main/320/scala/com/nvidia/spark/rapids/shims/v2/TypeSigUtil.scala rename to sql-plugin/src/main/320+/scala/com/nvidia/spark/rapids/shims/v2/TypeSigUtil.scala diff --git a/sql-plugin/src/main/320/scala/com/nvidia/spark/rapids/shims/v2/YearParseUtil.scala b/sql-plugin/src/main/320+/scala/com/nvidia/spark/rapids/shims/v2/YearParseUtil.scala similarity index 100% rename from sql-plugin/src/main/320/scala/com/nvidia/spark/rapids/shims/v2/YearParseUtil.scala rename to sql-plugin/src/main/320+/scala/com/nvidia/spark/rapids/shims/v2/YearParseUtil.scala diff --git a/sql-plugin/src/main/320/scala/com/nvidia/spark/rapids/shims/v2/gpuWindows.scala b/sql-plugin/src/main/320+/scala/com/nvidia/spark/rapids/shims/v2/gpuWindows.scala similarity index 100% rename from sql-plugin/src/main/320/scala/com/nvidia/spark/rapids/shims/v2/gpuWindows.scala rename to sql-plugin/src/main/320+/scala/com/nvidia/spark/rapids/shims/v2/gpuWindows.scala diff --git a/sql-plugin/src/main/320/scala/org/apache/spark/rapids/shims/v2/GpuShuffleBlockResolver.scala b/sql-plugin/src/main/320+/scala/org/apache/spark/rapids/shims/v2/GpuShuffleBlockResolver.scala similarity index 100% rename from sql-plugin/src/main/320/scala/org/apache/spark/rapids/shims/v2/GpuShuffleBlockResolver.scala rename to sql-plugin/src/main/320+/scala/org/apache/spark/rapids/shims/v2/GpuShuffleBlockResolver.scala diff --git a/sql-plugin/src/main/320/scala/org/apache/spark/rapids/shims/v2/ShuffledBatchRDDUtil.scala b/sql-plugin/src/main/320+/scala/org/apache/spark/rapids/shims/v2/ShuffledBatchRDDUtil.scala similarity index 100% rename from sql-plugin/src/main/320/scala/org/apache/spark/rapids/shims/v2/ShuffledBatchRDDUtil.scala rename to sql-plugin/src/main/320+/scala/org/apache/spark/rapids/shims/v2/ShuffledBatchRDDUtil.scala diff --git a/sql-plugin/src/main/320/scala/org/apache/spark/rapids/shims/v2/api/python/ShimBasePythonRunner.scala b/sql-plugin/src/main/320+/scala/org/apache/spark/rapids/shims/v2/api/python/ShimBasePythonRunner.scala similarity index 100% rename from sql-plugin/src/main/320/scala/org/apache/spark/rapids/shims/v2/api/python/ShimBasePythonRunner.scala rename to sql-plugin/src/main/320+/scala/org/apache/spark/rapids/shims/v2/api/python/ShimBasePythonRunner.scala diff --git a/sql-plugin/src/main/320/scala/org/apache/spark/rapids/shims/v2/storage/ShimDiskBlockManager.scala b/sql-plugin/src/main/320+/scala/org/apache/spark/rapids/shims/v2/storage/ShimDiskBlockManager.scala similarity index 100% rename from sql-plugin/src/main/320/scala/org/apache/spark/rapids/shims/v2/storage/ShimDiskBlockManager.scala rename to sql-plugin/src/main/320+/scala/org/apache/spark/rapids/shims/v2/storage/ShimDiskBlockManager.scala diff --git a/sql-plugin/src/main/320/scala/org/apache/spark/sql/execution/ShimTrampolineUtil.scala b/sql-plugin/src/main/320+/scala/org/apache/spark/sql/execution/ShimTrampolineUtil.scala similarity index 100% rename from sql-plugin/src/main/320/scala/org/apache/spark/sql/execution/ShimTrampolineUtil.scala rename to sql-plugin/src/main/320+/scala/org/apache/spark/sql/execution/ShimTrampolineUtil.scala diff --git a/sql-plugin/src/main/320/scala/org/apache/spark/sql/execution/datasources/parquet/rapids/shims/v2/ShimVectorizedColumnReader.scala b/sql-plugin/src/main/320+/scala/org/apache/spark/sql/execution/datasources/parquet/rapids/shims/v2/ShimVectorizedColumnReader.scala similarity index 100% rename from sql-plugin/src/main/320/scala/org/apache/spark/sql/execution/datasources/parquet/rapids/shims/v2/ShimVectorizedColumnReader.scala rename to sql-plugin/src/main/320+/scala/org/apache/spark/sql/execution/datasources/parquet/rapids/shims/v2/ShimVectorizedColumnReader.scala diff --git a/sql-plugin/src/main/320/scala/org/apache/spark/sql/rapids/shims/v2/Spark32XShimsUtils.scala b/sql-plugin/src/main/320+/scala/org/apache/spark/sql/rapids/shims/v2/Spark32XShimsUtils.scala similarity index 100% rename from sql-plugin/src/main/320/scala/org/apache/spark/sql/rapids/shims/v2/Spark32XShimsUtils.scala rename to sql-plugin/src/main/320+/scala/org/apache/spark/sql/rapids/shims/v2/Spark32XShimsUtils.scala diff --git a/sql-plugin/src/main/320/scala/org/apache/spark/sql/rapids/shims/v2/datetimeExpressions.scala b/sql-plugin/src/main/320+/scala/org/apache/spark/sql/rapids/shims/v2/datetimeExpressions.scala similarity index 100% rename from sql-plugin/src/main/320/scala/org/apache/spark/sql/rapids/shims/v2/datetimeExpressions.scala rename to sql-plugin/src/main/320+/scala/org/apache/spark/sql/rapids/shims/v2/datetimeExpressions.scala