Enhancement: Fix compatibility issues with Spark 3.2.

Author: yuanoOo

spark-connector-oceanbase/spark-connector-oceanbase-3.2/pom.xml

@@ -54,7 +54,68 @@ under the License.
     </dependencies>
 
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>net.alchim31.maven</groupId>
+                    <artifactId>scala-maven-plugin</artifactId>
+                    <version>${scala-maven-plugin.version}</version>
+                    <configuration>
+                        <args>
+                            <arg>-nobootcp</arg>
+                            <arg>-target:jvm-${target.java.version}</arg>
+                        </args>
+                        <checkMultipleScalaVersions>false</checkMultipleScalaVersions>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
+            <plugin>
+                <groupId>net.alchim31.maven</groupId>
+                <artifactId>scala-maven-plugin</artifactId>
+                <version>${scala-maven-plugin.version}</version>
+                <executions>
+                    <!-- Run scala compiler in the process-resources phase, so that dependencies on
+                            scala classes can be resolved later in the (Java) compile phase -->
+                    <execution>
+                        <id>scala-compile-first</id>
+                        <goals>
+                            <goal>add-source</goal>
+                            <goal>compile</goal>
+                        </goals>
+                        <phase>process-resources</phase>
+                    </execution>
+
+                    <!-- Run scala compiler in the process-test-resources phase, so that dependencies on
+                             scala classes can be resolved later in the (Java) test-compile phase -->
+                    <execution>
+                        <id>scala-test-compile</id>
+                        <goals>
+                            <goal>testCompile</goal>
+                        </goals>
+                        <phase>process-test-resources</phase>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <version>${spotless.version}</version>
+                <configuration>
+                    <scala>
+                        <scalafmt>
+                            <version>3.4.3</version>
+                            <!-- This file is in the root of the project to make sure IntelliJ picks it up automatically -->
+                            <file>${project.basedir}/../../.scalafmt.conf</file>
+                        </scalafmt>
+                    </scala>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>

spark-connector-oceanbase/spark-connector-oceanbase-3.2/src/main/scala/com/oceanbase/spark/catalog/OceanBaseTable.scala

@@ -24,18 +24,7 @@ import org.apache.spark.sql.ExprUtils.compileFilter
 import org.apache.spark.sql.catalyst.InternalRow
 import org.apache.spark.sql.connector.expressions.{NamedReference, SortOrder}
 import org.apache.spark.sql.connector.expressions.aggregate.Aggregation
-import org.apache.spark.sql.connector.read.{
-  Batch,
-  InputPartition,
-  PartitionReader,
-  PartitionReaderFactory,
-  Scan,
-  ScanBuilder,
-  SupportsPushDownAggregates,
-  SupportsPushDownFilters,
-  SupportsPushDownRequiredColumns,
-  SupportsRuntimeFiltering
-}
+import org.apache.spark.sql.connector.read.{Batch, InputPartition, PartitionReader, PartitionReaderFactory, Scan, ScanBuilder, SupportsPushDownAggregates, SupportsPushDownFilters, SupportsPushDownRequiredColumns, SupportsRuntimeFiltering}
 import org.apache.spark.sql.sources.Filter
 import org.apache.spark.sql.types.StructType
 
@@ -44,18 +33,16 @@ case class OBJdbcScanBuilder(
     config: OceanBaseConfig,
     dialect: OceanBaseDialect
 ) extends ScanBuilder
-    with SupportsPushDownFilters
-    with SupportsPushDownRequiredColumns
-    with SupportsPushDownAggregates
-    with Logging {
+  with SupportsPushDownFilters
+  with SupportsPushDownRequiredColumns
+  with SupportsPushDownAggregates
+  with Logging {
   private var finalSchema = schema
   private var pushedFilter = Array.empty[Filter]
   private var pushDownLimit = 0
   private var sortOrders: Array[SortOrder] = Array.empty[SortOrder]
 
-  /** TODO: support
-    * org.apache.spark.sql.connector.read.SupportsPushDownV2Filters
-    */
+  /** TODO: support org.apache.spark.sql.connector.read.SupportsPushDownV2Filters */
   override def pushFilters(filters: Array[Filter]): Array[Filter] = {
     val (pushed, unSupported) =
       filters.partition(f => compileFilter(f, dialect).isDefined)
@@ -96,7 +83,7 @@ case class OBJdbcBatchScan(
     pushDownTopNSortOrders: Array[SortOrder],
     dialect: OceanBaseDialect
 ) extends Scan
-    with SupportsRuntimeFiltering {
+  with SupportsRuntimeFiltering {
 
   // TODO: support spark runtime filter feat.
   private var runtimeFilters: Array[Filter] = Array.empty