filter extract

apache · Nov 22, 2024 · c7ccdaa · c7ccdaa
1 parent 6c30b51
commit c7ccdaa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...alyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveReferencesInSort.scala b/...alyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveReferencesInSort.scala
@@ -21,7 +21,7 @@ import java.util.Locale
 import scala.collection.mutable
 
 import org.apache.spark.sql.catalyst.SQLConfHelper
-import org.apache.spark.sql.catalyst.expressions.{Alias, Expression, SortOrder}
+import org.apache.spark.sql.catalyst.expressions.{Alias, Expression, ExtractValue, SortOrder}
 import org.apache.spark.sql.catalyst.plans.logical._
 import org.apache.spark.sql.connector.catalog.CatalogManager
 
@@ -81,6 +81,7 @@ class ResolveReferencesInSort(val catalogManager: CatalogManager)
       case _ => Nil
     }
     lcaCandidates.foreach {
+      case Alias(_: ExtractValue, _) =>
       case a: Alias =>
         val lowerCasedName = a.name.toLowerCase(Locale.ROOT)
         aliasMap.get(lowerCasedName) match {

diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/package.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/package.scala
@@ -389,7 +389,7 @@ package object expressions  {
           val fieldExprs = nestedFields.foldLeft(a: Expression) { (e, name) =>
             ExtractValue(e, Literal(name), resolver)
           }
-          Some(Alias(fieldExprs, "_nested_field_" + nestedFields.last)())
+          Some(Alias(fieldExprs, nestedFields.last)())
 
         case Seq(a) =>
           // One match, no nested fields, use it.