Skip to content

[GLUTEN-10621] Fix GPU connector CudfHiveTableHandle is not used #10843

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

Merged
zhouyuan merged 3 commits into from
Oct 7, 2025
Merged

[GLUTEN-10621] Fix GPU connector CudfHiveTableHandle is not used #10843

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
e0b7519
fix column handle
jinchengchenghh Oct 3, 2025
863bc13
fix session conf
jinchengchenghh Oct 3, 2025
3683d34
remove insert
jinchengchenghh Oct 4, 2025
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
43 changes: 13 additions & 30 deletions cpp/velox/substrait/SubstraitToVeloxPlan.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,23 +740,7 @@ core::PlanNodePtr SubstraitToVeloxPlanConverter::toVeloxPlan(const ::substrait::
// Spark's default compression code is snappy.
const auto& compressionKind =
writerOptions->compressionKind.value_or(common::CompressionKind::CompressionKind_SNAPPY);
std::shared_ptr<core::InsertTableHandle> tableHandle;
if (useCudfTableHandle(splitInfos_) && veloxCfg_->get<bool>(kCudfEnableTableScan, kCudfEnableTableScanDefault) &&
veloxCfg_->get<bool>(kCudfEnabled, kCudfEnabledDefault)) {
#ifdef GLUTEN_ENABLE_GPU
tableHandle = std::make_shared<core::InsertTableHandle>(
kCudfHiveConnectorId,
makeCudfHiveInsertTableHandle(
tableColumnNames, /*inputType->names() clolumn name is different*/
inputType->children(),
std::make_shared<cudf_velox::connector::hive::LocationHandle>(
writePath, cudf_velox::connector::hive::LocationHandle::TableType::kNew, fileName),
compressionKind,
{},
writerOptions));
#endif
} else {
tableHandle = std::make_shared<core::InsertTableHandle>(
std::shared_ptr<core::InsertTableHandle> tableHandle = std::make_shared<core::InsertTableHandle>(
kHiveConnectorId,
makeHiveInsertTableHandle(
tableColumnNames, /*inputType->names() clolumn name is different*/
Expand All @@ -767,7 +751,6 @@ core::PlanNodePtr SubstraitToVeloxPlanConverter::toVeloxPlan(const ::substrait::
writerOptions,
fileFormat,
compressionKind));
}
return std::make_shared<core::TableWriteNode>(
nextPlanNodeId(),
inputType,
Expand Down Expand Up @@ -1358,21 +1341,21 @@ core::PlanNodePtr SubstraitToVeloxPlanConverter::toVeloxPlan(const ::substrait::
auto dataColumns = ROW(std::move(names), std::move(types));
connector::ConnectorTableHandlePtr tableHandle;
auto remainingFilter = readRel.has_filter() ? exprConverter_->toVeloxExpr(readRel.filter(), dataColumns) : nullptr;
if (useCudfTableHandle(splitInfos_)) {
auto connectorId = kHiveConnectorId;
if (useCudfTableHandle(splitInfos_) && veloxCfg_->get<bool>(kCudfEnableTableScan, kCudfEnableTableScanDefault) &&
veloxCfg_->get<bool>(kCudfEnabled, kCudfEnabledDefault)) {
#ifdef GLUTEN_ENABLE_GPU
tableHandle = std::make_shared<CudfHiveTableHandle>(
kCudfHiveConnectorId, "cudf_hive_table", filterPushdownEnabled, nullptr, remainingFilter, dataColumns);
connectorId = kCudfHiveConnectorId;
#endif
} else {
common::SubfieldFilters subfieldFilters;
tableHandle = std::make_shared<connector::hive::HiveTableHandle>(
kHiveConnectorId,
"hive_table",
filterPushdownEnabled,
std::move(subfieldFilters),
remainingFilter,
dataColumns);
}
common::SubfieldFilters subfieldFilters;
tableHandle = std::make_shared<connector::hive::HiveTableHandle>(
connectorId,
"hive_table",
filterPushdownEnabled,
std::move(subfieldFilters),
remainingFilter,
dataColumns);

// Get assignments and out names.
std::vector<std::string> outNames;
Expand Down
3 changes: 2 additions & 1 deletion gluten-substrait/src/main/scala/org/apache/gluten/config/GlutenConfig.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,8 @@ object GlutenConfig extends ConfigRegistry {
"spark.gluten.sql.columnar.backend.velox.memoryUseHugePages",
"spark.gluten.sql.columnar.backend.velox.cachePrefetchMinPct",
"spark.gluten.sql.columnar.backend.velox.memoryPoolCapacityTransferAcrossTasks",
"spark.gluten.sql.columnar.backend.velox.preferredBatchBytes"
"spark.gluten.sql.columnar.backend.velox.preferredBatchBytes",
"spark.gluten.sql.columnar.backend.velox.cudf.enableTableScan"
)

/**
Expand Down
Loading