From 06fb27e68ddda7075c0edef14df50cf56a370b4e Mon Sep 17 00:00:00 2001 From: Kazuaki Ishizaki Date: Thu, 19 Apr 2018 06:16:18 +0100 Subject: [PATCH] fix mistakes during rebase --- python/pyspark/sql/functions.py | 3 +-- .../scala/org/apache/spark/sql/DataFrameFunctionsSuite.scala | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/pyspark/sql/functions.py b/python/pyspark/sql/functions.py index e0c103c34b9e4..cf7e4511b01ef 100644 --- 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 index e0203407c5beb..7c976c1b7f915 100644 --- 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") {