rebase with master

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

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/...alyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collectionOperations.scala b/...alyst/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
@@ -535,7 +535,6 @@ class DataFrameFunctionsSuite extends QueryTest with SharedSQLContext {
     }
   }
 
-<<<<<<< HEAD
   test("array position function") {
     val df = Seq(
       (Seq[Int](1, 2), "x"),