SQLContext.getConf(key, null) should return null

vinodkc · vinodkc · commit b4055e11b25c · 2017-08-05T16:17:31.000+05:30
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
@@ -1228,10 +1228,12 @@ class SQLConf extends Serializable with Logging {
    * not set yet, return `defaultValue`.
    */
   def getConfString(key: String, defaultValue: String): String = {
-    val entry = sqlConfEntries.get(key)
-    if (entry != null && defaultValue != "<undefined>") {
-      // Only verify configs in the SQLConf object
-      entry.valueConverter(defaultValue)
+    if (defaultValue != null && defaultValue != "<undefined>") {
+      val entry = sqlConfEntries.get(key)
+      if (entry != null) {
+        // Only verify configs in the SQLConf object
+        entry.valueConverter(defaultValue)
+      }
     }
     Option(settings.get(key)).getOrElse(defaultValue)
   }
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/internal/SQLConfSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/internal/SQLConfSuite.scala
@@ -270,4 +270,10 @@ class SQLConfSuite extends QueryTest with SharedSQLContext {
     val e2 = intercept[AnalysisException](spark.conf.unset(SCHEMA_STRING_LENGTH_THRESHOLD.key))
     assert(e2.message.contains("Cannot modify the value of a static config"))
   }
+
+  test("SPARK-21588 SQLContext.getConf(key, null) should return null") {
+    assert(null == spark.conf.get("spark.sql.thriftServer.incrementalCollect", null))
+    assert("<undefined>" == spark.conf.get(
+      "spark.sql.thriftServer.incrementalCollect", "<undefined>"))
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -270,4 +270,10 @@ class SQLConfSuite extends QueryTest with SharedSQLContext {`
`270`	`270`	`val e2 = intercept[AnalysisException](spark.conf.unset(SCHEMA_STRING_LENGTH_THRESHOLD.key))`
`271`	`271`	`assert(e2.message.contains("Cannot modify the value of a static config"))`
`272`	`272`	`}`
	`273`	`+`
	`274`	`+ test("SPARK-21588 SQLContext.getConf(key, null) should return null") {`
	`275`	`+ assert(null == spark.conf.get("spark.sql.thriftServer.incrementalCollect", null))`
	`276`	`+ assert("<undefined>" == spark.conf.get(`
	`277`	`+ "spark.sql.thriftServer.incrementalCollect", "<undefined>"))`
	`278`	`+ }`
`273`	`279`	`}`