This is an automated email from the ASF dual-hosted git repository. rui pushed a commit to branch wip_data_col in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
commit d80c627cb2a025143478afa4ee71f1eff5e1606c Author: Rui Mo <[email protected]> AuthorDate: Fri May 23 17:41:02 2025 +0800 Use empty data columns --- cpp/velox/substrait/SubstraitToVeloxPlan.cc | 38 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 20 deletions(-) diff --git a/cpp/velox/substrait/SubstraitToVeloxPlan.cc b/cpp/velox/substrait/SubstraitToVeloxPlan.cc index d4ec14d085..a9080ea67e 100644 --- a/cpp/velox/substrait/SubstraitToVeloxPlan.cc +++ b/cpp/velox/substrait/SubstraitToVeloxPlan.cc @@ -583,17 +583,19 @@ std::shared_ptr<connector::hive::HiveInsertTableHandle> makeHiveInsertTableHandl } if (std::find(partitionedBy.cbegin(), partitionedBy.cend(), tableColumnNames.at(i)) != partitionedBy.cend()) { ++numPartitionColumns; - columnHandles.emplace_back(std::make_shared<connector::hive::HiveColumnHandle>( - tableColumnNames.at(i), - connector::hive::HiveColumnHandle::ColumnType::kPartitionKey, - tableColumnTypes.at(i), - tableColumnTypes.at(i))); + columnHandles.emplace_back( + std::make_shared<connector::hive::HiveColumnHandle>( + tableColumnNames.at(i), + connector::hive::HiveColumnHandle::ColumnType::kPartitionKey, + tableColumnTypes.at(i), + tableColumnTypes.at(i))); } else { - columnHandles.emplace_back(std::make_shared<connector::hive::HiveColumnHandle>( - tableColumnNames.at(i), - connector::hive::HiveColumnHandle::ColumnType::kRegular, - tableColumnTypes.at(i), - tableColumnTypes.at(i))); + columnHandles.emplace_back( + std::make_shared<connector::hive::HiveColumnHandle>( + tableColumnNames.at(i), + connector::hive::HiveColumnHandle::ColumnType::kRegular, + tableColumnTypes.at(i), + tableColumnTypes.at(i))); } } VELOX_CHECK_EQ(numPartitionColumns, partitionedBy.size()); @@ -1300,24 +1302,20 @@ core::PlanNodePtr SubstraitToVeloxPlanConverter::toVeloxPlan(const ::substrait:: // Velox requires Filter Pushdown must being enabled. bool filterPushdownEnabled = true; - auto names = colNameList; - auto types = veloxTypeList; - auto dataColumns = ROW(std::move(names), std::move(types)); std::shared_ptr<connector::hive::HiveTableHandle> tableHandle; if (!readRel.has_filter()) { tableHandle = std::make_shared<connector::hive::HiveTableHandle>( - kHiveConnectorId, "hive_table", filterPushdownEnabled, common::SubfieldFilters{}, nullptr, dataColumns); + kHiveConnectorId, "hive_table", filterPushdownEnabled, common::SubfieldFilters{}, nullptr); } else { + auto names = colNameList; + auto types = veloxTypeList; + auto dataColumns = ROW(std::move(names), std::move(types)); + common::SubfieldFilters subfieldFilters; auto remainingFilter = exprConverter_->toVeloxExpr(readRel.filter(), dataColumns); tableHandle = std::make_shared<connector::hive::HiveTableHandle>( - kHiveConnectorId, - "hive_table", - filterPushdownEnabled, - std::move(subfieldFilters), - remainingFilter, - dataColumns); + kHiveConnectorId, "hive_table", filterPushdownEnabled, std::move(subfieldFilters), remainingFilter); } // Get assignments and out names. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
