From 1c9ff9a2e8fefa78cdccd3f11947ab0981f4ad3e Mon Sep 17 00:00:00 2001 From: Tishj Date: Fri, 13 Dec 2024 15:21:34 +0100 Subject: [PATCH] MultiFileReaderColumnMapping -> MultiFileReaderColumnMappingMode --- extension/parquet/parquet_extension.cpp | 2 +- src/common/enum_util.cpp | 14 +++++++------- src/common/multi_file_reader.cpp | 9 +++------ src/include/duckdb/common/enum_util.hpp | 6 +++--- src/include/duckdb/common/multi_file_reader.hpp | 2 +- .../duckdb/common/multi_file_reader_options.hpp | 4 ++-- 6 files changed, 17 insertions(+), 20 deletions(-) diff --git a/extension/parquet/parquet_extension.cpp b/extension/parquet/parquet_extension.cpp index 689bbc5f0318..1dc1aa8d15db 100644 --- a/extension/parquet/parquet_extension.cpp +++ b/extension/parquet/parquet_extension.cpp @@ -266,7 +266,7 @@ static MultiFileReaderBindData BindSchema(ClientContext &context, vector schema_col_names; vector schema_col_types; MultiFileReaderBindData bind_data; - bind_data.mapping = MultiFileReaderColumnMapping::BY_FIELD_ID; + bind_data.mapping = MultiFileReaderColumnMappingMode::BY_FIELD_ID; schema_col_names.reserve(options.schema.size()); schema_col_types.reserve(options.schema.size()); for (const auto &column : options.schema) { diff --git a/src/common/enum_util.cpp b/src/common/enum_util.cpp index 03ab9231cda3..e455f23d751f 100644 --- a/src/common/enum_util.cpp +++ b/src/common/enum_util.cpp @@ -2273,22 +2273,22 @@ MetricsType EnumUtil::FromString(const char *value) { return static_cast(StringUtil::StringToEnum(GetMetricsTypeValues(), 48, "MetricsType", value)); } -const StringUtil::EnumStringLiteral *GetMultiFileReaderColumnMappingValues() { +const StringUtil::EnumStringLiteral *GetMultiFileReaderColumnMappingModeValues() { static constexpr StringUtil::EnumStringLiteral values[] { - { static_cast(MultiFileReaderColumnMapping::BY_NAME), "BY_NAME" }, - { static_cast(MultiFileReaderColumnMapping::BY_FIELD_ID), "BY_FIELD_ID" } + { static_cast(MultiFileReaderColumnMappingMode::BY_NAME), "BY_NAME" }, + { static_cast(MultiFileReaderColumnMappingMode::BY_FIELD_ID), "BY_FIELD_ID" } }; return values; } template<> -const char* EnumUtil::ToChars(MultiFileReaderColumnMapping value) { - return StringUtil::EnumToString(GetMultiFileReaderColumnMappingValues(), 2, "MultiFileReaderColumnMapping", static_cast(value)); +const char* EnumUtil::ToChars(MultiFileReaderColumnMappingMode value) { + return StringUtil::EnumToString(GetMultiFileReaderColumnMappingModeValues(), 2, "MultiFileReaderColumnMappingMode", static_cast(value)); } template<> -MultiFileReaderColumnMapping EnumUtil::FromString(const char *value) { - return static_cast(StringUtil::StringToEnum(GetMultiFileReaderColumnMappingValues(), 2, "MultiFileReaderColumnMapping", value)); +MultiFileReaderColumnMappingMode EnumUtil::FromString(const char *value) { + return static_cast(StringUtil::StringToEnum(GetMultiFileReaderColumnMappingModeValues(), 2, "MultiFileReaderColumnMappingMode", value)); } const StringUtil::EnumStringLiteral *GetNTypeValues() { diff --git a/src/common/multi_file_reader.cpp b/src/common/multi_file_reader.cpp index f2bd19334d1e..26cab8df1548 100644 --- a/src/common/multi_file_reader.cpp +++ b/src/common/multi_file_reader.cpp @@ -119,9 +119,6 @@ bool MultiFileReader::ParseOption(const string &key, const Value &val, MultiFile options.union_by_name = BooleanValue::Get(val); } else if (loption == "hive_types_autocast" || loption == "hive_type_autocast") { options.hive_types_autocast = BooleanValue::Get(val); - } else if (loption == "column_mapping") { - auto mapping = val.GetValue(); - options.mapping = EnumUtil::FromString(mapping); } else if (loption == "hive_types" || loption == "hive_type") { if (val.type().id() != LogicalTypeId::STRUCT) { throw InvalidInputException( @@ -474,18 +471,18 @@ void MultiFileReader::CreateNameMapping(const string &file_name, const MultiFileReaderBindData &bind_data, const string &initial_file, optional_ptr global_state) { switch (bind_data.mapping) { - case MultiFileReaderColumnMapping::BY_NAME: { + case MultiFileReaderColumnMappingMode::BY_NAME: { CreateMappingByName(file_name, local_columns, global_columns, global_column_ids, reader_data, bind_data, initial_file, global_state); break; } - case MultiFileReaderColumnMapping::BY_FIELD_ID: { + case MultiFileReaderColumnMappingMode::BY_FIELD_ID: { CreateMappingByFieldId(file_name, local_columns, global_columns, global_column_ids, reader_data, bind_data, initial_file, global_state); break; } default: { - throw InternalException("Unsupported MultiFileReaderColumnMapping type"); + throw InternalException("Unsupported MultiFileReaderColumnMappingMode type"); } } } diff --git a/src/include/duckdb/common/enum_util.hpp b/src/include/duckdb/common/enum_util.hpp index d95fae025401..f63708ca7f36 100644 --- a/src/include/duckdb/common/enum_util.hpp +++ b/src/include/duckdb/common/enum_util.hpp @@ -212,7 +212,7 @@ enum class MetaPipelineType : uint8_t; enum class MetricsType : uint8_t; -enum class MultiFileReaderColumnMapping : uint8_t; +enum class MultiFileReaderColumnMappingMode : uint8_t; enum class NType : uint8_t; @@ -646,7 +646,7 @@ template<> const char* EnumUtil::ToChars(MetricsType value); template<> -const char* EnumUtil::ToChars(MultiFileReaderColumnMapping value); +const char* EnumUtil::ToChars(MultiFileReaderColumnMappingMode value); template<> const char* EnumUtil::ToChars(NType value); @@ -1160,7 +1160,7 @@ template<> MetricsType EnumUtil::FromString(const char *value); template<> -MultiFileReaderColumnMapping EnumUtil::FromString(const char *value); +MultiFileReaderColumnMappingMode EnumUtil::FromString(const char *value); template<> NType EnumUtil::FromString(const char *value); diff --git a/src/include/duckdb/common/multi_file_reader.hpp b/src/include/duckdb/common/multi_file_reader.hpp index 7a05af75b6c5..a6d1ba55df7c 100644 --- a/src/include/duckdb/common/multi_file_reader.hpp +++ b/src/include/duckdb/common/multi_file_reader.hpp @@ -103,7 +103,7 @@ struct MultiFileReaderBindData { //! (optional) The schema set by the multi file reader vector schema; //! The method used to map local -> global columns - MultiFileReaderColumnMapping mapping = MultiFileReaderColumnMapping::BY_NAME; + MultiFileReaderColumnMappingMode mapping = MultiFileReaderColumnMappingMode::BY_NAME; DUCKDB_API void Serialize(Serializer &serializer) const; DUCKDB_API static MultiFileReaderBindData Deserialize(Deserializer &deserializer); diff --git a/src/include/duckdb/common/multi_file_reader_options.hpp b/src/include/duckdb/common/multi_file_reader_options.hpp index 790355b33b0f..32486cc8f7ae 100644 --- a/src/include/duckdb/common/multi_file_reader_options.hpp +++ b/src/include/duckdb/common/multi_file_reader_options.hpp @@ -17,7 +17,7 @@ namespace duckdb { struct BindInfo; class MultiFileList; -enum class MultiFileReaderColumnMapping : uint8_t { BY_NAME, BY_FIELD_ID }; +enum class MultiFileReaderColumnMappingMode : uint8_t { BY_NAME, BY_FIELD_ID }; struct MultiFileReaderOptions { bool filename = false; @@ -25,7 +25,7 @@ struct MultiFileReaderOptions { bool auto_detect_hive_partitioning = true; bool union_by_name = false; bool hive_types_autocast = true; - MultiFileReaderColumnMapping mapping = MultiFileReaderColumnMapping::BY_NAME; + MultiFileReaderColumnMappingMode mapping = MultiFileReaderColumnMappingMode::BY_NAME; case_insensitive_map_t hive_types_schema;