address comments

Author: allisonwang-db

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/DecorrelateInnerQuery.scala

@@ -162,7 +162,7 @@ object DecorrelateInnerQuery extends PredicateHelper {
    */
   private def replaceOuterInNamedExpressions(
       expressions: Seq[NamedExpression],
-      outerReferenceMap: Map[Attribute, Attribute]): Seq[NamedExpression] = {
+      outerReferenceMap: AttributeMap[Attribute]): Seq[NamedExpression] = {
     expressions.map { expr =>
       val newExpr = replaceOuterReference(expr, outerReferenceMap)
       if (!newExpr.toAttribute.semanticEquals(expr.toAttribute)) {

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/subquery.scala

@@ -733,19 +733,19 @@ object OptimizeOneRowRelationSubquery extends Rule[LogicalPlan] {
    */
   private def rewrite(plan: LogicalPlan): LogicalPlan = plan.transformUpWithSubqueries {
     case LateralJoin(left, right @ LateralSubquery(OneRowSubquery(projectList), _, _, _), _, None)
-        if right.plan.subqueriesAll.isEmpty && right.joinCond.isEmpty =>
+        if right.plan.subqueries.isEmpty && right.joinCond.isEmpty =>
       Project(left.output ++ projectList, left)
     case p: LogicalPlan => p.transformExpressionsUpWithPruning(
       _.containsPattern(SCALAR_SUBQUERY)) {
       case s @ ScalarSubquery(OneRowSubquery(projectList), _, _, _)
-          if s.plan.subqueriesAll.isEmpty && s.joinCond.isEmpty =>
+          if s.plan.subqueries.isEmpty && s.joinCond.isEmpty =>
         assert(projectList.size == 1)
         projectList.head
     }
   }
 
   def apply(plan: LogicalPlan): LogicalPlan = {
-    if (!conf.optimizeOneRowRelationSubquery) {
+    if (!conf.getConf(SQLConf.OPTIMIZE_ONE_ROW_RELATION_SUBQUERY)) {
       plan
     } else {
       rewrite(plan)

sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala

@@ -4061,8 +4061,6 @@ class SQLConf extends Serializable with Logging {
 
   def decorrelateInnerQueryEnabled: Boolean = getConf(SQLConf.DECORRELATE_INNER_QUERY_ENABLED)
 
-  def optimizeOneRowRelationSubquery: Boolean = getConf(SQLConf.OPTIMIZE_ONE_ROW_RELATION_SUBQUERY)
-
   def maxConcurrentOutputFileWriters: Int = getConf(SQLConf.MAX_CONCURRENT_OUTPUT_FILE_WRITERS)
 
   def inferDictAsStruct: Boolean = getConf(SQLConf.INFER_NESTED_DICT_AS_STRUCT)