srielau commented on code in PR #57264: URL: https://github.com/apache/spark/pull/57264#discussion_r3590151148
########## sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveAsOfJoin.scala: ########## @@ -0,0 +1,202 @@ +/* + * 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.catalyst.SQLConfHelper +import org.apache.spark.sql.catalyst.expressions.{ + Expression, + RowOrdering, + SubqueryExpression, + WindowExpression +} +import org.apache.spark.sql.catalyst.expressions.AttributeSet +import org.apache.spark.sql.catalyst.expressions.aggregate.AggregateExpression +import org.apache.spark.sql.catalyst.plans.logical.{AsOfJoin, LogicalPlan, Project} +import org.apache.spark.sql.catalyst.rules.Rule +import org.apache.spark.sql.catalyst.trees.TreePattern.{AS_OF_JOIN, GENERATOR} +import org.apache.spark.sql.catalyst.util._ +import org.apache.spark.sql.errors.QueryErrorsBase +import org.apache.spark.sql.types.{ArrayType, DataType, DatetimeType, StringType, StructType} + +/** + * Resolves SQL [[AsOfJoin]] operators: materializes `MATCH_CONDITION` into `asOfCondition` and + * `orderExpression`, and expands `USING` column lists into equi-join predicates. + */ +object ResolveAsOfJoin extends Rule[LogicalPlan] with SQLConfHelper { + + override def apply(plan: LogicalPlan): LogicalPlan = plan.resolveOperatorsUpWithPruning( + _.containsPattern(AS_OF_JOIN), ruleId) { + case j @ AsOfJoin( + left, + right, + _, + condition, + _, + _, + _, + usingColumns, + matchLeft, + matchOp, + matchRight, + _, + _, + _) + if left.resolved && right.resolved && condition.forall(_.resolved) => + val (joinBase, usingProjection) = usingColumns match { + case Some(cols) if condition.isEmpty => + val (projectList, hiddenList, newCondition) = + NaturalAndUsingJoinResolution.computeJoinOutputsAndNewCondition( + left, + left.output, + right, + right.output, + j.joinType, + cols, + None, + (l, r) => conf.resolver(l, r)) + (j.copy(condition = newCondition, usingColumns = None), Some((projectList, hiddenList))) + case _ => (j, None) + } + val resolvedJoin = (matchLeft, matchOp, matchRight) match { + case (Some(leftExpr), Some(operator), Some(rightExpr)) => + AsOfJoinValidation.validateMatchConditionTableReferences( + joinBase, left, right, leftExpr, rightExpr) + if (leftExpr.resolved && rightExpr.resolved) { + AsOfJoinValidation.validateMatchConditionOperands(joinBase, leftExpr, rightExpr) + val (asOfCondition, orderExpression, leftSortExprs, rightSortExprs) = + AsOfJoin.resolveMatchComparison(left, right, leftExpr, operator, rightExpr) + joinBase.copy( + asOfCondition = asOfCondition, + orderExpression = orderExpression, + leftSortExprs = leftSortExprs, + rightSortExprs = rightSortExprs, + matchLeftOperand = None, + matchOperator = None, + matchRightOperand = None) + } else { + joinBase + } + case (None, None, None) => joinBase + case _ => joinBase + } + usingProjection match { + case Some((projectList, hiddenList)) => + val project = Project(projectList, resolvedJoin) + project.setTagValue( + Project.hiddenOutputTag, + hiddenList.map(_.markAsQualifiedAccessOnly())) + project + case None => resolvedJoin + } + } +} + +private[analysis] object AsOfJoinValidation extends QueryErrorsBase { + + def validateMatchConditionTableReferences( + join: AsOfJoin, + left: LogicalPlan, + right: LogicalPlan, + leftExpr: Expression, + rightExpr: Expression): Unit = { + val leftSet = left.outputSet + val rightSet = right.outputSet + + def referencesBothJoinSides(refs: AttributeSet): Boolean = { + refs.nonEmpty && + refs.intersect(leftSet).nonEmpty && + refs.intersect(rightSet).nonEmpty + } + + val leftRefs = leftExpr.references + val rightRefs = rightExpr.references + if (referencesBothJoinSides(leftRefs) || referencesBothJoinSides(rightRefs)) { + join.failAnalysis( + errorClass = "ASOF_JOIN_MATCH_CONDITION_TABLE_REFERENCE", + messageParameters = Map( + "refs1" -> toSQLExpr(leftExpr), + "refs2" -> toSQLExpr(rightExpr))) + } + } + + def validateMatchConditionOperands( + join: AsOfJoin, + leftExpr: Expression, + rightExpr: Expression): Unit = { + Seq(leftExpr, rightExpr).foreach { expr => + findInvalidMatchConditionExpression(expr).foreach { invalidExpr => + join.failAnalysis( + errorClass = "ASOF_JOIN_MATCH_CONDITION_INVALID_EXPRESSION", + messageParameters = Map("expr" -> toSQLExpr(invalidExpr))) + } + } + if (!RowOrdering.isOrderable(leftExpr.dataType) || + !RowOrdering.isOrderable(rightExpr.dataType) || Review Comment: Confirmed — with both confs on, STRING/struct/array operands passed analysis but failed at planning with `IllegalStateException` from `findFromOrder`. Fixed in `7cf7621fa12`: after operand normalization, analysis now rejects non-scalar-subtract operands with `AS_OF_JOIN.UNSUPPORTED_MATCH_CONDITION_OPERAND` until multi-column sort-merge execution lands. #57277 lifts that gate once `SortMergeAsOfJoinExec` consumes `leftSortExprs`/`rightSortExprs` directly. ########## sql/core/src/test/scala/org/apache/spark/sql/AsOfJoinSQLSuite.scala: ########## @@ -38,6 +38,19 @@ class AsOfJoinSQLSuite extends QueryTest with SharedSparkSession { super.afterAll() } + private def setupTradeQuoteViews(): Unit = { Review Comment: Added in `7cf7621fa12`: - **Positive analyze-only test**: valid TIMESTAMP `MATCH_CONDITION` with `sortMergeAsOfJoin.enabled=true` — asserts resolved `AsOfJoin` with populated `leftSortExprs`/`rightSortExprs`. - **STRING operand test**: asserts `AS_OF_JOIN.UNSUPPORTED_MATCH_CONDITION_OPERAND` at analysis (surfaces the planner-capability gap you flagged). ########## sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/basicLogicalOperators.scala: ########## @@ -2563,6 +2566,8 @@ case class AsOfJoin( matchOperator.isEmpty && matchRightOperand.isEmpty && expressions.forall(_.resolved) && + leftSortExprs.forall(_.resolved) && Review Comment: Dropped — `leftSortExprs.forall(_.resolved)` / `rightSortExprs.forall(_.resolved)` removed in `7cf7621fa12`. -- 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: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
