Skip to content

fix: Extract serde params from additionalTableParameters in CTAS #27340

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
aditi-pandit merged 1 commit into from
Mar 17, 2026
Merged

fix: Extract serde params from additionalTableParameters in CTAS #27340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion presto-native-execution/presto_cpp/main/connectors/HivePrestoToVeloxConnector.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@

#include "presto_cpp/main/connectors/HivePrestoToVeloxConnector.h"

#include <string_view>
#include <unordered_set>

#include "presto_cpp/main/connectors/PrestoToVeloxConnectorUtils.h"
#include "presto_cpp/main/types/PrestoToVeloxExpr.h"
#include "presto_cpp/main/types/TypeParser.h"
Expand Down Expand Up @@ -403,14 +406,18 @@ HivePrestoToVeloxConnector::toVeloxInsertTableHandle(
bool isPartitioned{false};
const auto inputColumns = toHiveColumns(
hiveOutputTableHandle->inputColumns, typeParser, isPartitioned);
auto serdeParameters =
extractSerdeParameters(hiveOutputTableHandle->additionalTableParameters);

return std::make_unique<velox::connector::hive::HiveInsertTableHandle>(
inputColumns,
toLocationHandle(hiveOutputTableHandle->locationHandle),
toFileFormat(hiveOutputTableHandle->actualStorageFormat, "TableWrite"),
toHiveBucketProperty(
inputColumns, hiveOutputTableHandle->bucketProperty, typeParser),
std::optional(
toFileCompressionKind(hiveOutputTableHandle->compressionCodec)));
toFileCompressionKind(hiveOutputTableHandle->compressionCodec)),
std::move(serdeParameters));
}

std::unique_ptr<velox::connector::ConnectorInsertTableHandle>
Expand Down
31 changes: 31 additions & 0 deletions presto-native-execution/presto_cpp/main/connectors/PrestoToVeloxConnectorUtils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,4 +807,35 @@ std::unique_ptr<velox::connector::ConnectorTableHandle> toHiveTableHandle(
columnHandles);
}

void extractNimbleSerdeParameters(
const std::map<std::string, std::string>& tableParameters,
std::unordered_map<std::string, std::string>& serdeParameters) {
static constexpr std::string_view kNimblePrefix{"nimble."};
for (const auto& [key, value] : tableParameters) {
if (key.compare(0, kNimblePrefix.size(), kNimblePrefix) == 0) {
serdeParameters[key] = value;
}
}
}
Comment on lines +810 to +819
Copy link
Copy Markdown
Contributor

@tanjialiang tanjialiang Mar 17, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We probably don't need a separate method for this. Putting it inside the original extract method might be sufficient.


std::unordered_map<std::string, std::string> extractSerdeParameters(
const std::map<std::string, std::string>& tableParameters) {
static const std::unordered_set<std::string> kSerdeKeys = {
"field.delim",
"escape.delim",
"collection.delim",
"mapkey.delim",
"serialization.format",
};

std::unordered_map<std::string, std::string> serdeParameters;
for (const auto& [key, value] : tableParameters) {
if (kSerdeKeys.count(key) > 0) {
serdeParameters[key] = value;
}
}
extractNimbleSerdeParameters(tableParameters, serdeParameters);
return serdeParameters;
}

} // namespace facebook::presto
13 changes: 13 additions & 0 deletions presto-native-execution/presto_cpp/main/connectors/PrestoToVeloxConnectorUtils.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
*/
#pragma once

#include <unordered_map>

#include "presto_cpp/main/types/PrestoToVeloxExpr.h"
#include "presto_cpp/presto_protocol/connector/hive/presto_protocol_hive.h"
#include "presto_cpp/presto_protocol/core/presto_protocol_core.h"
Expand Down Expand Up @@ -62,4 +64,15 @@ std::unique_ptr<velox::connector::ConnectorTableHandle> toHiveTableHandle(
const VeloxExprConverter& exprConverter,
const TypeParser& typeParser);

