[GLUTEN-7548][VL] Optimize BHJ in velox backend #8931
+2,243
−134
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * 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.gluten.vectorized; | ||
|
|
||
| import org.apache.gluten.runtime.Runtime; | ||
| import org.apache.gluten.runtime.RuntimeAware; | ||
|
|
||
| public class HashJoinBuilder implements RuntimeAware { | ||
| private final Runtime runtime; | ||
|
|
||
| private HashJoinBuilder(Runtime runtime) { | ||
| this.runtime = runtime; | ||
| } | ||
|
|
||
| public static HashJoinBuilder create(Runtime runtime) { | ||
| return new HashJoinBuilder(runtime); | ||
| } | ||
|
|
||
| @Override | ||
| public long rtHandle() { | ||
| return runtime.getHandle(); | ||
| } | ||
|
|
||
| public static native void clearHashTable(long hashTableData); | ||
|
|
||
| public static native long cloneHashTable(long hashTableData); | ||
|
|
||
| public static native long nativeBuild( | ||
| String buildHashTableId, | ||
| long[] batchHandlers, | ||
| String joinKeys, | ||
| int joinType, | ||
| boolean hasMixedFiltCondition, | ||
| boolean isExistenceJoin, | ||
| byte[] namedStruct, | ||
| boolean isNullAwareAntiJoin, | ||
| long bloomFilterPushdownSize, | ||
| int broadcastHashTableBuildThreads); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,13 +22,15 @@ import org.apache.gluten.exception.{GlutenExceptionUtil, GlutenNotSupportExcepti | |
| import org.apache.gluten.execution._ | ||
| import org.apache.gluten.expression._ | ||
| import org.apache.gluten.expression.aggregate.{HLLAdapter, VeloxBloomFilterAggregate, VeloxCollectList, VeloxCollectSet} | ||
| import org.apache.gluten.extension.JoinKeysTag | ||
| import org.apache.gluten.extension.columnar.FallbackTags | ||
| import org.apache.gluten.shuffle.NeedCustomColumnarBatchSerializer | ||
| import org.apache.gluten.sql.shims.SparkShimLoader | ||
| import org.apache.gluten.vectorized.{ColumnarBatchSerializer, ColumnarBatchSerializeResult} | ||
|
|
||
| import org.apache.spark.{ShuffleDependency, SparkEnv, SparkException} | ||
| import org.apache.spark.api.python.{ColumnarArrowEvalPythonExec, PullOutArrowEvalPythonPreProjectHelper} | ||
| import org.apache.spark.internal.Logging | ||
| import org.apache.spark.memory.SparkMemoryUtil | ||
| import org.apache.spark.rdd.RDD | ||
| import org.apache.spark.serializer.Serializer | ||
|
|
@@ -43,9 +45,10 @@ import org.apache.spark.sql.catalyst.optimizer.BuildSide | |
| import org.apache.spark.sql.catalyst.plans.JoinType | ||
| import org.apache.spark.sql.catalyst.plans.physical._ | ||
| import org.apache.spark.sql.execution._ | ||
| import org.apache.spark.sql.execution.adaptive.AQEShuffleReadExec | ||
| import org.apache.spark.sql.execution.datasources.FileFormat | ||
| import org.apache.spark.sql.execution.exchange.ShuffleExchangeExec | ||
| import org.apache.spark.sql.execution.joins.{BuildSideRelation, HashedRelationBroadcastMode, SparkHashJoinUtils} | ||
| import org.apache.spark.sql.execution.metric.SQLMetric | ||
| import org.apache.spark.sql.execution.python.ArrowEvalPythonExec | ||
| import org.apache.spark.sql.execution.unsafe.UnsafeColumnarBuildSideRelation | ||
|
|
@@ -64,8 +67,9 @@ import javax.ws.rs.core.UriBuilder | |
| import java.util.Locale | ||
|
|
||
| import scala.collection.JavaConverters._ | ||
| import scala.collection.mutable.ArrayBuffer | ||
|
|
||
| class VeloxSparkPlanExecApi extends SparkPlanExecApi with Logging { | ||
|
|
||
| /** Transform GetArrayItem to Substrait. */ | ||
| override def genGetArrayItemTransformer( | ||
|
|
@@ -678,9 +682,136 @@ class VeloxSparkPlanExecApi extends SparkPlanExecApi { | |
| child: SparkPlan, | ||
| numOutputRows: SQLMetric, | ||
| dataSize: SQLMetric): BuildSideRelation = { | ||
|
|
||
| val buildKeys = mode match { | ||
| case mode1: HashedRelationBroadcastMode => | ||
| mode1.key | ||
| case _ => | ||
| // IdentityBroadcastMode | ||
| Seq.empty | ||
| } | ||
| var offload = true | ||
| val (newChild, newOutput, newBuildKeys) = | ||
| if (VeloxConfig.get.enableBroadcastBuildOncePerExecutor) { | ||
|
|
||
| // Try to lookup from TreeNodeTag using child's logical plan | ||
| // Need to recursively find logicalLink in case of AQE or other wrappers | ||
| @scala.annotation.tailrec | ||
| def findLogicalLink( | ||
| plan: SparkPlan): Option[org.apache.spark.sql.catalyst.plans.logical.LogicalPlan] = { | ||
| plan.logicalLink match { | ||
| case some @ Some(_) => some | ||
| case None => | ||
| plan.children match { | ||
| case Seq(child) => findLogicalLink(child) | ||
| case _ => None | ||
| } | ||
| } | ||
| } | ||
|
|
||
| val newBuildKeys = findLogicalLink(child) | ||
|
Contributor
There was a problem hiding this comment. Regarding the logic here: The current implementation prioritizes fetching the tag from the logical link, with getOriginalKeysFromPacked as a fallback. I have two concerns:
Contributor
Author
There was a problem hiding this comment.
In some unit tests (e.g., GlutenOuterJoinSuiteForceShjOn), BHJ is created manually and does not trigger
We added the getOriginalKeysFromPacked method to extract the original expression instead of the bound reference. |
||
| .flatMap(_.getTagValue(JoinKeysTag.ORIGINAL_JOIN_KEYS)) | ||
| .getOrElse { | ||
| if (SparkHashJoinUtils.canRewriteAsLongType(buildKeys) && buildKeys.nonEmpty) { | ||
| SparkHashJoinUtils.getOriginalKeysFromPacked(buildKeys.head) | ||
| } else { | ||
| buildKeys | ||
| } | ||
| } | ||
|
|
||
| val noNeedPreOp = newBuildKeys.forall { | ||
| case _: AttributeReference | _: BoundReference => true | ||
| case _ => false | ||
| } | ||
|
|
||
| if (noNeedPreOp) { | ||
| (child, child.output, Seq.empty[Expression]) | ||
| } else { | ||
| // pre projection in case of expression join keys | ||
| val appendedProjections = new ArrayBuffer[NamedExpression]() | ||
| val preProjectionBuildKeys = newBuildKeys.zipWithIndex.map { | ||
| case (e, idx) => | ||
| e match { | ||
| case b: BoundReference => child.output(b.ordinal) | ||
| case a: AttributeReference => a | ||
| case o: Expression => | ||
JkSelf marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| val newExpr = Alias(o, "col_" + idx)() | ||
| appendedProjections += newExpr | ||
| newExpr | ||
| } | ||
| } | ||
|
|
||
| def wrapChild(child: SparkPlan): SparkPlan = { | ||
| val childWithAdapter = | ||
| ColumnarCollapseTransformStages.wrapInputIteratorTransformer(child) | ||
| val projectExecTransformer = | ||
| ProjectExecTransformer(child.output ++ appendedProjections, childWithAdapter) | ||
| val validationResult = projectExecTransformer.doValidate() | ||
| if (validationResult.ok()) { | ||
| WholeStageTransformer( | ||
| ProjectExecTransformer(child.output ++ appendedProjections, childWithAdapter))( | ||
| ColumnarCollapseTransformStages | ||
| .getTransformStageCounter(childWithAdapter) | ||
| .incrementAndGet() | ||
| ) | ||
| } else { | ||
| offload = false | ||
| child | ||
| } | ||
| } | ||
|
|
||
| val newChild = child match { | ||
| case wt: WholeStageTransformer => | ||
| val projectTransformer = | ||
| ProjectExecTransformer(child.output ++ appendedProjections, wt.child) | ||
| if (projectTransformer.doValidate().ok()) { | ||
| wt.withNewChildren( | ||
| Seq(ProjectExecTransformer(child.output ++ appendedProjections, wt.child))) | ||
|
|
||
| } else { | ||
| offload = false | ||
| child | ||
| } | ||
| case w: WholeStageCodegenExec => | ||
| w.withNewChildren(Seq(ProjectExec(child.output ++ appendedProjections, w.child))) | ||
| case r: AQEShuffleReadExec if r.supportsColumnar => | ||
| // when aqe is open | ||
| // TODO: remove this after pushdowning preprojection | ||
| wrapChild(r) | ||
| case r2c: RowToVeloxColumnarExec => | ||
| wrapChild(r2c) | ||
| case union: ColumnarUnionExec => | ||
| wrapChild(union) | ||
| case ordered: TakeOrderedAndProjectExecTransformer => | ||
| wrapChild(ordered) | ||
| case a2v: ArrowColumnarToVeloxColumnarExec => | ||
| wrapChild(a2v) | ||
| case other => | ||
| offload = false | ||
| logWarning( | ||
| "Not supported operator " + other.nodeName + | ||
| " for BroadcastRelation and fallback to shuffle hash join") | ||
| child | ||
| } | ||
|
|
||
| if (offload) { | ||
| ( | ||
| newChild, | ||
| (child.output ++ appendedProjections).map(_.toAttribute), | ||
| preProjectionBuildKeys) | ||
| } else { | ||
| (child, child.output, Seq.empty[Expression]) | ||
| } | ||
| } | ||
| } else { | ||
| offload = false | ||
| (child, child.output, buildKeys) | ||
| } | ||
|
|
||
| val useOffheapBroadcastBuildRelation = | ||
| VeloxConfig.get.enableBroadcastBuildRelationInOffheap | ||
|
|
||
| val serialized: Seq[ColumnarBatchSerializeResult] = newChild | ||
| .executeColumnar() | ||
| .mapPartitions(itr => Iterator(BroadcastUtils.serializeStream(itr))) | ||
| .filter(_.numRows != 0) | ||
|
|
@@ -694,18 +825,23 @@ class VeloxSparkPlanExecApi extends SparkPlanExecApi { | |
| } | ||
| numOutputRows += serialized.map(_.numRows).sum | ||
| dataSize += rawSize | ||
|
|
||
| if (useOffheapBroadcastBuildRelation) { | ||
| TaskResources.runUnsafe { | ||
| UnsafeColumnarBuildSideRelation( | ||
| newOutput, | ||
| serialized.flatMap(_.offHeapData().asScala), | ||
| mode, | ||
| newBuildKeys, | ||
| offload) | ||
| } | ||
| } else { | ||
| ColumnarBuildSideRelation( | ||
| newOutput, | ||
| serialized.flatMap(_.onHeapData().asScala).toArray, | ||
| mode, | ||
| newBuildKeys, | ||
| offload) | ||
| } | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.