Skip to content

[SPARK-11738] [SQL] Making ArrayType orderable #9718

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

[SPARK-11738] [SQL] Making ArrayType orderable #9718

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d49b218
Make arrays orderable.
yhuai Nov 14, 2015
519b593
Allow array type in grouping expression.
yhuai Nov 14, 2015
f5f074d
Array column is allowed in grouping expressions.
yhuai Nov 14, 2015
f43a7f9
Add interpretedOrdering to ArrayType.
yhuai Nov 15, 2015
7228093
Fix ExpressionTypeCheckingSuite.scala
yhuai Nov 15, 2015
aadfeab
Address comments.
yhuai Nov 15, 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
Array column is allowed in grouping expressions.
  • Loading branch information
@yhuai
yhuai committed Nov 14, 2015
commit f5f074d0f3cd0b194e94502e3f89b597700d92d2
1 change: 1 addition & 0 deletions sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/ordering.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ object RowOrdering {
case dt: AtomicType => true
case struct: StructType => struct.fields.forall(f => isOrderable(f.dataType))
case array: ArrayType => isOrderable(array.elementType)
case udt: UserDefinedType[_] => isOrderable(udt.sqlType)
case _ => false
}

Expand Down
4 changes: 2 additions & 2 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/AnalysisErrorSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,8 @@ class AnalysisErrorSuite extends AnalysisTest {

errorTest(
"sorting by unsupported column types",
listRelation.orderBy('list.asc),
"sort" :: "type" :: "array<int>" :: Nil)
mapRelation.orderBy('map.asc),
"sort" :: "type" :: "map<int,int>" :: Nil)

errorTest(
"non-boolean filters",
Expand Down
3 changes: 3 additions & 0 deletions sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/TestRelations.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,7 @@ object TestRelations {

val listRelation = LocalRelation(
AttributeReference("list", ArrayType(IntegerType))())

val mapRelation = LocalRelation(
AttributeReference("map", MapType(IntegerType, IntegerType))())
}
52 changes: 52 additions & 0 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/execution/AggregationQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,22 @@ abstract class AggregationQuerySuite extends QueryTest with SQLTestUtils with Te
(3, null, null)).toDF("key", "value1", "value2")
data2.write.saveAsTable("agg2")

val data3 = Seq[(Seq[Integer], Integer, Integer)](
(Seq[Integer](1, 1), 10, -10),
(Seq[Integer](null), -60, 60),
(Seq[Integer](1, 1), 30, -30),
(Seq[Integer](1), 30, 30),
(Seq[Integer](2), 1, 1),
(null, -10, 10),
(Seq[Integer](2, 3), -1, null),
(Seq[Integer](2, 3), 1, 1),
(Seq[Integer](2, 3, 4), null, 1),
(Seq[Integer](null), 100, -10),
(Seq[Integer](3), null, 3),
(null, null, null),
(Seq[Integer](3), null, null)).toDF("key", "value1", "value2")
data3.write.saveAsTable("agg3")

val emptyDF = sqlContext.createDataFrame(
sparkContext.emptyRDD[Row],
StructType(StructField("key", StringType) :: StructField("value", IntegerType) :: Nil))
Expand All @@ -146,6 +162,7 @@ abstract class AggregationQuerySuite extends QueryTest with SQLTestUtils with Te
override def afterAll(): Unit = {
sqlContext.sql("DROP TABLE IF EXISTS agg1")
sqlContext.sql("DROP TABLE IF EXISTS agg2")
sqlContext.sql("DROP TABLE IF EXISTS agg3")
sqlContext.dropTempTable("emptyTable")
}

Expand Down Expand Up @@ -266,6 +283,41 @@ abstract class AggregationQuerySuite extends QueryTest with SQLTestUtils with Te
Row(100, null) ::
Row(null, 3) ::
Row(null, null) :: Nil)

checkAnswer(
sqlContext.sql(
"""
|SELECT DISTINCT key
|FROM agg3
""".stripMargin),
Row(Seq[Integer](1, 1)) ::
Row(Seq[Integer](null)) ::
Row(Seq[Integer](1)) ::
Row(Seq[Integer](2)) ::
Row(null) ::
Row(Seq[Integer](2, 3)) ::
Row(Seq[Integer](2, 3, 4)) ::
Row(Seq[Integer](3)) :: Nil)

checkAnswer(
sqlContext.sql(
"""
|SELECT value1, key
|FROM agg3
|GROUP BY value1, key
""".stripMargin),
Row(10, Seq[Integer](1, 1)) ::
Row(-60, Seq[Integer](null)) ::
Row(30, Seq[Integer](1, 1)) ::
Row(30, Seq[Integer](1)) ::
Row(1, Seq[Integer](2)) ::
Row(-10, null) ::
Row(-1, Seq[Integer](2, 3)) ::
Row(1, Seq[Integer](2, 3)) ::
Row(null, Seq[Integer](2, 3, 4)) ::
Row(100, Seq[Integer](null)) ::
Row(null, Seq[Integer](3)) ::
Row(null, null) :: Nil)
}

test("case in-sensitive resolution") {
Expand Down