aokolnychyi commented on a change in pull request #33096: URL: https://github.com/apache/spark/pull/33096#discussion_r660063331
########## File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/V2ExpressionUtils.scala ########## @@ -0,0 +1,80 @@ +/* + * 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.expressions + +import org.apache.spark.sql.AnalysisException +import org.apache.spark.sql.catalyst.SQLConfHelper +import org.apache.spark.sql.catalyst.analysis.Resolver +import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan +import org.apache.spark.sql.connector.expressions.{Expression => V2Expression, FieldReference, IdentityTransform, NamedReference, NullOrdering => V2NullOrdering, SortDirection => V2SortDirection, SortValue} +import org.apache.spark.sql.errors.QueryCompilationErrors + +/** + * A utility class that converts public connector expressions into Catalyst expressions. + */ +private[sql] object V2ExpressionUtils extends SQLConfHelper { Review comment: Makes sense. I'll update. ########## File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/V2ExpressionUtils.scala ########## @@ -0,0 +1,80 @@ +/* + * 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.expressions + +import org.apache.spark.sql.AnalysisException +import org.apache.spark.sql.catalyst.SQLConfHelper +import org.apache.spark.sql.catalyst.analysis.Resolver +import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan +import org.apache.spark.sql.connector.expressions.{Expression => V2Expression, FieldReference, IdentityTransform, NamedReference, NullOrdering => V2NullOrdering, SortDirection => V2SortDirection, SortValue} +import org.apache.spark.sql.errors.QueryCompilationErrors + +/** + * A utility class that converts public connector expressions into Catalyst expressions. + */ +private[sql] object V2ExpressionUtils extends SQLConfHelper { + import org.apache.spark.sql.connector.catalog.CatalogV2Implicits.MultipartIdentifierHelper + + def resolveRef[T <: NamedExpression]( + ref: NamedReference, + plan: LogicalPlan, + resolver: Resolver = conf.resolver): T = { + plan.resolve(ref.fieldNames, resolver) match { + case Some(namedExpr) => + namedExpr.asInstanceOf[T] + case None => + val name = ref.fieldNames.toSeq.quoted + val outputString = plan.output.map(_.name).mkString(",") + throw QueryCompilationErrors.cannotResolveAttributeError(name, outputString) + } + } + + def resolveRefs[T <: NamedExpression]( Review comment: It will be used in #33008 and #32921. This PR has a subset of changes from #32921. ########## File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/V2ExpressionUtils.scala ########## @@ -0,0 +1,80 @@ +/* + * 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.expressions + +import org.apache.spark.sql.AnalysisException +import org.apache.spark.sql.catalyst.SQLConfHelper +import org.apache.spark.sql.catalyst.analysis.Resolver +import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan +import org.apache.spark.sql.connector.expressions.{Expression => V2Expression, FieldReference, IdentityTransform, NamedReference, NullOrdering => V2NullOrdering, SortDirection => V2SortDirection, SortValue} +import org.apache.spark.sql.errors.QueryCompilationErrors + +/** + * A utility class that converts public connector expressions into Catalyst expressions. + */ +private[sql] object V2ExpressionUtils extends SQLConfHelper { + import org.apache.spark.sql.connector.catalog.CatalogV2Implicits.MultipartIdentifierHelper + + def resolveRef[T <: NamedExpression]( + ref: NamedReference, + plan: LogicalPlan, + resolver: Resolver = conf.resolver): T = { + plan.resolve(ref.fieldNames, resolver) match { + case Some(namedExpr) => + namedExpr.asInstanceOf[T] + case None => + val name = ref.fieldNames.toSeq.quoted + val outputString = plan.output.map(_.name).mkString(",") + throw QueryCompilationErrors.cannotResolveAttributeError(name, outputString) + } + } + + def resolveRefs[T <: NamedExpression]( + refs: Seq[NamedReference], + plan: LogicalPlan, + resolver: Resolver = conf.resolver): Seq[T] = { + refs.map(ref => resolveRef[T](ref, plan, resolver)) + } + + def toCatalyst( + expr: V2Expression, + query: LogicalPlan, + resolver: Resolver = conf.resolver): Expression = { + expr match { + case SortValue(child, direction, nullOrdering) => + val catalystChild = toCatalyst(child, query, resolver) + SortOrder(catalystChild, toCatalyst(direction), toCatalyst(nullOrdering), Seq.empty) + case IdentityTransform(ref) => + resolveRef[NamedExpression](ref, query, resolver) + case ref: FieldReference => + resolveRef[NamedExpression](ref, query, resolver) + case _ => + throw new AnalysisException(s"$expr is not currently supported") + } + } + + private def toCatalyst(direction: V2SortDirection): SortDirection = direction match { + case V2SortDirection.ASCENDING => Ascending + case V2SortDirection.DESCENDING => Descending Review comment: It is probably because the match statement is exhaustive as `V2SortDirection` is an enum and we check for both possible values here. Just copied the logic as it was. ########## File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/V2ExpressionUtils.scala ########## @@ -0,0 +1,80 @@ +/* + * 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.expressions + +import org.apache.spark.sql.AnalysisException +import org.apache.spark.sql.catalyst.SQLConfHelper +import org.apache.spark.sql.catalyst.analysis.Resolver +import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan +import org.apache.spark.sql.connector.expressions.{Expression => V2Expression, FieldReference, IdentityTransform, NamedReference, NullOrdering => V2NullOrdering, SortDirection => V2SortDirection, SortValue} +import org.apache.spark.sql.errors.QueryCompilationErrors + +/** + * A utility class that converts public connector expressions into Catalyst expressions. + */ +private[sql] object V2ExpressionUtils extends SQLConfHelper { + import org.apache.spark.sql.connector.catalog.CatalogV2Implicits.MultipartIdentifierHelper + + def resolveRef[T <: NamedExpression]( + ref: NamedReference, + plan: LogicalPlan, + resolver: Resolver = conf.resolver): T = { + plan.resolve(ref.fieldNames, resolver) match { + case Some(namedExpr) => + namedExpr.asInstanceOf[T] + case None => + val name = ref.fieldNames.toSeq.quoted + val outputString = plan.output.map(_.name).mkString(",") + throw QueryCompilationErrors.cannotResolveAttributeError(name, outputString) + } + } + + def resolveRefs[T <: NamedExpression]( + refs: Seq[NamedReference], + plan: LogicalPlan, + resolver: Resolver = conf.resolver): Seq[T] = { Review comment: I was not sure whether there is a use case where we would want to pass a resolver explicitly. It seems Spark uses an explicit resolver in quite a few places (e.g. `PartitionPruning` uses the resolver from `HadoopFsRelation`) so it felt safer to expose an extra arg. I'm fine either way here. Let me know your preference, @HyukjinKwon. ########## File path: sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/V2ExpressionUtils.scala ########## @@ -0,0 +1,80 @@ +/* + * 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.expressions + +import org.apache.spark.sql.AnalysisException +import org.apache.spark.sql.catalyst.SQLConfHelper +import org.apache.spark.sql.catalyst.analysis.Resolver +import org.apache.spark.sql.catalyst.plans.logical.LogicalPlan +import org.apache.spark.sql.connector.expressions.{Expression => V2Expression, FieldReference, IdentityTransform, NamedReference, NullOrdering => V2NullOrdering, SortDirection => V2SortDirection, SortValue} +import org.apache.spark.sql.errors.QueryCompilationErrors + +/** + * A utility class that converts public connector expressions into Catalyst expressions. + */ +private[sql] object V2ExpressionUtils extends SQLConfHelper { + import org.apache.spark.sql.connector.catalog.CatalogV2Implicits.MultipartIdentifierHelper + + def resolveRef[T <: NamedExpression]( + ref: NamedReference, + plan: LogicalPlan, + resolver: Resolver = conf.resolver): T = { + plan.resolve(ref.fieldNames, resolver) match { + case Some(namedExpr) => + namedExpr.asInstanceOf[T] + case None => + val name = ref.fieldNames.toSeq.quoted + val outputString = plan.output.map(_.name).mkString(",") + throw QueryCompilationErrors.cannotResolveAttributeError(name, outputString) + } + } + + def resolveRefs[T <: NamedExpression]( + refs: Seq[NamedReference], + plan: LogicalPlan, + resolver: Resolver = conf.resolver): Seq[T] = { Review comment: Maybe, we can drop it and add if needed to keep the API simple. -- 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