Skip to content

[SPARK-8104][SQL] auto alias expressions in analyzer #6647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cloud-fan wants to merge 8 commits into from
Closed

[SPARK-8104][SQL] auto alias expressions in analyzer #6647

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
33640ec
auto alias expressions in analyzer
cloud-fan Jun 4, 2015
39c1aef
small fix
cloud-fan Jun 5, 2015
9f07359
address comments
cloud-fan Jun 5, 2015
d18f401
refine
cloud-fan Jun 6, 2015
4cfd23c
fix order by
cloud-fan Jun 18, 2015
73a90cb
fix case-preserve of ExtractValue
cloud-fan Jun 21, 2015
5b5786d
fix agg
cloud-fan Jun 21, 2015
552eba4
fix python
cloud-fan Jun 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix case-preserve of ExtractValue
  • Loading branch information
@cloud-fan
cloud-fan committed Jun 21, 2015
commit 73a90cb72cb036e5f44e0a64aa741da1f5778bc2
16 changes: 9 additions & 7 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/ExtractValue.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package org.apache.spark.sql.catalyst.expressions

import scala.collection.Map

import org.apache.spark.sql.{catalyst, AnalysisException}
import org.apache.spark.sql.AnalysisException
import org.apache.spark.sql.catalyst.analysis._
import org.apache.spark.sql.types._

Expand All @@ -41,12 +41,14 @@ object ExtractValue {
resolver: Resolver): ExtractValue = {

(child.dataType, extraction) match {
case (StructType(fields), Literal(fieldName, StringType)) =>
val ordinal = findField(fields, fieldName.toString, resolver)
GetStructField(child, fields(ordinal), ordinal)
case (ArrayType(StructType(fields), containsNull), Literal(fieldName, StringType)) =>
val ordinal = findField(fields, fieldName.toString, resolver)
GetArrayStructFields(child, fields(ordinal), ordinal, containsNull)
case (StructType(fields), NonNullLiteral(v, StringType)) =>
val fieldName = v.toString
val ordinal = findField(fields, fieldName, resolver)
GetStructField(child, fields(ordinal).copy(name = fieldName), ordinal)
case (ArrayType(StructType(fields), containsNull), NonNullLiteral(v, StringType)) =>
val fieldName = v.toString
val ordinal = findField(fields, fieldName, resolver)
GetArrayStructFields(child, fields(ordinal).copy(name = fieldName), ordinal, containsNull)
case (_: ArrayType, _) if extraction.dataType.isInstanceOf[IntegralType] =>
GetArrayItem(child, extraction)
case (_: MapType, _) =>
Expand Down