[SPARK-8119] changed from ExpectsInputTypes to implicit casts

Author: tarekbecker

python/pyspark/sql/functions.py

@@ -723,7 +723,7 @@ def dayInYear(col):
     Extract the day of the year of a given date as integer.
     >>> df0 = sqlContext.createDataFrame([('2015-04-08',)], ['a'])
     >>> df0.select(dayInYear('a').alias('day')).collect()
-    [Row(day=128)]
+    [Row(day=98)]
     """
     sc = SparkContext._active_spark_context
     return Column(sc._jvm.functions.day(col))

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/datetimeFunctions.scala

@@ -61,7 +61,7 @@ case class CurrentTimestamp() extends LeafExpression {
   }
 }
 
-case class Hour(child: Expression) extends UnaryExpression with ExpectsInputTypes {
+case class Hour(child: Expression) extends UnaryExpression with ImplicitCastInputTypes {
 
   override def inputTypes: Seq[AbstractDataType] = Seq(TimestampType)
 
@@ -82,7 +82,7 @@ case class Hour(child: Expression) extends UnaryExpression with ExpectsInputType
   }
 }
 
-case class Minute(child: Expression) extends UnaryExpression with ExpectsInputTypes {
+case class Minute(child: Expression) extends UnaryExpression with ImplicitCastInputTypes {
 
   override def inputTypes: Seq[AbstractDataType] = Seq(TimestampType)
 
@@ -103,7 +103,7 @@ case class Minute(child: Expression) extends UnaryExpression with ExpectsInputTy
   }
 }
 
-case class Second(child: Expression) extends UnaryExpression with ExpectsInputTypes {
+case class Second(child: Expression) extends UnaryExpression with ImplicitCastInputTypes {
 
   override def inputTypes: Seq[AbstractDataType] = Seq(TimestampType)
 
@@ -120,7 +120,7 @@ case class Second(child: Expression) extends UnaryExpression with ExpectsInputTy
   }
 }
 
-abstract class DateFormatExpression extends UnaryExpression with ExpectsInputTypes {
+abstract class DateFormatExpression extends UnaryExpression with ImplicitCastInputTypes {
   self: Product =>
 
   val daysIn400Years: Int = 146097
@@ -310,7 +310,7 @@ case class Month(child: Expression) extends DateFormatExpression {
   }
 }
 
-case class Day(child: Expression) extends DateFormatExpression with ExpectsInputTypes {
+case class Day(child: Expression) extends DateFormatExpression with ImplicitCastInputTypes {
 
   override def dataType: DataType = IntegerType
 
@@ -373,7 +373,7 @@ case class Day(child: Expression) extends DateFormatExpression with ExpectsInput
 
 }
 
-case class WeekOfYear(child: Expression) extends UnaryExpression with ExpectsInputTypes {
+case class WeekOfYear(child: Expression) extends UnaryExpression with ImplicitCastInputTypes {
 
   override def dataType: DataType = IntegerType
 
@@ -398,7 +398,7 @@ case class WeekOfYear(child: Expression) extends UnaryExpression with ExpectsInp
 }
 
 case class DateFormatClass(left: Expression, right: Expression) extends BinaryExpression
-  with ExpectsInputTypes {
+  with ImplicitCastInputTypes {
 
   override def dataType: DataType = StringType
 

sql/core/src/test/scala/org/apache/spark/sql/DatetimeExpressionsSuite.scala

@@ -123,11 +123,11 @@ class DatetimeExpressionsSuite extends QueryTest {
 
     checkAnswer(
       df.select(dayInYear("a"), dayInYear("b"), dayInYear("c")),
-      Row(128, 128, 128))
+      Row(98, 98, 98))
 
     checkAnswer(
       df.selectExpr("dayInYear(a)", "dayInYear(b)", "dayInYear(c)"),
-      Row(128, 128, 128))
+      Row(98, 98, 98))
   }
 
   test("hour") {