Skip to content

Commit f4738d0

Browse files
committed
fix ci
1 parent 3658be0 commit f4738d0

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

backends-clickhouse/src/main/scala/org/apache/gluten/extension/CollapseNestedExpressions.scala

+5-1
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,7 @@ case class CollapseNestedExpressions(spark: SparkSession) extends Rule[SparkPlan
109109
var name = getExpressionName(expr)
110110
var children = Seq.empty[Expression]
111111
var dataType = null.asInstanceOf[DataType]
112+
var nestedFunctions = 0
112113

113114
def f(e: Expression, parent: Option[Expression] = Option.empty[Expression]): Unit = {
114115
parent match {
@@ -123,6 +124,7 @@ case class CollapseNestedExpressions(spark: SparkSession) extends Rule[SparkPlan
123124
case Some(_: And) | None =>
124125
f(a.left, Option.apply(a))
125126
f(a.right, Option.apply(a))
127+
nestedFunctions += 1
126128
case _ =>
127129
children +:= optimize(a)
128130
}
@@ -131,6 +133,7 @@ case class CollapseNestedExpressions(spark: SparkSession) extends Rule[SparkPlan
131133
case Some(_: Or) | None =>
132134
f(o.left, parent = Option.apply(o))
133135
f(o.right, parent = Option.apply(o))
136+
nestedFunctions += 1
134137
case _ =>
135138
children +:= optimize(o)
136139
}
@@ -139,13 +142,14 @@ case class CollapseNestedExpressions(spark: SparkSession) extends Rule[SparkPlan
139142
children +:= optimize(e)
140143
} else {
141144
children = Seq.empty[Expression]
145+
nestedFunctions = 0
142146
val exprNewChildren = e.children.map(p => optimize(p))
143147
resultExpr = e.withNewChildren(exprNewChildren)
144148
}
145149
}
146150
}
147151
f(expr)
148-
if (name.isDefined || collapsedExpressionExists(children)) {
152+
if ((nestedFunctions > 1 && name.isDefined) || collapsedExpressionExists(children)) {
149153
CHCollapsedExpression(dataType, children, name.getOrElse(""), expr.nullable)
150154
} else {
151155
resultExpr

0 commit comments

Comments
 (0)