revert_sql

Author: zhengruifeng

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/collectionOperations.scala

@@ -2971,7 +2971,7 @@ trait ArraySetLike {
   protected def genGetValue(array: String, i: String): String =
     CodeGenerator.getValue(array, et, i)
 
-  @transient private lazy val tuple = {
+  @transient protected lazy val (hsPostFix, hsTypeName) = {
     val ptName = CodeGenerator.primitiveTypeName(et)
     et match {
       // we cast byte/short to int when writing to the hash set.
@@ -2981,8 +2981,6 @@ trait ArraySetLike {
       case DoubleType => ("$mcD$sp", ptName)
     }
   }
-  @transient protected lazy val hsPostFix = tuple._1
-  @transient protected lazy val hsTypeName = tuple._2
 
   // we cast byte/short to int when writing to the hash set.
   @transient protected lazy val hsValueCast = et match {

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/higherOrderFunctions.scala

@@ -257,7 +257,7 @@ case class ArrayTransform(
     }
   }
 
-  @transient private lazy val tuple = {
+  @transient lazy val (elementVar, indexVar) = {
     val LambdaFunction(_, (elementVar: NamedLambdaVariable) +: tail, _) = function
     val indexVar = if (tail.nonEmpty) {
       Some(tail.head.asInstanceOf[NamedLambdaVariable])
@@ -266,8 +266,6 @@ case class ArrayTransform(
     }
     (elementVar, indexVar)
   }
-  @transient lazy val elementVar = tuple._1
-  @transient lazy val indexVar = tuple._2
 
   override def nullSafeEval(inputRow: InternalRow, argumentValue: Any): Any = {
     val arr = argumentValue.asInstanceOf[ArrayData]
@@ -411,12 +409,10 @@ case class MapFilter(
     function: Expression)
   extends MapBasedSimpleHigherOrderFunction with CodegenFallback {
 
-  @transient private lazy val tuple = {
+  @transient lazy val (keyVar, valueVar) = {
     val args = function.asInstanceOf[LambdaFunction].arguments
     (args.head.asInstanceOf[NamedLambdaVariable], args.tail.head.asInstanceOf[NamedLambdaVariable])
   }
-  @transient lazy val keyVar = tuple._1
-  @transient lazy val valueVar = tuple._2
 
   @transient lazy val MapType(keyType, valueType, valueContainsNull) = argument.dataType
 
@@ -482,13 +478,11 @@ case class ArrayFilter(
     }
   }
 
-  @transient private lazy val tuple = {
+  @transient lazy val (elementVar, indexVar) = {
     val LambdaFunction(_, (elementVar: NamedLambdaVariable) +: tail, _) = function
     val indexVar = tail.headOption.map(_.asInstanceOf[NamedLambdaVariable])
     (elementVar, indexVar)
   }
-  @transient lazy val elementVar = tuple._1
-  @transient lazy val indexVar = tuple._2
 
   override def nullSafeEval(inputRow: InternalRow, argumentValue: Any): Any = {
     val arr = argumentValue.asInstanceOf[ArrayData]