address comment

ulysses-you · ulysses-you · commit b591ff7a0005 · 2020-11-21T09:31:39.000+08:00
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala
@@ -74,7 +74,7 @@ trait TimestampFormatterHelper extends TimeZoneAwareExpression {
 }
 
 @ExpressionDescription(
-  usage = "_FUNC_() - Returns the current timezone.",
+  usage = "_FUNC_() - Returns the current session local timezone.",
   examples = """
     Examples:
       > SELECT _FUNC_();
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DatasetSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/DatasetSuite.scala
@@ -1950,8 +1950,10 @@ class DatasetSuite extends QueryTest
 
   test("SPARK-33469: Add current_timezone function") {
     val df = Seq(1).toDF("c")
-    val timezone = df.selectExpr("current_timezone()").collect().head.getString(0)
-    assert(timezone == SQLConf.get.sessionLocalTimeZone)
+    withSQLConf(SQLConf.SESSION_LOCAL_TIMEZONE.key -> "Asia/Shanghai") {
+      val timezone = df.selectExpr("current_timezone()").collect().head.getString(0)
+      assert(timezone == "Asia/Shanghai")
+    }
   }
 }
 
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/expressions/ExpressionInfoSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/expressions/ExpressionInfoSuite.scala
@@ -149,8 +149,8 @@ class ExpressionInfoSuite extends SparkFunSuite with SharedSparkSession {
       "org.apache.spark.sql.catalyst.expressions.UnixTimestamp",
       "org.apache.spark.sql.catalyst.expressions.CurrentDate",
       "org.apache.spark.sql.catalyst.expressions.CurrentTimestamp",
-      "org.apache.spark.sql.catalyst.expressions.Now",
       "org.apache.spark.sql.catalyst.expressions.CurrentTimeZone",
+      "org.apache.spark.sql.catalyst.expressions.Now",
       // Random output without a seed
       "org.apache.spark.sql.catalyst.expressions.Rand",
       "org.apache.spark.sql.catalyst.expressions.Randn",

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ trait TimestampFormatterHelper extends TimeZoneAwareExpression {`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`@ExpressionDescription(`
`77`		`- usage = "_FUNC_() - Returns the current timezone.",`
	`77`	`+ usage = "_FUNC_() - Returns the current session local timezone.",`
`78`	`78`	`examples = """`
`79`	`79`	`Examples:`
`80`	`80`	`> SELECT _FUNC_();`
Original file line number	Diff line number	Diff line change
`@@ -1950,8 +1950,10 @@ class DatasetSuite extends QueryTest`
`1950`	`1950`
`1951`	`1951`	`test("SPARK-33469: Add current_timezone function") {`
`1952`	`1952`	`val df = Seq(1).toDF("c")`
`1953`		`- val timezone = df.selectExpr("current_timezone()").collect().head.getString(0)`
`1954`		`- assert(timezone == SQLConf.get.sessionLocalTimeZone)`
	`1953`	`+ withSQLConf(SQLConf.SESSION_LOCAL_TIMEZONE.key -> "Asia/Shanghai") {`
	`1954`	`+ val timezone = df.selectExpr("current_timezone()").collect().head.getString(0)`
	`1955`	`+ assert(timezone == "Asia/Shanghai")`
	`1956`	`+ }`
`1955`	`1957`	`}`
`1956`	`1958`	`}`
`1957`	`1959`