minor comments

Author: cloud-fan

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/FailureSafeParser.scala

@@ -42,8 +42,8 @@ class FailureSafeParser[IN](
       (row, badRecord) => {
         var i = 0
         while (i < actualSchema.length) {
-          val f = actualSchema(i)
-          resultRow(schema.fieldIndex(f.name)) = row.map(_.get(i, f.dataType)).orNull
+          val from = actualSchema(i)
+          resultRow(schema.fieldIndex(from.name)) = row.map(_.get(i, from.dataType)).orNull
           i += 1
         }
         resultRow(corruptFieldIndex.get) = badRecord()

sql/core/src/main/scala/org/apache/spark/sql/DataFrameReader.scala

@@ -383,11 +383,12 @@ class DataFrameReader private[sql](sparkSession: SparkSession) extends Logging {
     }
 
     verifyColumnNameOfCorruptRecord(schema, parsedOptions.columnNameOfCorruptRecord)
-    val dataSchema = StructType(schema.filterNot(_.name == parsedOptions.columnNameOfCorruptRecord))
+    val actualSchema =
+      StructType(schema.filterNot(_.name == parsedOptions.columnNameOfCorruptRecord))
 
     val createParser = CreateJacksonParser.string _
     val parsed = jsonDataset.rdd.mapPartitions { iter =>
-      val rawParser = new JacksonParser(dataSchema, parsedOptions)
+      val rawParser = new JacksonParser(actualSchema, parsedOptions)
       val parser = new FailureSafeParser[String](
         input => rawParser.parse(input, createParser, UTF8String.fromString),
         parsedOptions.parseMode,
@@ -442,14 +443,15 @@ class DataFrameReader private[sql](sparkSession: SparkSession) extends Logging {
     }
 
     verifyColumnNameOfCorruptRecord(schema, parsedOptions.columnNameOfCorruptRecord)
-    val dataSchema = StructType(schema.filterNot(_.name == parsedOptions.columnNameOfCorruptRecord))
+    val actualSchema =
+      StructType(schema.filterNot(_.name == parsedOptions.columnNameOfCorruptRecord))
 
     val linesWithoutHeader: RDD[String] = maybeFirstLine.map { firstLine =>
       filteredLines.rdd.mapPartitions(CSVUtils.filterHeaderLine(_, firstLine, parsedOptions))
     }.getOrElse(filteredLines.rdd)
 
     val parsed = linesWithoutHeader.mapPartitions { iter =>
-      val rawParser = new UnivocityParser(dataSchema, parsedOptions)
+      val rawParser = new UnivocityParser(actualSchema, parsedOptions)
       val parser = new FailureSafeParser[String](
         input => Seq(rawParser.parse(input)),
         parsedOptions.parseMode,

sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/csv/UnivocityParser.scala

@@ -51,7 +51,7 @@ class UnivocityParser(
   private val row = new GenericInternalRow(requiredSchema.length)
 
   // Retrieve the raw record string.
-  private def getCurrentInput(): UTF8String = {
+  private def getCurrentInput: UTF8String = {
     UTF8String.fromString(tokenizer.getContext.currentParsedContent().stripLineEnd)
   }
 
@@ -207,7 +207,7 @@ class UnivocityParser(
         }
       }
       throw BadRecordException(
-        () => getCurrentInput(),
+        () => getCurrentInput,
         getPartialResult,
         new RuntimeException("Malformed CSV record"))
     } else {
@@ -221,7 +221,7 @@ class UnivocityParser(
         row
       } catch {
         case NonFatal(e) =>
-          throw BadRecordException(() => getCurrentInput(), () => None, e)
+          throw BadRecordException(() => getCurrentInput, () => None, e)
       }
     }
   }