Update code

beliefer · beliefer · commit ebc738b64b75 · 2021-02-10T11:31:24.000+08:00
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/BoundAttribute.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/BoundAttribute.scala
@@ -21,7 +21,6 @@ import org.apache.spark.internal.Logging
 import org.apache.spark.sql.catalyst.InternalRow
 import org.apache.spark.sql.catalyst.expressions.codegen.{CodegenContext, CodeGenerator, ExprCode, FalseLiteral, JavaCode}
 import org.apache.spark.sql.catalyst.expressions.codegen.Block._
-import org.apache.spark.sql.errors.QueryExecutionErrors
 import org.apache.spark.sql.types._
 
 /**
@@ -77,7 +76,8 @@ object BindReferences extends Logging {
         if (allowFailures) {
           a
         } else {
-          throw QueryExecutionErrors.cannotFindExpressionInInputAttributesError(a, input)
+          throw new IllegalStateException(
+            s"Couldn't find $a in ${input.attrs.mkString("[", ",", "]")}")
         }
       } else {
         BoundReference(ordinal, a.dataType, input(ordinal).nullable)
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryExecutionErrors.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryExecutionErrors.scala
@@ -28,7 +28,7 @@ import org.codehaus.janino.InternalCompilerException
 import org.apache.spark.SparkException
 import org.apache.spark.sql.catalyst.analysis.UnresolvedGenerator
 import org.apache.spark.sql.catalyst.catalog.CatalogDatabase
-import org.apache.spark.sql.catalyst.expressions.{AttributeReference, AttributeSeq, Expression, UnevaluableAggregate}
+import org.apache.spark.sql.catalyst.expressions.{Expression, UnevaluableAggregate}
 import org.apache.spark.sql.types.{DataType, Decimal}
 import org.apache.spark.unsafe.array.ByteArrayMethods
 import org.apache.spark.unsafe.types.UTF8String
@@ -322,9 +322,4 @@ object QueryExecutionErrors {
   def compilerError(e: CompileException): Throwable = {
     new CompileException(failedToCompileMsg(e), e.getLocation)
   }
-
-  def cannotFindExpressionInInputAttributesError(
-      a: AttributeReference, input: AttributeSeq): Throwable = {
-    new IllegalStateException(s"Couldn't find $a in ${input.attrs.mkString("[", ",", "]")}")
-  }
 }
