Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions cpp/src/parquet/encryption/external/dbpa_enum_utils.cc
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ namespace parquet::encryption::external {
// parquet::Type -> dbps::external::Type
// Parquet types are coming from parquet/types.h
// ------------------------------------------------------------
// parquet::Type::UNDEFINED is excluded as it is not a
// Parquet type per-se, but rather a value used in exception cases.
const std::unordered_map<parquet::Type::type, dbps::external::Type::type>
DBPAEnumUtils::parquet_to_external_type_map = {
{parquet::Type::BOOLEAN, dbps::external::Type::BOOLEAN},
Expand All @@ -37,10 +39,8 @@ const std::unordered_map<parquet::Type::type, dbps::external::Type::type>
{parquet::Type::FLOAT, dbps::external::Type::FLOAT},
{parquet::Type::DOUBLE, dbps::external::Type::DOUBLE},
{parquet::Type::BYTE_ARRAY, dbps::external::Type::BYTE_ARRAY},
{parquet::Type::FIXED_LEN_BYTE_ARRAY, dbps::external::Type::FIXED_LEN_BYTE_ARRAY}};
// parquet::Type::UNDEFINED is excluded as it is not a
// Parquet type per-se, but rather a value used in exception cases.

{parquet::Type::FIXED_LEN_BYTE_ARRAY,
dbps::external::Type::FIXED_LEN_BYTE_ARRAY}};

// ------------------------------------------------------------
// arrow::Compression -> dbps::external::CompressionCodec
Expand Down
9 changes: 5 additions & 4 deletions cpp/src/parquet/encryption/external/dbpa_enum_utils_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ TEST_F(DBPAUtilsTest, AllValidTypeMappings) {
EXPECT_NO_THROW(DBPAEnumUtils::ParquetTypeToDBPA(parquet_type));
}

EXPECT_THROW(DBPAEnumUtils::ParquetTypeToDBPA(parquet::Type::UNDEFINED), std::invalid_argument);
EXPECT_THROW(DBPAEnumUtils::ParquetTypeToDBPA(parquet::Type::UNDEFINED),
std::invalid_argument);
}

TEST_F(DBPAUtilsTest, AllValidCompressionMappings) {
Expand All @@ -131,11 +132,11 @@ TEST_F(DBPAUtilsTest, MapSizeAssertions) {
// This provides a direct way to verify map completeness

// Parquet::Type::type assertions
EXPECT_EQ(parquet_type_enum_size_, 9)
<< "Expected 9 parquet type mappings";
EXPECT_EQ(parquet_type_enum_size_, 9) << "Expected 9 parquet type mappings";

// Excluding UNDEFINED
EXPECT_EQ(parquet_type_enum_size_ - 1, DBPAEnumUtils::parquet_to_external_type_map.size())
EXPECT_EQ(parquet_type_enum_size_ - 1,
DBPAEnumUtils::parquet_to_external_type_map.size())
<< "Expected 9 parquet type mappings (excluding UNDEFINED)";

// Excluding UNDEFINED
Expand Down
Loading