address comment

apache · Nov 21, 2020 · b591ff7 · b591ff7
1 parent 73f71c5
commit b591ff7
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/...talyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala b/...talyst/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",