diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/SortOrder.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/SortOrder.scala
index d015125baccafcc526525193c3180375f9655205..3bebd552ef51a5cd3ddebe6242c352afd1405b6e 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/SortOrder.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/SortOrder.scala
@@ -54,10 +54,7 @@ case object NullsLast extends NullOrdering{
* An expression that can be used to sort a tuple. This class extends expression primarily so that
* transformations over expression will descend into its child.
*/
-case class SortOrder(
- child: Expression,
- direction: SortDirection,
- nullOrdering: NullOrdering)
+case class SortOrder(child: Expression, direction: SortDirection, nullOrdering: NullOrdering)
extends UnaryExpression with Unevaluable {
/** Sort order is not foldable because we don't have an eval for it. */
@@ -94,17 +91,9 @@ case class SortPrefix(child: SortOrder) extends UnaryExpression {
val nullValue = child.child.dataType match {
case BooleanType | DateType | TimestampType | _: IntegralType =>
- if (nullAsSmallest) {
- Long.MinValue
- } else {
- Long.MaxValue
- }
+ if (nullAsSmallest) Long.MinValue else Long.MaxValue
case dt: DecimalType if dt.precision - dt.scale <= Decimal.MAX_LONG_DIGITS =>
- if (nullAsSmallest) {
- Long.MinValue
- } else {
- Long.MaxValue
- }
+ if (nullAsSmallest) Long.MinValue else Long.MaxValue
case _: DecimalType =>
if (nullAsSmallest) {
DoublePrefixComparator.computePrefix(Double.NegativeInfinity)
@@ -112,16 +101,13 @@ case class SortPrefix(child: SortOrder) extends UnaryExpression {
DoublePrefixComparator.computePrefix(Double.NaN)
}
case _ =>
- if (nullAsSmallest) {
- 0L
- } else {
- -1L
- }
+ if (nullAsSmallest) 0L else -1L
}
- private def nullAsSmallest: Boolean = (child.isAscending && child.nullOrdering == NullsFirst) ||
+ private def nullAsSmallest: Boolean = {
+ (child.isAscending && child.nullOrdering == NullsFirst) ||
(!child.isAscending && child.nullOrdering == NullsLast)
-
+ }
override def eval(input: InternalRow): Any = throw new UnsupportedOperationException
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala
index e7df95e1142ca97d27e224541ab7fb72478a355d..f1c30ef6c7fb817c5665c93b97350e342fe406cc 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/GenerateOrdering.scala
@@ -100,16 +100,16 @@ object GenerateOrdering extends CodeGenerator[Seq[SortOrder], Ordering[InternalR
// Nothing
} else if ($isNullA) {
return ${
- order.nullOrdering match {
- case NullsFirst => "-1"
- case NullsLast => "1"
- }};
+ order.nullOrdering match {
+ case NullsFirst => "-1"
+ case NullsLast => "1"
+ }};
} else if ($isNullB) {
return ${
- order.nullOrdering match {
- case NullsFirst => "1"
- case NullsLast => "-1"
- }};
+ order.nullOrdering match {
+ case NullsFirst => "1"
+ case NullsLast => "-1"
+ }};
} else {
int comp = ${ctx.genComp(order.child.dataType, primitiveA, primitiveB)};
if (comp != 0) {
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/Column.scala b/sql/core/src/main/scala/org/apache/spark/sql/Column.scala
index 844ca7a8e99caa20d8d35fb3846476ac295a53e0..63da501f18cca35e7fdc325fec04106473d49381 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/Column.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/Column.scala
@@ -1007,7 +1007,7 @@ class Column(protected[sql] val expr: Expression) extends Logging {
/**
* Returns an ordering used in sorting.
* {{{
- * // Scala: sort a DataFrame by age column in descending order.
+ * // Scala
* df.sort(df("age").desc)
*
* // Java
@@ -1020,7 +1020,37 @@ class Column(protected[sql] val expr: Expression) extends Logging {
def desc: Column = withExpr { SortOrder(expr, Descending) }
/**
- * Returns an ordering used in sorting.
+ * Returns a descending ordering used in sorting, where null values appear before non-null values.
+ * {{{
+ * // Scala: sort a DataFrame by age column in descending order and null values appearing first.
+ * df.sort(df("age").desc_nulls_first)
+ *
+ * // Java
+ * df.sort(df.col("age").desc_nulls_first());
+ * }}}
+ *
+ * @group expr_ops
+ * @since 2.1.0
+ */
+ def desc_nulls_first: Column = withExpr { SortOrder(expr, Descending, NullsFirst) }
+
+ /**
+ * Returns a descending ordering used in sorting, where null values appear after non-null values.
+ * {{{
+ * // Scala: sort a DataFrame by age column in descending order and null values appearing last.
+ * df.sort(df("age").desc_nulls_last)
+ *
+ * // Java
+ * df.sort(df.col("age").desc_nulls_last());
+ * }}}
+ *
+ * @group expr_ops
+ * @since 2.1.0
+ */
+ def desc_nulls_last: Column = withExpr { SortOrder(expr, Descending, NullsLast) }
+
+ /**
+ * Returns an ascending ordering used in sorting.
* {{{
* // Scala: sort a DataFrame by age column in ascending order.
* df.sort(df("age").asc)
@@ -1034,6 +1064,36 @@ class Column(protected[sql] val expr: Expression) extends Logging {
*/
def asc: Column = withExpr { SortOrder(expr, Ascending) }
+ /**
+ * Returns an ascending ordering used in sorting, where null values appear before non-null values.
+ * {{{
+ * // Scala: sort a DataFrame by age column in ascending order and null values appearing first.
+ * df.sort(df("age").asc_nulls_last)
+ *
+ * // Java
+ * df.sort(df.col("age").asc_nulls_last());
+ * }}}
+ *
+ * @group expr_ops
+ * @since 2.1.0
+ */
+ def asc_nulls_first: Column = withExpr { SortOrder(expr, Ascending, NullsFirst) }
+
+ /**
+ * Returns an ordering used in sorting, where null values appear after non-null values.
+ * {{{
+ * // Scala: sort a DataFrame by age column in ascending order and null values appearing last.
+ * df.sort(df("age").asc_nulls_last)
+ *
+ * // Java
+ * df.sort(df.col("age").asc_nulls_last());
+ * }}}
+ *
+ * @group expr_ops
+ * @since 2.1.0
+ */
+ def asc_nulls_last: Column = withExpr { SortOrder(expr, Ascending, NullsLast) }
+
/**
* Prints the expression to the console for debugging purpose.
*
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/functions.scala b/sql/core/src/main/scala/org/apache/spark/sql/functions.scala
index 960c87f60e624bf600160e3c2414bda45fa3fb87..47bf41a2da813377ecfebf2ca622f59625922068 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/functions.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/functions.scala
@@ -109,7 +109,6 @@ object functions {
/**
* Returns a sort expression based on ascending order of the column.
* {{{
- * // Sort by dept in ascending order, and then age in descending order.
* df.sort(asc("dept"), desc("age"))
* }}}
*
@@ -118,10 +117,33 @@ object functions {
*/
def asc(columnName: String): Column = Column(columnName).asc
+ /**
+ * Returns a sort expression based on ascending order of the column,
+ * and null values return before non-null values.
+ * {{{
+ * df.sort(asc_nulls_last("dept"), desc("age"))
+ * }}}
+ *
+ * @group sort_funcs
+ * @since 2.1.0
+ */
+ def asc_nulls_first(columnName: String): Column = Column(columnName).asc_nulls_first
+
+ /**
+ * Returns a sort expression based on ascending order of the column,
+ * and null values appear after non-null values.
+ * {{{
+ * df.sort(asc_nulls_last("dept"), desc("age"))
+ * }}}
+ *
+ * @group sort_funcs
+ * @since 2.1.0
+ */
+ def asc_nulls_last(columnName: String): Column = Column(columnName).asc_nulls_last
+
/**
* Returns a sort expression based on the descending order of the column.
* {{{
- * // Sort by dept in ascending order, and then age in descending order.
* df.sort(asc("dept"), desc("age"))
* }}}
*
@@ -130,6 +152,31 @@ object functions {
*/
def desc(columnName: String): Column = Column(columnName).desc
+ /**
+ * Returns a sort expression based on the descending order of the column,
+ * and null values appear before non-null values.
+ * {{{
+ * df.sort(asc("dept"), desc_nulls_first("age"))
+ * }}}
+ *
+ * @group sort_funcs
+ * @since 2.1.0
+ */
+ def desc_nulls_first(columnName: String): Column = Column(columnName).desc_nulls_first
+
+ /**
+ * Returns a sort expression based on the descending order of the column,
+ * and null values appear after non-null values.
+ * {{{
+ * df.sort(asc("dept"), desc_nulls_last("age"))
+ * }}}
+ *
+ * @group sort_funcs
+ * @since 2.1.0
+ */
+ def desc_nulls_last(columnName: String): Column = Column(columnName).desc_nulls_last
+
+
//////////////////////////////////////////////////////////////////////////////////////////////
// Aggregate functions
//////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/sql/core/src/test/resources/sql-tests/inputs/orderby-nulls-ordering.sql b/sql/core/src/test/resources/sql-tests/inputs/order-by-nulls-ordering.sql
similarity index 100%
rename from sql/core/src/test/resources/sql-tests/inputs/orderby-nulls-ordering.sql
rename to sql/core/src/test/resources/sql-tests/inputs/order-by-nulls-ordering.sql
diff --git a/sql/core/src/test/resources/sql-tests/results/orderby-nulls-ordering.sql.out b/sql/core/src/test/resources/sql-tests/results/order-by-nulls-ordering.sql.out
similarity index 100%
rename from sql/core/src/test/resources/sql-tests/results/orderby-nulls-ordering.sql.out
rename to sql/core/src/test/resources/sql-tests/results/order-by-nulls-ordering.sql.out
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
index 2c60a7dd9209b9a9b4ff58825e6d62ad7a260b3b..16cc36820848509f47240c4b90d31c686e5e8bc0 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/DataFrameSuite.scala
@@ -326,6 +326,24 @@ class DataFrameSuite extends QueryTest with SharedSQLContext {
Row(6))
}
+ test("sorting with null ordering") {
+ val data = Seq[java.lang.Integer](2, 1, null).toDF("key")
+
+ checkAnswer(data.orderBy('key.asc), Row(null) :: Row(1) :: Row(2) :: Nil)
+ checkAnswer(data.orderBy(asc("key")), Row(null) :: Row(1) :: Row(2) :: Nil)
+ checkAnswer(data.orderBy('key.asc_nulls_first), Row(null) :: Row(1) :: Row(2) :: Nil)
+ checkAnswer(data.orderBy(asc_nulls_first("key")), Row(null) :: Row(1) :: Row(2) :: Nil)
+ checkAnswer(data.orderBy('key.asc_nulls_last), Row(1) :: Row(2) :: Row(null) :: Nil)
+ checkAnswer(data.orderBy(asc_nulls_last("key")), Row(1) :: Row(2) :: Row(null) :: Nil)
+
+ checkAnswer(data.orderBy('key.desc), Row(2) :: Row(1) :: Row(null) :: Nil)
+ checkAnswer(data.orderBy(desc("key")), Row(2) :: Row(1) :: Row(null) :: Nil)
+ checkAnswer(data.orderBy('key.desc_nulls_first), Row(null) :: Row(2) :: Row(1) :: Nil)
+ checkAnswer(data.orderBy(desc_nulls_first("key")), Row(null) :: Row(2) :: Row(1) :: Nil)
+ checkAnswer(data.orderBy('key.desc_nulls_last), Row(2) :: Row(1) :: Row(null) :: Nil)
+ checkAnswer(data.orderBy(desc_nulls_last("key")), Row(2) :: Row(1) :: Row(null) :: Nil)
+ }
+
test("global sorting") {
checkAnswer(
testData2.orderBy('a.asc, 'b.asc),