fix mistakes during rebase

apache · Apr 19, 2018 · 06fb27e · 06fb27e
1 parent 2fbb1e8
commit 06fb27e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/python/pyspark/sql/functions.py b/python/pyspark/sql/functions.py
@@ -1845,7 +1845,6 @@ def array_contains(col, value):
     return Column(sc._jvm.functions.array_contains(_to_java_column(col), value))
 
 
-@ignore_unicode_prefix
 @since(2.4)
 def array_position(col, value):
     """
@@ -1866,7 +1865,7 @@ def array_position(col, value):
 @since(2.4)
 def element_at(col, extraction):
     """
-    Collection function: returns element of array at given index in extraction if col is array.
+    Collection function: Returns element of array at given index in extraction if col is array.
     returns value for the given key in extraction if col is map.
 
     :param col: name of column containing array or map

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameFunctionsSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameFunctionsSuite.scala
@@ -566,6 +566,7 @@ class DataFrameFunctionsSuite extends QueryTest with SharedSQLContext {
     checkAnswer(
       df.selectExpr("array_position(array(1, null), array(1, null)[0])"),
       Seq(Row(1L), Row(1L))
+    )
   }
 
   test("element_at function") {