Session options shouldn't override extra options

MaxGekk · MaxGekk · commit 13729b5746b8 · 2018-09-13T17:19:12.000+02:00
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/DataFrameReader.scala b/sql/core/src/main/scala/org/apache/spark/sql/DataFrameReader.scala
@@ -202,7 +202,7 @@ class DataFrameReader private[sql](sparkSession: SparkSession) extends Logging {
           DataSourceOptions.PATHS_KEY -> objectMapper.writeValueAsString(paths.toArray)
         }
         Dataset.ofRows(sparkSession, DataSourceV2Relation.create(
-          ds, extraOptions.toMap ++ sessionOptions + pathsOption,
+          ds, sessionOptions ++ extraOptions.toMap + pathsOption,
           userSpecifiedSchema = userSpecifiedSchema))
       } else {
         loadV1Source(paths: _*)

Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ class DataFrameReader private[sql](sparkSession: SparkSession) extends Logging {`
`202`	`202`	`DataSourceOptions.PATHS_KEY -> objectMapper.writeValueAsString(paths.toArray)`
`203`	`203`	`}`
`204`	`204`	`Dataset.ofRows(sparkSession, DataSourceV2Relation.create(`
`205`		`- ds, extraOptions.toMap ++ sessionOptions + pathsOption,`
	`205`	`+ ds, sessionOptions ++ extraOptions.toMap + pathsOption,`
`206`	`206`	`userSpecifiedSchema = userSpecifiedSchema))`
`207`	`207`	`} else {`
`208`	`208`	`loadV1Source(paths: _*)`