Skip to content

Commit dd0988a

Browse files
committed
Address comments of abstraction
1 parent 5b91b19 commit dd0988a

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/BaseAggregateExec.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ import org.apache.spark.sql.execution.{ExplainUtils, UnaryExecNode}
2424
/**
2525
* Holds common logic for aggregate operators
2626
*/
27-
abstract class BaseAggregateExec extends UnaryExecNode {
28-
val groupingExpressions: Seq[NamedExpression]
29-
val aggregateExpressions: Seq[AggregateExpression]
30-
val aggregateAttributes: Seq[Attribute]
31-
val resultExpressions: Seq[NamedExpression]
27+
trait BaseAggregateExec extends UnaryExecNode {
28+
def groupingExpressions: Seq[NamedExpression]
29+
def aggregateExpressions: Seq[AggregateExpression]
30+
def aggregateAttributes: Seq[Attribute]
31+
def resultExpressions: Seq[NamedExpression]
3232

3333
override def verboseStringWithOperatorId(): String = {
3434
val inputString = child.output.mkString("[", ", ", "]")

sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/HashAggregateExec.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ import org.apache.spark.util.Utils
4747
*/
4848
case class HashAggregateExec(
4949
requiredChildDistributionExpressions: Option[Seq[Expression]],
50-
override val groupingExpressions: Seq[NamedExpression],
51-
override val aggregateExpressions: Seq[AggregateExpression],
52-
override val aggregateAttributes: Seq[Attribute],
50+
groupingExpressions: Seq[NamedExpression],
51+
aggregateExpressions: Seq[AggregateExpression],
52+
aggregateAttributes: Seq[Attribute],
5353
initialInputBufferOffset: Int,
54-
override val resultExpressions: Seq[NamedExpression],
54+
resultExpressions: Seq[NamedExpression],
5555
child: SparkPlan)
5656
extends BaseAggregateExec with BlockingOperatorWithCodegen with AliasAwareOutputPartitioning {
5757

sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/ObjectHashAggregateExec.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ import org.apache.spark.sql.execution.metric.SQLMetrics
6161
*/
6262
case class ObjectHashAggregateExec(
6363
requiredChildDistributionExpressions: Option[Seq[Expression]],
64-
override val groupingExpressions: Seq[NamedExpression],
65-
override val aggregateExpressions: Seq[AggregateExpression],
66-
override val aggregateAttributes: Seq[Attribute],
64+
groupingExpressions: Seq[NamedExpression],
65+
aggregateExpressions: Seq[AggregateExpression],
66+
aggregateAttributes: Seq[Attribute],
6767
initialInputBufferOffset: Int,
68-
override val resultExpressions: Seq[NamedExpression],
68+
resultExpressions: Seq[NamedExpression],
6969
child: SparkPlan)
7070
extends BaseAggregateExec with AliasAwareOutputPartitioning {
7171

sql/core/src/main/scala/org/apache/spark/sql/execution/aggregate/SortAggregateExec.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ import org.apache.spark.sql.execution.metric.SQLMetrics
3232
*/
3333
case class SortAggregateExec(
3434
requiredChildDistributionExpressions: Option[Seq[Expression]],
35-
override val groupingExpressions: Seq[NamedExpression],
36-
override val aggregateExpressions: Seq[AggregateExpression],
37-
override val aggregateAttributes: Seq[Attribute],
35+
groupingExpressions: Seq[NamedExpression],
36+
aggregateExpressions: Seq[AggregateExpression],
37+
aggregateAttributes: Seq[Attribute],
3838
initialInputBufferOffset: Int,
39-
override val resultExpressions: Seq[NamedExpression],
39+
resultExpressions: Seq[NamedExpression],
4040
child: SparkPlan)
4141
extends BaseAggregateExec with AliasAwareOutputPartitioning {
4242

0 commit comments

Comments
 (0)