vladimirg-db commented on code in PR #49837: URL: https://github.com/apache/spark/pull/49837#discussion_r1949191870
########## sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/NondeterministicExpressionCollection.scala: ########## @@ -0,0 +1,52 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.sql.catalyst.analysis + +import java.util.HashMap + +import org.apache.spark.sql.catalyst.expressions._ + +object NondeterministicExpressionCollection { + def getNondeterministicToAttributes( + expressions: Seq[Expression]): HashMap[Expression, NamedExpression] = { + val nondeterministicToAttributes: HashMap[Expression, NamedExpression] = + new HashMap[Expression, NamedExpression] + expressions.filterNot(_.deterministic).foreach { expression => + val leafNondeterministic = expression.collect { + case n: Nondeterministic => n + case udf: UserDefinedExpression if !udf.deterministic => udf + } + leafNondeterministic.distinct.foreach { + case n: NamedExpression => nondeterministicToAttributes.put(expression, n) Review Comment: ```suggestion case n: NamedExpression => nondeterministicToAttributes.put(expression, n) ``` ########## sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/NondeterministicExpressionCollection.scala: ########## @@ -0,0 +1,52 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.sql.catalyst.analysis + +import java.util.HashMap + +import org.apache.spark.sql.catalyst.expressions._ + +object NondeterministicExpressionCollection { + def getNondeterministicToAttributes( + expressions: Seq[Expression]): HashMap[Expression, NamedExpression] = { + val nondeterministicToAttributes: HashMap[Expression, NamedExpression] = + new HashMap[Expression, NamedExpression] + expressions.filterNot(_.deterministic).foreach { expression => Review Comment: We can do a simple `for` loop with an `if` check instead of `filterNot` to avoid copying a `Seq` ########## sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/NondeterministicExpressionCollection.scala: ########## @@ -0,0 +1,52 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.sql.catalyst.analysis + +import java.util.HashMap + +import org.apache.spark.sql.catalyst.expressions._ + +object NondeterministicExpressionCollection { + def getNondeterministicToAttributes( + expressions: Seq[Expression]): HashMap[Expression, NamedExpression] = { + val nondeterministicToAttributes: HashMap[Expression, NamedExpression] = + new HashMap[Expression, NamedExpression] + expressions.filterNot(_.deterministic).foreach { expression => + val leafNondeterministic = expression.collect { + case n: Nondeterministic => n + case udf: UserDefinedExpression if !udf.deterministic => udf + } + leafNondeterministic.distinct.foreach { + case n: NamedExpression => nondeterministicToAttributes.put(expression, n) + case other => + nondeterministicToAttributes.put(other, Alias(other, "_nondeterministic")()) + } + } + nondeterministicToAttributes + } + + def tryConvertNondeterministicToAttribute( Review Comment: This feels too trivial to be reused. Please use `getOrDefault` in-place. ########## sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/NondeterministicExpressionCollection.scala: ########## @@ -0,0 +1,52 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.sql.catalyst.analysis + +import java.util.HashMap + +import org.apache.spark.sql.catalyst.expressions._ + +object NondeterministicExpressionCollection { + def getNondeterministicToAttributes( + expressions: Seq[Expression]): HashMap[Expression, NamedExpression] = { + val nondeterministicToAttributes: HashMap[Expression, NamedExpression] = Review Comment: No reason to duplicate the type specification. ########## sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/PullOutNondeterministic.scala: ########## @@ -34,10 +36,14 @@ object PullOutNondeterministic extends Rule[LogicalPlan] { case f: Filter => f case a: Aggregate if a.groupingExpressions.exists(!_.deterministic) => - val nondeterToAttr = getNondeterToAttr(a.groupingExpressions) - val newChild = Project(a.child.output ++ nondeterToAttr.values, a.child) + val nondeterToAttr = + NondeterministicExpressionCollection.getNondeterministicToAttributes(a.groupingExpressions) + val newChild = Project(a.child.output ++ nondeterToAttr.values.asScala.toSeq, a.child) Review Comment: This is a separate issue (not related to this refactoring), but we have a non-deterministic `Project` list order here. We should do a separate PR with a transition to a `LinkedHashMap`. Kinda similar to https://github.com/apache/spark/pull/49319 @mihailom-db @cloud-fan -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org For additional commands, e-mail: reviews-h...@spark.apache.org
