Remove metadata.

wangyum · wangyum · commit 1ee4ea0a23b2 · 2017-09-15T07:32:20.000+08:00
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/jdbc/JdbcUtils.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/jdbc/JdbcUtils.scala
@@ -301,12 +301,11 @@ object JdbcUtils extends Logging {
       } else {
         rsmd.isNullable(i + 1) != ResultSetMetaData.columnNoNulls
       }
-      val metadata = new MetadataBuilder()
-        .putLong("scale", fieldScale)
+      val metadata = new MetadataBuilder().putLong("scale", fieldScale)
       val columnType =
         dialect.getCatalystType(dataType, typeName, fieldSize, metadata).getOrElse(
           getCatalystType(dataType, fieldSize, fieldScale, isSigned))
-      fields(i) = StructField(columnName, columnType, nullable, metadata.build())
+      fields(i) = StructField(columnName, columnType, nullable)
       i = i + 1
     }
     new StructType(fields)
@@ -784,7 +783,7 @@ object JdbcUtils extends Logging {
       // This is resolved by names, use the custom filed dataType to replace the default dateType.
       val newSchema = tableSchema.map { col =>
         userSchema.find(f => nameEquality(f.name, col.name)) match {
-          case Some(c) => col.copy(dataType = c.dataType, metadata = Metadata.empty)
+          case Some(c) => col.copy(dataType = c.dataType)
           case None => col
         }
       }
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/jdbc/JdbcUtilsSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/jdbc/JdbcUtilsSuite.scala
@@ -34,34 +34,34 @@ class JdbcUtilsSuite extends SparkFunSuite {
     assert(JdbcUtils.getCustomSchema(tableSchema, "", caseInsensitive) === tableSchema)
 
     assert(JdbcUtils.getCustomSchema(tableSchema, "c1 DATE", caseInsensitive) ===
-      StructType(Seq(StructField("C1", DateType, true), StructField("C2", IntegerType, false))))
+      StructType(Seq(StructField("C1", DateType, false), StructField("C2", IntegerType, false))))
     assert(JdbcUtils.getCustomSchema(tableSchema, "c1 DATE", caseSensitive) ===
       StructType(Seq(StructField("C1", StringType, false), StructField("C2", IntegerType, false))))
 
     assert(
       JdbcUtils.getCustomSchema(tableSchema, "c1 DATE, C2 STRING", caseInsensitive) ===
-      StructType(Seq(StructField("C1", DateType, true), StructField("C2", StringType, true))))
+      StructType(Seq(StructField("C1", DateType, false), StructField("C2", StringType, false))))
     assert(JdbcUtils.getCustomSchema(tableSchema, "c1 DATE, C2 STRING", caseSensitive) ===
-      StructType(Seq(StructField("C1", StringType, false), StructField("C2", StringType, true))))
+      StructType(Seq(StructField("C1", StringType, false), StructField("C2", StringType, false))))
 
     // Throw AnalysisException
     val duplicate = intercept[AnalysisException]{
       JdbcUtils.getCustomSchema(tableSchema, "c1 DATE, c1 STRING", caseInsensitive) ===
-        StructType(Seq(StructField("c1", DateType, true), StructField("c1", StringType, true)))
+        StructType(Seq(StructField("c1", DateType, false), StructField("c1", StringType, false)))
     }
     assert(duplicate.getMessage.contains(
       "Found duplicate column(s) in the customSchema option value"))
 
     // Throw ParseException
     val dataTypeNotSupported = intercept[ParseException]{
       JdbcUtils.getCustomSchema(tableSchema, "c3 DATEE, C2 STRING", caseInsensitive) ===
-        StructType(Seq(StructField("c3", DateType, true), StructField("C2", StringType, true)))
+        StructType(Seq(StructField("c3", DateType, false), StructField("C2", StringType, false)))
     }
     assert(dataTypeNotSupported.getMessage.contains("DataType datee is not supported"))
 
     val mismatchedInput = intercept[ParseException]{
       JdbcUtils.getCustomSchema(tableSchema, "c3 DATE. C2 STRING", caseInsensitive) ===
-        StructType(Seq(StructField("c3", DateType, true), StructField("C2", StringType, true)))
+        StructType(Seq(StructField("c3", DateType, false), StructField("C2", StringType, false)))
     }
     assert(mismatchedInput.getMessage.contains("mismatched input '.' expecting"))
   }

Original file line number	Diff line number	Diff line change
`@@ -301,12 +301,11 @@ object JdbcUtils extends Logging {`
`301`	`301`	`} else {`
`302`	`302`	`rsmd.isNullable(i + 1) != ResultSetMetaData.columnNoNulls`
`303`	`303`	`}`
`304`		`- val metadata = new MetadataBuilder()`
`305`		`- .putLong("scale", fieldScale)`
	`304`	`+ val metadata = new MetadataBuilder().putLong("scale", fieldScale)`
`306`	`305`	`val columnType =`
`307`	`306`	`dialect.getCatalystType(dataType, typeName, fieldSize, metadata).getOrElse(`
`308`	`307`	`getCatalystType(dataType, fieldSize, fieldScale, isSigned))`
`309`		`- fields(i) = StructField(columnName, columnType, nullable, metadata.build())`
	`308`	`+ fields(i) = StructField(columnName, columnType, nullable)`
`310`	`309`	`i = i + 1`
`311`	`310`	`}`
`312`	`311`	`new StructType(fields)`
`@@ -784,7 +783,7 @@ object JdbcUtils extends Logging {`
`784`	`783`	`// This is resolved by names, use the custom filed dataType to replace the default dateType.`
`785`	`784`	`val newSchema = tableSchema.map { col =>`
`786`	`785`	`userSchema.find(f => nameEquality(f.name, col.name)) match {`
`787`		`- case Some(c) => col.copy(dataType = c.dataType, metadata = Metadata.empty)`
	`786`	`+ case Some(c) => col.copy(dataType = c.dataType)`
`788`	`787`	`case None => col`
`789`	`788`	`}`
`790`	`789`	`}`