removedTimeVars -> hardcodingTimeVars

wangyum · wangyum · commit 2d44ffddce92 · 2019-04-04T06:14:26.000+08:00
diff --git a/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveUtils.scala b/sql/hive/src/main/scala/org/apache/spark/sql/hive/HiveUtils.scala
@@ -237,15 +237,15 @@ private[spark] object HiveUtils extends Logging {
     }
 
     // The following configurations were removed by HIVE-12164(Hive 2.0)
-    val removedTimeVars = Seq(
+    val hardcodingTimeVars = Seq(
       ("hive.stats.jdbc.timeout", "30s") -> TimeUnit.SECONDS,
       ("hive.stats.retries.wait", "3000ms") -> TimeUnit.MILLISECONDS
     ).map { case ((key, defaultValue), unit) =>
       val value = hadoopConf.get(key, defaultValue)
       key -> HiveConf.toTime(value, unit, unit).toString
     }
 
-    (commonTimeVars ++ removedTimeVars).toMap
+    (commonTimeVars ++ hardcodingTimeVars).toMap
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -237,15 +237,15 @@ private[spark] object HiveUtils extends Logging {`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`// The following configurations were removed by HIVE-12164(Hive 2.0)`
`240`		`- val removedTimeVars = Seq(`
	`240`	`+ val hardcodingTimeVars = Seq(`
`241`	`241`	`("hive.stats.jdbc.timeout", "30s") -> TimeUnit.SECONDS,`
`242`	`242`	`("hive.stats.retries.wait", "3000ms") -> TimeUnit.MILLISECONDS`
`243`	`243`	`).map { case ((key, defaultValue), unit) =>`
`244`	`244`	`val value = hadoopConf.get(key, defaultValue)`
`245`	`245`	`key -> HiveConf.toTime(value, unit, unit).toString`
`246`	`246`	`}`
`247`	`247`
`248`		`- (commonTimeVars ++ removedTimeVars).toMap`
	`248`	`+ (commonTimeVars ++ hardcodingTimeVars).toMap`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`/**`