[SHIMS] Fix the code style issue of prepareWrite (apache#8316)

yikf · Dec 26, 2024 · e2c4f80 · e2c4f80
1 parent 04d4bec
commit e2c4f80
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/...spark32/src/main/scala/org/apache/spark/sql/execution/datasources/orc/OrcFileFormat.scala b/...spark32/src/main/scala/org/apache/spark/sql/execution/datasources/orc/OrcFileFormat.scala
@@ -95,14 +95,14 @@ class OrcFileFormat extends FileFormat with DataSourceRegister with Serializable
 
     conf.set(MAPRED_OUTPUT_SCHEMA.getAttribute, OrcFileFormat.getQuotedSchemaString(dataSchema))
 
+    // Pass compression to job conf so that the file extension can be aware of it.
     conf.set(COMPRESS.getAttribute, orcOptions.compressionCodec)
 
     conf
       .asInstanceOf[JobConf]
       .setOutputFormat(classOf[org.apache.orc.mapred.OrcOutputFormat[OrcStruct]])
 
-    if ("true" == sparkSession.sparkContext.getLocalProperty("isNativeApplicable")) {
-      // pass compression to job conf so that the file extension can be aware of it.
+    if (sparkSession.sparkContext.getLocalProperty("isNativeApplicable") == "true") {
       val nativeConf =
         GlutenFormatFactory(shortName()).nativeConf(options, orcOptions.compressionCodec)
 

diff --git a/...src/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFileFormat.scala b/...src/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFileFormat.scala
@@ -82,9 +82,8 @@ class ParquetFileFormat extends FileFormat with DataSourceRegister with Logging
       job: Job,
       options: Map[String, String],
       dataSchema: StructType): OutputWriterFactory = {
-    if ("true" == sparkSession.sparkContext.getLocalProperty("isNativeApplicable")) {
-
-      // pass compression to job conf so that the file extension can be aware of it.
+    if (sparkSession.sparkContext.getLocalProperty("isNativeApplicable") == "true") {
+      // Pass compression to job conf so that the file extension can be aware of it.
       val conf = ContextUtil.getConfiguration(job)
       val parquetOptions = new ParquetOptions(options, sparkSession.sessionState.conf)
       conf.set(ParquetOutputFormat.COMPRESSION, parquetOptions.compressionCodecClassName)
@@ -103,7 +102,6 @@ class ParquetFileFormat extends FileFormat with DataSourceRegister with Logging
             context: TaskAttemptContext): OutputWriter = {
           GlutenFormatFactory(shortName())
             .createOutputWriter(path, dataSchema, context, nativeConf)
-
         }
       }
     } else {

diff --git a/...spark33/src/main/scala/org/apache/spark/sql/execution/datasources/orc/OrcFileFormat.scala b/...spark33/src/main/scala/org/apache/spark/sql/execution/datasources/orc/OrcFileFormat.scala
@@ -76,14 +76,14 @@ class OrcFileFormat extends FileFormat with DataSourceRegister with Serializable
 
     val conf = job.getConfiguration
 
+    // Pass compression to job conf so that the file extension can be aware of it.
     conf.set(COMPRESS.getAttribute, orcOptions.compressionCodec)
 
     conf
       .asInstanceOf[JobConf]
       .setOutputFormat(classOf[org.apache.orc.mapred.OrcOutputFormat[OrcStruct]])
 
-    if ("true" == sparkSession.sparkContext.getLocalProperty("isNativeApplicable")) {
-      // pass compression to job conf so that the file extension can be aware of it.
+    if (sparkSession.sparkContext.getLocalProperty("isNativeApplicable") == "true") {
       val nativeConf =
         GlutenFormatFactory(shortName()).nativeConf(options, orcOptions.compressionCodec)
 
@@ -93,7 +93,6 @@ class OrcFileFormat extends FileFormat with DataSourceRegister with Serializable
             val name = context.getConfiguration.get(COMPRESS.getAttribute)
             OrcUtils.extensionsForCompressionCodecNames.getOrElse(name, "")
           }
-
           compressionExtension + ".orc"
         }
 
@@ -119,7 +118,6 @@ class OrcFileFormat extends FileFormat with DataSourceRegister with Serializable
             val name = context.getConfiguration.get(COMPRESS.getAttribute)
             OrcUtils.extensionsForCompressionCodecNames.getOrElse(name, "")
           }
-
           compressionExtension + ".orc"
         }
       }

diff --git a/...src/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFileFormat.scala b/...src/main/scala/org/apache/spark/sql/execution/datasources/parquet/ParquetFileFormat.scala
@@ -74,9 +74,8 @@ class ParquetFileFormat extends FileFormat with DataSourceRegister with Logging
       job: Job,
       options: Map[String, String],
       dataSchema: StructType): OutputWriterFactory = {
-    if ("true" == sparkSession.sparkContext.getLocalProperty("isNativeApplicable")) {
-
-      // pass compression to job conf so that the file extension can be aware of it.
+    if (sparkSession.sparkContext.getLocalProperty("isNativeApplicable") == "true") {
+      // Pass compression to job conf so that the file extension can be aware of it.
       val conf = ContextUtil.getConfiguration(job)
       val parquetOptions = new ParquetOptions(options, sparkSession.sessionState.conf)
       conf.set(ParquetOutputFormat.COMPRESSION, parquetOptions.compressionCodecClassName)