Skip to content

Commit 5c9a992

Browse files
committed
address comments
1 parent 43b2399 commit 5c9a992

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ case class WindowSpecDefinition(
4242
orderSpec: Seq[SortOrder],
4343
frameSpecification: WindowFrame) extends Expression with WindowSpec with Unevaluable {
4444

45-
override def children: Seq[Expression] = partitionSpec ++ orderSpec ++ Seq(frameSpecification)
45+
override def children: Seq[Expression] = partitionSpec ++ orderSpec :+ frameSpecification
4646

4747
override lazy val resolved: Boolean =
4848
childrenResolved && checkInputDataTypes().isSuccess &&

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreeNode.scala

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,8 +688,6 @@ abstract class TreeNode[BaseType <: TreeNode[BaseType]] extends Product {
688688
case id: FunctionIdentifier => true
689689
case spec: BucketSpec => true
690690
case catalog: CatalogTable => true
691-
case boundary: SpecialFrameBoundary => true
692-
case frame: WindowFrame => true
693691
case partition: Partitioning => true
694692
case resource: FunctionResource => true
695693
case broadcast: BroadcastMode => true

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/analysis/TypeCoercionSuite.scala

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1133,6 +1133,17 @@ class TypeCoercionSuite extends AnalysisTest {
11331133
Seq(SortOrder(Literal.default(DateType), Ascending)),
11341134
SpecifiedWindowFrame(RangeFrame, Literal(10.0), Literal(2147483648L)))
11351135
)
1136+
// Should not cast SpecialFrameBoundary.
1137+
ruleTest(WindowFrameCoercion,
1138+
windowSpec(
1139+
Seq(UnresolvedAttribute("a")),
1140+
Seq(SortOrder(Literal(1L), Ascending)),
1141+
SpecifiedWindowFrame(RangeFrame, CurrentRow, Unbounded)),
1142+
windowSpec(
1143+
Seq(UnresolvedAttribute("a")),
1144+
Seq(SortOrder(Literal(1L), Ascending)),
1145+
SpecifiedWindowFrame(RangeFrame, CurrentRow, Unbounded))
1146+
)
11361147
}
11371148
}
11381149

0 commit comments

Comments
 (0)