You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@iceberg.apache.org by GitBox <gi...@apache.org> on 2020/12/02 13:54:57 UTC
[GitHub] [iceberg] aokolnychyi opened a new pull request #1860: Spark: Fix resolution of procedures with expressions
aokolnychyi opened a new pull request #1860:
URL: https://github.com/apache/iceberg/pull/1860
This PR fixes the resolution of procedures that contain expressions as arguments.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] aokolnychyi commented on pull request #1860: Spark: Fix resolution of procedures with expressions
Posted by GitBox <gi...@apache.org>.
aokolnychyi commented on pull request #1860:
URL: https://github.com/apache/iceberg/pull/1860#issuecomment-737244829
@RussellSpitzer, this should unblock you.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] rdblue commented on a change in pull request #1860: Spark: Fix resolution of procedures with expressions
Posted by GitBox <gi...@apache.org>.
rdblue commented on a change in pull request #1860:
URL: https://github.com/apache/iceberg/pull/1860#discussion_r534462203
##########
File path: spark3-extensions/src/main/scala/org/apache/spark/sql/catalyst/analysis/ProcedureArgumentCoercion.scala
##########
@@ -0,0 +1,55 @@
+/*
+ * 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 org.apache.spark.sql.AnalysisException
+import org.apache.spark.sql.catalyst.expressions.Cast
+import org.apache.spark.sql.catalyst.plans.logical.{Call, LogicalPlan}
+import org.apache.spark.sql.catalyst.rules.Rule
+
+object ProcedureArgumentCoercion extends Rule[LogicalPlan] {
+ override def apply(plan: LogicalPlan): LogicalPlan = plan resolveOperators {
+ case c @ Call(procedure, args) if c.resolved =>
+ val params = procedure.parameters
+
+ val newArgs = args.zipWithIndex.map { case (arg, index) =>
+ val param = params(index)
+ val paramType = param.dataType
+ val argType = arg.dataType
+
+ if (paramType != argType && !Cast.canUpCast(argType, paramType)) {
+ throw new AnalysisException(
+ s"Wrong arg type for ${param.name}: expected $paramType but got $argType")
Review comment:
I like the "cannot cast" message better.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] rdblue merged pull request #1860: Spark: Fix resolution of procedures with expressions
Posted by GitBox <gi...@apache.org>.
rdblue merged pull request #1860:
URL: https://github.com/apache/iceberg/pull/1860
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] aokolnychyi commented on a change in pull request #1860: Spark: Fix resolution of procedures with expressions
Posted by GitBox <gi...@apache.org>.
aokolnychyi commented on a change in pull request #1860:
URL: https://github.com/apache/iceberg/pull/1860#discussion_r534184147
##########
File path: spark3-extensions/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveProcedures.scala
##########
@@ -79,19 +79,7 @@ case class ResolveProcedures(spark: SparkSession) extends Rule[LogicalPlan] with
nameToArgMap.foreach { case (name, arg) =>
val position = nameToPositionMap(name)
- val param = params(position)
- val paramType = param.dataType
- val argType = arg.expr.dataType
Review comment:
We cannot call `dataType` as it may not be resolved yet (e.g. calls to functions).
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] aokolnychyi commented on pull request #1860: Spark: Fix resolution of procedures with expressions
Posted by GitBox <gi...@apache.org>.
aokolnychyi commented on pull request #1860:
URL: https://github.com/apache/iceberg/pull/1860#issuecomment-737487451
Rebased now.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] aokolnychyi commented on pull request #1860: Spark: Fix resolution of procedures with expressions
Posted by GitBox <gi...@apache.org>.
aokolnychyi commented on pull request #1860:
URL: https://github.com/apache/iceberg/pull/1860#issuecomment-737483415
Let me rebase it now.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] aokolnychyi commented on a change in pull request #1860: Spark: Fix resolution of procedures with expressions
Posted by GitBox <gi...@apache.org>.
aokolnychyi commented on a change in pull request #1860:
URL: https://github.com/apache/iceberg/pull/1860#discussion_r534472128
##########
File path: spark3-extensions/src/main/scala/org/apache/spark/sql/catalyst/analysis/ProcedureArgumentCoercion.scala
##########
@@ -0,0 +1,55 @@
+/*
+ * 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 org.apache.spark.sql.AnalysisException
+import org.apache.spark.sql.catalyst.expressions.Cast
+import org.apache.spark.sql.catalyst.plans.logical.{Call, LogicalPlan}
+import org.apache.spark.sql.catalyst.rules.Rule
+
+object ProcedureArgumentCoercion extends Rule[LogicalPlan] {
+ override def apply(plan: LogicalPlan): LogicalPlan = plan resolveOperators {
+ case c @ Call(procedure, args) if c.resolved =>
+ val params = procedure.parameters
+
+ val newArgs = args.zipWithIndex.map { case (arg, index) =>
+ val param = params(index)
+ val paramType = param.dataType
+ val argType = arg.dataType
+
+ if (paramType != argType && !Cast.canUpCast(argType, paramType)) {
+ throw new AnalysisException(
+ s"Wrong arg type for ${param.name}: expected $paramType but got $argType")
Review comment:
Done.
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org
[GitHub] [iceberg] RussellSpitzer commented on a change in pull request #1860: Spark: Fix resolution of procedures with expressions
Posted by GitBox <gi...@apache.org>.
RussellSpitzer commented on a change in pull request #1860:
URL: https://github.com/apache/iceberg/pull/1860#discussion_r534393288
##########
File path: spark3-extensions/src/main/scala/org/apache/spark/sql/catalyst/analysis/ProcedureArgumentCoercion.scala
##########
@@ -0,0 +1,55 @@
+/*
+ * 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 org.apache.spark.sql.AnalysisException
+import org.apache.spark.sql.catalyst.expressions.Cast
+import org.apache.spark.sql.catalyst.plans.logical.{Call, LogicalPlan}
+import org.apache.spark.sql.catalyst.rules.Rule
+
+object ProcedureArgumentCoercion extends Rule[LogicalPlan] {
+ override def apply(plan: LogicalPlan): LogicalPlan = plan resolveOperators {
+ case c @ Call(procedure, args) if c.resolved =>
+ val params = procedure.parameters
+
+ val newArgs = args.zipWithIndex.map { case (arg, index) =>
+ val param = params(index)
+ val paramType = param.dataType
+ val argType = arg.dataType
+
+ if (paramType != argType && !Cast.canUpCast(argType, paramType)) {
+ throw new AnalysisException(
+ s"Wrong arg type for ${param.name}: expected $paramType but got $argType")
Review comment:
Maybe "Wrong arg type and cannot cast type x to type y"?
Not super important
----------------------------------------------------------------
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.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscribe@iceberg.apache.org
For additional commands, e-mail: issues-help@iceberg.apache.org