Repository: spark Updated Branches: refs/heads/master 51066b437 -> effca9868
[SPARK-22720][SS] Make EventTimeWatermark Extend UnaryNode ## What changes were proposed in this pull request? Our Analyzer and Optimizer have multiple rules for `UnaryNode`. After making `EventTimeWatermark` extend `UnaryNode`, we do not need a special handling for `EventTimeWatermark`. ## How was this patch tested? The existing tests Author: gatorsmile <gatorsm...@gmail.com> Closes #19913 from gatorsmile/eventtimewatermark. Project: http://git-wip-us.apache.org/repos/asf/spark/repo Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/effca986 Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/effca986 Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/effca986 Branch: refs/heads/master Commit: effca9868e3feae16c5722c36878b23e616d01a2 Parents: 51066b4 Author: gatorsmile <gatorsm...@gmail.com> Authored: Wed Dec 6 13:11:38 2017 -0800 Committer: gatorsmile <gatorsm...@gmail.com> Committed: Wed Dec 6 13:11:38 2017 -0800 ---------------------------------------------------------------------- .../spark/sql/catalyst/plans/logical/EventTimeWatermark.scala | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/spark/blob/effca986/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/EventTimeWatermark.scala ---------------------------------------------------------------------- diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/EventTimeWatermark.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/EventTimeWatermark.scala index 06196b5..7a927e1 100644 --- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/EventTimeWatermark.scala +++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/EventTimeWatermark.scala @@ -38,7 +38,7 @@ object EventTimeWatermark { case class EventTimeWatermark( eventTime: Attribute, delay: CalendarInterval, - child: LogicalPlan) extends LogicalPlan { + child: LogicalPlan) extends UnaryNode { // Update the metadata on the eventTime column to include the desired delay. override val output: Seq[Attribute] = child.output.map { a => @@ -60,6 +60,4 @@ case class EventTimeWatermark( a } } - - override val children: Seq[LogicalPlan] = child :: Nil } --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@spark.apache.org For additional commands, e-mail: commits-h...@spark.apache.org