address comments

yaooqinn · yaooqinn · commit 2e06305647f7 · 2019-11-08T16:42:27.000+08:00
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregate/Average.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/aggregate/Average.scala
@@ -51,13 +51,13 @@ case class Average(child: Expression) extends DeclarativeAggregate with Implicit
   private lazy val resultType = child.dataType match {
     case DecimalType.Fixed(p, s) =>
       DecimalType.bounded(p + 4, s + 4)
-    case CalendarIntervalType => CalendarIntervalType
+    case interval: CalendarIntervalType => interval
     case _ => DoubleType
   }
 
   private lazy val sumDataType = child.dataType match {
     case _ @ DecimalType.Fixed(p, s) => DecimalType.bounded(p + 10, s)
-    case CalendarIntervalType => CalendarIntervalType
+    case interval: CalendarIntervalType => interval
     case _ => DoubleType
   }
 
diff --git a/sql/core/src/test/resources/sql-tests/inputs/group-by.sql b/sql/core/src/test/resources/sql-tests/inputs/group-by.sql
@@ -196,7 +196,7 @@ FROM VALUES(1,'1 seconds'),(1,'2 seconds'),(2,NULL),(2,NULL) t(i,v);
 
 -- average with interval type
 -- null
-select avg(cast(v as interval)) from VALUES ('1 seconds'), ('2 seconds'), (null) t(v) where v is null;
+select avg(cast(v as interval)) from VALUES (null) t(v);
 
 -- empty set
 select avg(cast(v as interval)) from VALUES ('1 seconds'), ('2 seconds'), (null) t(v) where 1=0;
diff --git a/sql/core/src/test/resources/sql-tests/results/group-by.sql.out b/sql/core/src/test/resources/sql-tests/results/group-by.sql.out
@@ -663,7 +663,7 @@ struct<i:int,sum(CAST(v AS INTERVAL)) OVER (ORDER BY i ASC NULLS FIRST ROWS BETW
 
 
 -- !query 65
-select avg(cast(v as interval)) from VALUES ('1 seconds'), ('2 seconds'), (null) t(v) where v is null
+select avg(cast(v as interval)) from VALUES (null) t(v)
 -- !query 65 schema
 struct<avg(CAST(v AS INTERVAL)):interval>
 -- !query 65 output

Original file line number	Diff line number	Diff line change
`@@ -51,13 +51,13 @@ case class Average(child: Expression) extends DeclarativeAggregate with Implicit`
`51`	`51`	`private lazy val resultType = child.dataType match {`
`52`	`52`	`case DecimalType.Fixed(p, s) =>`
`53`	`53`	`DecimalType.bounded(p + 4, s + 4)`
`54`		`- case CalendarIntervalType => CalendarIntervalType`
	`54`	`+ case interval: CalendarIntervalType => interval`
`55`	`55`	`case _ => DoubleType`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`private lazy val sumDataType = child.dataType match {`
`59`	`59`	`case _ @ DecimalType.Fixed(p, s) => DecimalType.bounded(p + 10, s)`
`60`		`- case CalendarIntervalType => CalendarIntervalType`
	`60`	`+ case interval: CalendarIntervalType => interval`
`61`	`61`	`case _ => DoubleType`
`62`	`62`	`}`
`63`	`63`