Skip to content

[SPARK-2518][SQL] Fix foldability of Substring expression. #1432

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
ueshin wants to merge 1 commit into from
Closed

[SPARK-2518][SQL] Fix foldability of Substring expression. #1432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/stringOperations.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,8 @@ case class Substring(str: Expression, pos: Expression, len: Expression) extends

type EvaluatedType = Any

override def foldable = str.foldable && pos.foldable && len.foldable

def nullable: Boolean = str.nullable || pos.nullable || len.nullable
def dataType: DataType = {
if (!resolved) {
Expand Down
15 changes: 12 additions & 3 deletions ...atalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/ConstantFoldingSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,12 @@ class ConstantFoldingSuite extends PlanTest {
Like(Literal(null, StringType), "abc") as 'c13,
Like("abc", Literal(null, StringType)) as 'c14,

Upper(Literal(null, StringType)) as 'c15)
Upper(Literal(null, StringType)) as 'c15,

Substring(Literal(null, StringType), 0, 1) as 'c16,
Substring("abc", Literal(null, IntegerType), 1) as 'c17,
Substring("abc", 0, Literal(null, IntegerType)) as 'c18
)

val optimized = Optimize(originalQuery.analyze)

Expand All @@ -228,8 +233,12 @@ class ConstantFoldingSuite extends PlanTest {
Literal(null, BooleanType) as 'c13,
Literal(null, BooleanType) as 'c14,

Literal(null, StringType) as 'c15)
.analyze
Literal(null, StringType) as 'c15,

Literal(null, StringType) as 'c16,
Literal(null, StringType) as 'c17,
Literal(null, StringType) as 'c18
).analyze

comparePlans(optimized, correctAnswer)
}
Expand Down