[SPARK-11044][SQL] Use function that sets if unset.

HyukjinKwon · HyukjinKwon · commit 2eee7e37b6f3 · 2015-10-11T13:20:52.000+09:00
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/CatalystWriteSupport.scala b/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/parquet/CatalystWriteSupport.scala
@@ -429,9 +429,8 @@ private[parquet] object CatalystWriteSupport {
   def setSchema(schema: StructType, configuration: Configuration): Unit = {
     schema.map(_.name).foreach(CatalystSchemaConverter.checkFieldName)
     configuration.set(SPARK_ROW_SCHEMA, schema.json)
-    configuration.set(
+    configuration.setIfUnset(
       ParquetOutputFormat.WRITER_VERSION,
-      configuration.get(ParquetOutputFormat.WRITER_VERSION,
-        ParquetProperties.WriterVersion.PARQUET_1_0.toString))
+      ParquetProperties.WriterVersion.PARQUET_1_0.toString)
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -429,9 +429,8 @@ private[parquet] object CatalystWriteSupport {`
`429`	`429`	`def setSchema(schema: StructType, configuration: Configuration): Unit = {`
`430`	`430`	`schema.map(_.name).foreach(CatalystSchemaConverter.checkFieldName)`
`431`	`431`	`configuration.set(SPARK_ROW_SCHEMA, schema.json)`
`432`		`- configuration.set(`
	`432`	`+ configuration.setIfUnset(`
`433`	`433`	`ParquetOutputFormat.WRITER_VERSION,`
`434`		`- configuration.get(ParquetOutputFormat.WRITER_VERSION,`
`435`		`- ParquetProperties.WriterVersion.PARQUET_1_0.toString))`
	`434`	`+ ParquetProperties.WriterVersion.PARQUET_1_0.toString)`
`436`	`435`	`}`
`437`	`436`	`}`