Skip to content

[GLUTEN-11749][VL] Throw exception if cannot get the pre-built hash table from ObjectStore correctly #11898

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JkSelf wants to merge 3 commits into
base: main
Choose a base branch
from
+29 −13
Open

[GLUTEN-11749][VL] Throw exception if cannot get the pre-built hash table from ObjectStore correctly #11898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ee5da51
Throw exception if not get the pre-built hash table
JkSelf Apr 9, 2026
b7f8ecd
Fix failed unit tests
JkSelf Apr 10, 2026
7f4806e
Fix compile issue
JkSelf Apr 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 19 additions & 13 deletions cpp/velox/substrait/SubstraitToVeloxPlan.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,24 +399,30 @@ core::PlanNodePtr SubstraitToVeloxPlanConverter::toVeloxPlan(const ::substrait::
} else if (
sJoin.has_advanced_extension() &&
SubstraitParser::configSetInOptimization(sJoin.advanced_extension(), "isBHJ=")) {
bool hashTableBuildOncePerExecutorEnabled =
SubstraitParser::configSetInOptimization(
sJoin.advanced_extension(), "isHashTableBuildOncePerExecutor=");

std::string hashTableId = sJoin.hashtableid();

std::shared_ptr<core::OpaqueHashTable> opaqueSharedHashTable = nullptr;
bool joinHasNullKeys = false;

try {
auto hashTableBuilder = ObjectStore::retrieve<gluten::HashTableBuilder>(getJoin(hashTableId));
joinHasNullKeys = hashTableBuilder->joinHasNullKeys();
auto originalShared = hashTableBuilder->hashTable();
opaqueSharedHashTable = std::shared_ptr<core::OpaqueHashTable>(
originalShared, reinterpret_cast<core::OpaqueHashTable*>(originalShared.get()));

LOG(INFO) << "Successfully retrieved and aliased HashTable for reuse. ID: " << hashTableId;
} catch (const std::exception& e) {
LOG(WARNING)
<< "Error retrieving HashTable from ObjectStore: " << e.what()
<< ". Falling back to building new table. To ensure correct results, please verify that spark.gluten.velox.buildHashTableOncePerExecutor.enabled is set to false.";
opaqueSharedHashTable = nullptr;
if (hashTableBuildOncePerExecutorEnabled) {
try {
auto hashTableBuilder = ObjectStore::retrieve<gluten::HashTableBuilder>(getJoin(hashTableId));
joinHasNullKeys = hashTableBuilder->joinHasNullKeys();
auto originalShared = hashTableBuilder->hashTable();
opaqueSharedHashTable = std::shared_ptr<core::OpaqueHashTable>(
originalShared, reinterpret_cast<core::OpaqueHashTable*>(originalShared.get()));

LOG(INFO) << "Successfully retrieved and aliased HashTable for reuse. ID: " << hashTableId;
} catch (const std::exception& e) {
throw GlutenException(
"Error retrieving HashTable from ObjectStore: " + std::string(e.what()) +
" You can set spark.gluten.velox.buildHashTableOncePerExecutor.enabled"
" to false as workaround.");
}
}

// Create HashJoinNode node
Expand Down
10 changes: 10 additions & 0 deletions gluten-substrait/src/main/scala/org/apache/gluten/execution/JoinExecTransformer.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package org.apache.gluten.execution

import org.apache.gluten.backendsapi.BackendsApiManager
import org.apache.gluten.config.GlutenConfig
import org.apache.gluten.expression._
import org.apache.gluten.metrics.MetricsUpdater
import org.apache.gluten.sql.shims.SparkShimLoader
Expand Down Expand Up @@ -281,6 +282,12 @@ trait HashJoinLikeExecTransformer extends BaseJoinExec with TransformSupport {
// isBHJ: 0 for SHJ, 1 for BHJ
// isNullAwareAntiJoin: 0 for false, 1 for true
// buildHashTableId: the unique id for the hash table of build plan
val isHashTableBuildOncePerExecutor =
if (
BackendsApiManager.getSettings.enableHashTableBuildOncePerExecutor() &&
GlutenConfig.get.enableColumnarBroadcastExchange
) { 1 }
else 0
joinParametersStr
.append("isBHJ=")
.append(isBHJ)
Expand All @@ -291,6 +298,9 @@ trait HashJoinLikeExecTransformer extends BaseJoinExec with TransformSupport {
.append("buildHashTableId=")
.append(buildHashTableId)
.append("\n")
.append("isHashTableBuildOncePerExecutor=")
.append(isHashTableBuildOncePerExecutor)
.append("\n")
.append("isExistenceJoin=")
.append(if (joinType.isInstanceOf[ExistenceJoin]) 1 else 0)
.append("\n")
Expand Down
Loading