From d51ec173e2b17f4e7fbe0aa60f62ab28b34a970e Mon Sep 17 00:00:00 2001 From: Reynold Xin Date: Fri, 18 Nov 2016 22:36:16 -0800 Subject: [PATCH 1/3] [SQL] Fix documentation error for DateDiff --- .../sql/catalyst/expressions/datetimeExpressions.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala index 9cec6be841de0..545a8e35026c7 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala @@ -1100,13 +1100,15 @@ case class TruncDate(date: Expression, format: Expression) /** * Returns the number of days from startDate to endDate. */ +// scalastyle:off line.size.limit @ExpressionDescription( - usage = "_FUNC_(date1, date2) - Returns the number of days between `date1` and `date2`.", + usage = "_FUNC_(endDate, startDate) - Returns the number of days between `endDate` and `startDate`.", extended = """ Examples: - > SELECT _FUNC_('2009-07-30', '2009-07-31'); + > SELECT _FUNC_('2009-07-31', '2009-07-30'); 1 """) +// scalastyle:on line.size.limit case class DateDiff(endDate: Expression, startDate: Expression) extends BinaryExpression with ImplicitCastInputTypes { From 741d21784cca717e342a0b7e3f8c9379ebfd152f Mon Sep 17 00:00:00 2001 From: Reynold Xin Date: Fri, 18 Nov 2016 22:37:26 -0800 Subject: [PATCH 2/3] One more example --- .../spark/sql/catalyst/expressions/datetimeExpressions.scala | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala index 545a8e35026c7..385f3fecdf3be 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala @@ -1107,6 +1107,9 @@ case class TruncDate(date: Expression, format: Expression) Examples: > SELECT _FUNC_('2009-07-31', '2009-07-30'); 1 + + > SELECT _FUNC_('2009-07-30', '2009-07-31'); + -1 """) // scalastyle:on line.size.limit case class DateDiff(endDate: Expression, startDate: Expression) From cf938d3be2906753870e5a9979af076206ee64e8 Mon Sep 17 00:00:00 2001 From: Reynold Xin Date: Fri, 18 Nov 2016 22:38:42 -0800 Subject: [PATCH 3/3] More concise --- .../spark/sql/catalyst/expressions/datetimeExpressions.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala index 385f3fecdf3be..1db1d1995d942 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeExpressions.scala @@ -1100,9 +1100,8 @@ case class TruncDate(date: Expression, format: Expression) /** * Returns the number of days from startDate to endDate. */ -// scalastyle:off line.size.limit @ExpressionDescription( - usage = "_FUNC_(endDate, startDate) - Returns the number of days between `endDate` and `startDate`.", + usage = "_FUNC_(endDate, startDate) - Returns the number of days from `startDate` to `endDate`.", extended = """ Examples: > SELECT _FUNC_('2009-07-31', '2009-07-30'); @@ -1111,7 +1110,6 @@ case class TruncDate(date: Expression, format: Expression) > SELECT _FUNC_('2009-07-30', '2009-07-31'); -1 """) -// scalastyle:on line.size.limit case class DateDiff(endDate: Expression, startDate: Expression) extends BinaryExpression with ImplicitCastInputTypes {