From 2fbb1e8fbc17e95560a18170fbd3ad0e1f4d78ff Mon Sep 17 00:00:00 2001 From: Kazuaki Ishizaki Date: Thu, 19 Apr 2018 04:48:18 +0100 Subject: [PATCH] rebase with master --- .../spark/sql/catalyst/expressions/collectionOperations.scala | 2 +- .../scala/org/apache/spark/sql/DataFrameFunctionsSuite.scala | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collectionOperations.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collectionOperations.scala index 3cac0f3cfe25b..dba426e999dda 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collectionOperations.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collectionOperations.scala @@ -506,6 +506,7 @@ case class ArrayMax(child: Expression) extends UnaryExpression with ImplicitCast override def prettyName: String = "array_max" } + /** * Returns the position of the first occurrence of element in the given array as long. * Returns 0 if the given value could not be found in the array. Returns null if either of @@ -528,7 +529,6 @@ case class ArrayPosition(left: Expression, right: Expression) extends BinaryExpression with ImplicitCastInputTypes { override def dataType: DataType = LongType - override def inputTypes: Seq[AbstractDataType] = Seq(ArrayType, left.dataType.asInstanceOf[ArrayType].elementType) 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 fa5173fd64f24..e0203407c5beb 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 @@ -535,7 +535,6 @@ class DataFrameFunctionsSuite extends QueryTest with SharedSQLContext { } } -<<<<<<< HEAD test("array position function") { val df = Seq( (Seq[Int](1, 2), "x"),