@@ -57,9 +57,8 @@ object DataType extends RegexParsers {
57
57
58
58
protected lazy val structField : Parser [StructField ] =
59
59
(" StructField(" ~> " [a-zA-Z0-9_]*" .r) ~ (" ," ~> dataType) ~ (" ," ~> boolVal <~ " )" ) ^^ {
60
- case name ~ tpe ~ nullable =>
61
- // TODO: parse metadata
62
- StructField (name, tpe, nullable = nullable, Map .empty)
60
+ // metadata is not included in StructField.toString
61
+ case name ~ tpe ~ nullable => StructField (name, tpe, nullable = nullable, Map .empty)
63
62
}
64
63
65
64
protected lazy val boolVal : Parser [Boolean ] =
@@ -336,6 +335,11 @@ case class StructField(
336
335
builder.append(s " ${prefix}-- ${name}: ${dataType.simpleString} (nullable = ${nullable}) \n " )
337
336
DataType .buildFormattedString(dataType, s " $prefix | " , builder)
338
337
}
338
+
339
+ override def toString : String = {
340
+ // TODO: Remove this function after SPARK-3713.
341
+ s " StructField( $name, $dataType, $nullable) "
342
+ }
339
343
}
340
344
341
345
object StructType {
@@ -356,8 +360,7 @@ case class StructType(fields: Seq[StructField]) extends DataType {
356
360
* have a name matching the given name, `null` will be returned.
357
361
*/
358
362
def apply (name : String ): StructField = {
359
- nameToField.getOrElse(name,
360
- throw new IllegalArgumentException (s " Field $name does not exist. " ))
363
+ nameToField.getOrElse(name, throw new IllegalArgumentException (s " Field $name does not exist. " ))
361
364
}
362
365
363
366
/**
0 commit comments