/// Extracts nimble serde parameters (nimble.*) from table parameters.
void extractNimbleSerdeParameters(
const std::map<std::string, std::string>& tableParameters,
std::unordered_map<std::string, std::string>& serdeParameters);

/// Extracts serde parameters (textfile delimiters and nimble.* config) from
/// additionalTableParameters during CTAS.
/// Mirrors Java's HiveMetadata.extractSerdeParameters().
std::unordered_map<std::string, std::string> extractSerdeParameters(
const std::map<std::string, std::string>& tableParameters);

} // namespace facebook::presto
135 changes: 135 additions & 0 deletions presto-native-execution/presto_cpp/main/types/tests/PrestoToVeloxConnectorTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "presto_cpp/presto_protocol/connector/iceberg/IcebergConnectorProtocol.h"
#include "velox/common/base/tests/GTestUtils.h"
#include "velox/connectors/hive/HiveConnector.h"
#include "velox/connectors/hive/HiveDataSink.h"
#include "velox/connectors/hive/TableHandle.h"
#include "velox/connectors/hive/iceberg/IcebergColumnHandle.h"

Expand Down Expand Up @@ -293,3 +294,137 @@ TEST_F(PrestoToVeloxConnectorTest, icebergColumnHandleDeeplyNested) {
ASSERT_EQ(icebergHandle->field().children[0].children.size(), 1);
EXPECT_EQ(icebergHandle->field().children[0].children[0].fieldId, 3);
}

TEST_F(PrestoToVeloxConnectorTest, ctasPassesTextfileSerdeParameters) {
auto hiveOutputTableHandle =
std::make_shared<protocol::hive::HiveOutputTableHandle>();
hiveOutputTableHandle->schemaName = "test_schema";
hiveOutputTableHandle->tableName = "test_table";
hiveOutputTableHandle->tableOwner = "owner";
hiveOutputTableHandle->actualStorageFormat =
protocol::hive::HiveStorageFormat::TEXTFILE;
hiveOutputTableHandle->tableStorageFormat =
protocol::hive::HiveStorageFormat::TEXTFILE;
hiveOutputTableHandle->partitionStorageFormat =
protocol::hive::HiveStorageFormat::TEXTFILE;
hiveOutputTableHandle->compressionCodec =
protocol::hive::HiveCompressionCodec::NONE;
hiveOutputTableHandle->locationHandle.targetPath = "/path/to/target";
hiveOutputTableHandle->locationHandle.writePath = "/path/to/write";
hiveOutputTableHandle->locationHandle.tableType =
protocol::hive::TableType::NEW;
hiveOutputTableHandle->additionalTableParameters = {
{"field.delim", "|"},
{"escape.delim", "\\"},
{"collection.delim", "$"},
{"mapkey.delim", "#"},
{"presto.version", "0.297"}};

protocol::OutputTableHandle outputHandle;
outputHandle.connectorId = "hive";
outputHandle.connectorHandle = hiveOutputTableHandle;

protocol::CreateHandle createHandle;
createHandle.handle = outputHandle;

HivePrestoToVeloxConnector hiveConnector("hive");
auto result =
hiveConnector.toVeloxInsertTableHandle(&createHandle, *typeParser_);
ASSERT_NE(result, nullptr);

auto* hiveInsert =
dynamic_cast<connector::hive::HiveInsertTableHandle*>(result.get());
ASSERT_NE(hiveInsert, nullptr);

const auto& serdeParams = hiveInsert->serdeParameters();
// Only serde keys should be extracted, not table-level keys like
// presto.version.
EXPECT_EQ(serdeParams.size(), 4);
EXPECT_EQ(serdeParams.at("field.delim"), "|");
EXPECT_EQ(serdeParams.at("escape.delim"), "\\");
EXPECT_EQ(serdeParams.at("collection.delim"), "$");
EXPECT_EQ(serdeParams.at("mapkey.delim"), "#");
}

