Import fixes and verify amends

Signed-off-by: Kuhu Shukla <kuhus@nvidia.com>
NVIDIA · Dec 30, 2021 · f14fa18 · f14fa18
1 parent ffd2127
commit f14fa18
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/shims/spark304/src/main/scala/com/nvidia/spark/rapids/shims/spark304/Spark304Shims.scala b/shims/spark304/src/main/scala/com/nvidia/spark/rapids/shims/spark304/Spark304Shims.scala
@@ -37,7 +37,8 @@ class Spark304Shims extends Spark30XShims with Spark30Xuntil33XShims {
       caseSensitive: Boolean,
       datetimeRebaseMode: Any): ParquetFilters =
     new ParquetFilters(schema, pushDownDate, pushDownTimestamp, pushDownDecimal, pushDownStartWith,
-      pushDownInFilterThreshold, caseSensitive, datetimeRebaseMode.asInstanceOf[SQLConf.LegacyBehaviorPolicy.Value])
+      pushDownInFilterThreshold, caseSensitive, datetimeRebaseMode.asInstanceOf[
+        SQLConf.LegacyBehaviorPolicy.Value])
 
   def getDateTimeRebaseMode(lookupFileMeta: String => String,
     modeByConfig: String) : Any = DataSourceUtils.datetimeRebaseMode(

diff --git a/.../spark312db/src/main/scala/com/nvidia/spark/rapids/shims/spark312db/Spark312dbShims.scala b/.../spark312db/src/main/scala/com/nvidia/spark/rapids/shims/spark312db/Spark312dbShims.scala
@@ -37,7 +37,8 @@ class Spark312dbShims extends Spark31XdbShims with Spark30Xuntil33XShims {
       caseSensitive: Boolean,
       datetimeRebaseMode: Any): ParquetFilters =
     new ParquetFilters(schema, pushDownDate, pushDownTimestamp, pushDownDecimal, pushDownStartWith,
-      pushDownInFilterThreshold, caseSensitive, datetimeRebaseMode.asInstanceOf[SQLConf.LegacyBehaviorPolicy.Value])
+      pushDownInFilterThreshold, caseSensitive, datetimeRebaseMode.asInstanceOf[
+        SQLConf.LegacyBehaviorPolicy.Value])
 
   def getDateTimeRebaseMode(lookupFileMeta: String => String,
     modeByConfig: String) : Any = DataSourceUtils.datetimeRebaseMode(

diff --git a/shims/spark313/src/main/scala/com/nvidia/spark/rapids/shims/spark313/Spark313Shims.scala b/shims/spark313/src/main/scala/com/nvidia/spark/rapids/shims/spark313/Spark313Shims.scala
@@ -37,7 +37,8 @@ class Spark313Shims extends Spark31XShims with Spark30Xuntil33XShims {
       caseSensitive: Boolean,
       datetimeRebaseMode: Any): ParquetFilters =
     new ParquetFilters(schema, pushDownDate, pushDownTimestamp, pushDownDecimal, pushDownStartWith,
-      pushDownInFilterThreshold, caseSensitive, datetimeRebaseMode.asInstanceOf[SQLConf.LegacyBehaviorPolicy.Value])
+      pushDownInFilterThreshold, caseSensitive, datetimeRebaseMode.asInstanceOf[
+        SQLConf.LegacyBehaviorPolicy.Value])
 
   override def hasCastFloatTimestampUpcast: Boolean = true
 

diff --git a/shims/spark320/src/main/scala/com/nvidia/spark/rapids/shims/spark320/Spark320Shims.scala b/shims/spark320/src/main/scala/com/nvidia/spark/rapids/shims/spark320/Spark320Shims.scala
@@ -51,7 +51,8 @@ class Spark320Shims extends Spark32XShims with Spark30Xuntil33XShims {
     caseSensitive: Boolean,
     datetimeRebaseMode: Any): ParquetFilters = {
     new ParquetFilters(schema, pushDownDate, pushDownTimestamp, pushDownDecimal, pushDownStartWith,
-      pushDownInFilterThreshold, caseSensitive, datetimeRebaseMode.asInstanceOf[SQLConf.LegacyBehaviorPolicy.Value])
+      pushDownInFilterThreshold, caseSensitive, datetimeRebaseMode.asInstanceOf[
+        SQLConf.LegacyBehaviorPolicy.Value])
   }
 
   def getDateTimeRebaseMode(lookupFileMeta: String => String,

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
@@ -50,7 +50,8 @@ class Spark321Shims extends Spark32XShims with Spark30Xuntil33XShims {
     caseSensitive: Boolean,
     datetimeRebaseMode: Any): ParquetFilters = {
     new ParquetFilters(schema, pushDownDate, pushDownTimestamp, pushDownDecimal, pushDownStartWith,
-      pushDownInFilterThreshold, caseSensitive, datetimeRebaseMode.asInstanceOf[SQLConf.LegacyBehaviorPolicy.Value])
+      pushDownInFilterThreshold, caseSensitive, datetimeRebaseMode.asInstanceOf[
+        SQLConf.LegacyBehaviorPolicy.Value])
   }
 
   def getDateTimeRebaseMode(lookupFileMeta: String => String,

diff --git a/sql-plugin/src/main/301db/scala/com/nvidia/spark/rapids/shims/v2/Spark30XdbShims.scala b/sql-plugin/src/main/301db/scala/com/nvidia/spark/rapids/shims/v2/Spark30XdbShims.scala
@@ -79,7 +79,8 @@ abstract class Spark30XdbShims extends Spark30XdbShimsBase with Logging {
       caseSensitive: Boolean,
       datetimeRebaseMode: Any): ParquetFilters =
     new ParquetFilters(schema, pushDownDate, pushDownTimestamp, pushDownDecimal, pushDownStartWith,
-      pushDownInFilterThreshold, caseSensitive, datetimeRebaseMode.asInstanceOf[SQLConf.LegacyBehaviorPolicy.Value])
+      pushDownInFilterThreshold, caseSensitive, datetimeRebaseMode.asInstanceOf[
+      SQLConf.LegacyBehaviorPolicy.Value])
 
   override def v1RepairTableCommand(tableName: TableIdentifier): RunnableCommand =
     AlterTableRecoverPartitionsCommand(tableName)

diff --git a/...ugin/src/main/301until310-all/scala/com/nvidia/spark/rapids/shims/v2/GpuParquetScan.scala b/...ugin/src/main/301until310-all/scala/com/nvidia/spark/rapids/shims/v2/GpuParquetScan.scala
@@ -19,12 +19,12 @@ package com.nvidia.spark.rapids.shims.v2
 import com.nvidia.spark.rapids.{Arm, GpuParquetPartitionReaderFactoryBase, GpuParquetScanBase, ParquetFileInfoWithBlockMeta, ParquetPartitionReader, RapidsConf, ShimLoader}
 import org.apache.hadoop.conf.Configuration
 import org.apache.hadoop.fs.Path
-
 import org.apache.parquet.column.ColumnDescriptor
 import org.apache.parquet.filter2.predicate.FilterApi
 import org.apache.parquet.format.converter.ParquetMetadataConverter
-import org.apache.parquet.hadoop.metadata.ColumnPath
 import org.apache.parquet.hadoop.{ParquetFileReader, ParquetInputFormat}
+import org.apache.parquet.hadoop.metadata.ColumnPath
+
 import org.apache.spark.sql.SparkSession
 import org.apache.spark.sql.catalyst.expressions.Expression
 import org.apache.spark.sql.connector.read.PartitionReaderFactory