Skip to content

[SPARK-18952] Regex strings not properly escaped in codegen for aggregations #16361

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
wants to merge 4 commits into from
Closed

[SPARK-18952] Regex strings not properly escaped in codegen for aggregations #16361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
88e29bb
Save
brkyvz Dec 20, 2016
b858204
Fixed
brkyvz Dec 20, 2016
c2de5ee
use unnamed version
brkyvz Dec 20, 2016
df3a852
fix mc
brkyvz Jan 9, 2017
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
12 changes: 7 additions & 5 deletions ...re/src/main/scala/org/apache/spark/sql/execution/aggregate/RowBasedHashMapGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,28 +43,30 @@ class RowBasedHashMapGenerator(
extends HashMapGenerator (ctx, aggregateExpressions, generatedClassName,
groupingKeySchema, bufferSchema) {

protected def initializeAggregateHashMap(): String = {
override protected def initializeAggregateHashMap(): String = {
val generatedKeySchema: String =
s"new org.apache.spark.sql.types.StructType()" +
groupingKeySchema.map { key =>
val keyName = ctx.addReferenceMinorObj(key.name)
key.dataType match {
case d: DecimalType =>
s""".add("${key.name}", org.apache.spark.sql.types.DataTypes.createDecimalType(
s""".add("$keyName", org.apache.spark.sql.types.DataTypes.createDecimalType(
|${d.precision}, ${d.scale}))""".stripMargin
case _ =>
s""".add("${key.name}", org.apache.spark.sql.types.DataTypes.${key.dataType})"""
s""".add("$keyName", org.apache.spark.sql.types.DataTypes.${key.dataType})"""
}
}.mkString("\n").concat(";")

val generatedValueSchema: String =
s"new org.apache.spark.sql.types.StructType()" +
bufferSchema.map { key =>
val keyName = ctx.addReferenceMinorObj(key.name)
key.dataType match {
case d: DecimalType =>
s""".add("${key.name}", org.apache.spark.sql.types.DataTypes.createDecimalType(
s""".add("$keyName", org.apache.spark.sql.types.DataTypes.createDecimalType(
|${d.precision}, ${d.scale}))""".stripMargin
case _ =>
s""".add("${key.name}", org.apache.spark.sql.types.DataTypes.${key.dataType})"""
s""".add("$keyName", org.apache.spark.sql.types.DataTypes.${key.dataType})"""
}
}.mkString("\n").concat(";")

Expand Down
12 changes: 7 additions & 5 deletions .../src/main/scala/org/apache/spark/sql/execution/aggregate/VectorizedHashMapGenerator.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,28 +48,30 @@ class VectorizedHashMapGenerator(
extends HashMapGenerator (ctx, aggregateExpressions, generatedClassName,
groupingKeySchema, bufferSchema) {

protected def initializeAggregateHashMap(): String = {
override protected def initializeAggregateHashMap(): String = {
val generatedSchema: String =
s"new org.apache.spark.sql.types.StructType()" +
(groupingKeySchema ++ bufferSchema).map { key =>
val keyName = ctx.addReferenceMinorObj(key.name)
key.dataType match {
case d: DecimalType =>
s""".add("${key.name}", org.apache.spark.sql.types.DataTypes.createDecimalType(
s""".add("$keyName", org.apache.spark.sql.types.DataTypes.createDecimalType(
|${d.precision}, ${d.scale}))""".stripMargin
case _ =>
s""".add("${key.name}", org.apache.spark.sql.types.DataTypes.${key.dataType})"""
s""".add("$keyName", org.apache.spark.sql.types.DataTypes.${key.dataType})"""
}
}.mkString("\n").concat(";")

val generatedAggBufferSchema: String =
s"new org.apache.spark.sql.types.StructType()" +
bufferSchema.map { key =>
val keyName = ctx.addReferenceMinorObj(key.name)
key.dataType match {
case d: DecimalType =>
s""".add("${key.name}", org.apache.spark.sql.types.DataTypes.createDecimalType(
s""".add("$keyName", org.apache.spark.sql.types.DataTypes.createDecimalType(
|${d.precision}, ${d.scale}))""".stripMargin
case _ =>
s""".add("${key.name}", org.apache.spark.sql.types.DataTypes.${key.dataType})"""
s""".add("$keyName", org.apache.spark.sql.types.DataTypes.${key.dataType})"""
}
}.mkString("\n").concat(";")

Expand Down
9 changes: 9 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/DataFrameAggregateSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,15 @@ class DataFrameAggregateSuite extends QueryTest with SharedSQLContext {
)
}

test("SPARK-18952: regexes fail codegen when used as keys due to bad forward-slash escapes") {
val df = Seq(("some[thing]", "random-string")).toDF("key", "val")

checkAnswer(
df.groupBy(regexp_extract('key, "([a-z]+)\\[", 1)).count(),
Row("some", 1) :: Nil
)
}

test("rollup") {
checkAnswer(
courseSales.rollup("course", "year").sum("earnings"),
Expand Down