TEST_F(PrestoToVeloxConnectorTest, ctasPassesNimbleSerdeParameters) {
auto hiveOutputTableHandle =
std::make_shared<protocol::hive::HiveOutputTableHandle>();
hiveOutputTableHandle->schemaName = "test_schema";
hiveOutputTableHandle->tableName = "test_table";
hiveOutputTableHandle->tableOwner = "owner";
hiveOutputTableHandle->actualStorageFormat =
protocol::hive::HiveStorageFormat::ALPHA;
hiveOutputTableHandle->tableStorageFormat =
protocol::hive::HiveStorageFormat::ALPHA;
hiveOutputTableHandle->partitionStorageFormat =
protocol::hive::HiveStorageFormat::ALPHA;
hiveOutputTableHandle->compressionCodec =
protocol::hive::HiveCompressionCodec::NONE;
hiveOutputTableHandle->locationHandle.targetPath = "/path/to/target";
hiveOutputTableHandle->locationHandle.writePath = "/path/to/write";
hiveOutputTableHandle->locationHandle.tableType =
protocol::hive::TableType::NEW;
hiveOutputTableHandle->additionalTableParameters = {
{"nimble.enable.vectorized.stats", "true"},
{"nimble.index.columns", "id"},
{"presto.version", "0.297"}};

protocol::OutputTableHandle outputHandle;
outputHandle.connectorId = "hive";
outputHandle.connectorHandle = hiveOutputTableHandle;

protocol::CreateHandle createHandle;
createHandle.handle = outputHandle;

HivePrestoToVeloxConnector hiveConnector("hive");
auto result =
hiveConnector.toVeloxInsertTableHandle(&createHandle, *typeParser_);
ASSERT_NE(result, nullptr);

auto* hiveInsert =
dynamic_cast<connector::hive::HiveInsertTableHandle*>(result.get());
ASSERT_NE(hiveInsert, nullptr);

const auto& serdeParams = hiveInsert->serdeParameters();
EXPECT_EQ(serdeParams.size(), 2);
EXPECT_EQ(serdeParams.at("nimble.enable.vectorized.stats"), "true");
EXPECT_EQ(serdeParams.at("nimble.index.columns"), "id");
}

TEST_F(PrestoToVeloxConnectorTest, ctasEmptySerdeParameters) {
auto hiveOutputTableHandle =
std::make_shared<protocol::hive::HiveOutputTableHandle>();
hiveOutputTableHandle->schemaName = "test_schema";
hiveOutputTableHandle->tableName = "test_table";
hiveOutputTableHandle->tableOwner = "owner";
hiveOutputTableHandle->actualStorageFormat =
protocol::hive::HiveStorageFormat::DWRF;
hiveOutputTableHandle->tableStorageFormat =
protocol::hive::HiveStorageFormat::DWRF;
hiveOutputTableHandle->partitionStorageFormat =
protocol::hive::HiveStorageFormat::DWRF;
hiveOutputTableHandle->compressionCodec =
protocol::hive::HiveCompressionCodec::NONE;
hiveOutputTableHandle->locationHandle.targetPath = "/path/to/target";
hiveOutputTableHandle->locationHandle.writePath = "/path/to/write";
hiveOutputTableHandle->locationHandle.tableType =
protocol::hive::TableType::NEW;

protocol::OutputTableHandle outputHandle;
outputHandle.connectorId = "hive";
outputHandle.connectorHandle = hiveOutputTableHandle;

protocol::CreateHandle createHandle;
createHandle.handle = outputHandle;

HivePrestoToVeloxConnector hiveConnector("hive");
auto result =
hiveConnector.toVeloxInsertTableHandle(&createHandle, *typeParser_);
ASSERT_NE(result, nullptr);

auto* hiveInsert =
dynamic_cast<connector::hive::HiveInsertTableHandle*>(result.get());
ASSERT_NE(hiveInsert, nullptr);

EXPECT_TRUE(hiveInsert->serdeParameters().empty());
}
Loading