Skip to content

GH-49081: [C++][Parquet] Correct variant's extension name #49082

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
HuaHuaY wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −5
Open

GH-49081: [C++][Parquet] Correct variant's extension name #49082

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
6 changes: 3 additions & 3 deletions cpp/src/parquet/arrow/schema.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ Status FieldToNode(const std::string& name, const std::shared_ptr<Field>& field,
ARROW_ASSIGN_OR_RAISE(logical_type,
LogicalTypeFromGeoArrowMetadata(ext_type->Serialize()));
break;
} else if (ext_type->extension_name() == std::string("parquet.variant")) {
} else if (ext_type->extension_name() == std::string("arrow.parquet.variant")) {
auto variant_type = std::static_pointer_cast<VariantExtensionType>(field->type());

return VariantToNode(variant_type, name, field->nullable(), field_id, properties,
Expand Down Expand Up @@ -597,7 +597,7 @@ Status GroupToStruct(const GroupNode& node, LevelInfo current_levels,
auto struct_type = ::arrow::struct_(arrow_fields);
if (ctx->properties.get_arrow_extensions_enabled() &&
node.logical_type()->is_variant()) {
auto extension_type = ::arrow::GetExtensionType("parquet.variant");
auto extension_type = ::arrow::GetExtensionType("arrow.parquet.variant");
if (extension_type) {
ARROW_ASSIGN_OR_RAISE(
struct_type,
Expand Down Expand Up @@ -1147,7 +1147,7 @@ Result<bool> ApplyOriginalMetadata(const Field& origin_field, SchemaField* infer
extension_supports_inferred_storage =
arrow_extension_inferred ||
::arrow::extension::UuidType::IsSupportedStorageType(inferred_type);
} else if (origin_extension_name == "parquet.variant") {
} else if (origin_extension_name == "arrow.parquet.variant") {
extension_supports_inferred_storage =
arrow_extension_inferred ||
VariantExtensionType::IsSupportedStorageType(inferred_type);
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/parquet/arrow/variant_internal.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ std::string VariantExtensionType::Serialize() const { return ""; }
std::shared_ptr<Array> VariantExtensionType::MakeArray(
std::shared_ptr<ArrayData> data) const {
DCHECK_EQ(data->type->id(), Type::EXTENSION);
DCHECK_EQ("parquet.variant",
DCHECK_EQ("arrow.parquet.variant",
::arrow::internal::checked_cast<const ExtensionType&>(*data->type)
.extension_name());
return std::make_shared<VariantArray>(data);
Expand Down
2 changes: 1 addition & 1 deletion cpp/src/parquet/arrow/variant_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class PARQUET_EXPORT VariantExtensionType : public ::arrow::ExtensionType {
public:
explicit VariantExtensionType(const std::shared_ptr<::arrow::DataType>& storage_type);

std::string extension_name() const override { return "parquet.variant"; }
std::string extension_name() const override { return "arrow.parquet.variant"; }
Copy link
Member

@wgtmac wgtmac Jan 31, 2026

Choose a reason for hiding this comment

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

This change looks good.

Do you think it is worth adding a kVariantExtensionName in this file and move this file to cpp/src/arrow/extension/parquet_variant.h?

WDYT? @pitrou


bool ExtensionEquals(const ::arrow::ExtensionType& other) const override;

Expand Down
Loading