MultiFileReaderColumnMapping -> MultiFileReaderColumnMappingMode

Tishj · Dec 13, 2024 · 1c9ff9a · 1c9ff9a
1 parent d70eeb3
commit 1c9ff9a
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 20 deletions.
diff --git a/extension/parquet/parquet_extension.cpp b/extension/parquet/parquet_extension.cpp
@@ -266,7 +266,7 @@ static MultiFileReaderBindData BindSchema(ClientContext &context, vector<Logical
 	vector<string> schema_col_names;
 	vector<LogicalType> 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
@@ -2273,22 +2273,22 @@ MetricsType EnumUtil::FromString<MetricsType>(const char *value) {
 	return static_cast<MetricsType>(StringUtil::StringToEnum(GetMetricsTypeValues(), 48, "MetricsType", value));
 }
 
-const StringUtil::EnumStringLiteral *GetMultiFileReaderColumnMappingValues() {
+const StringUtil::EnumStringLiteral *GetMultiFileReaderColumnMappingModeValues() {
 	static constexpr StringUtil::EnumStringLiteral values[] {
-		{ static_cast<uint32_t>(MultiFileReaderColumnMapping::BY_NAME), "BY_NAME" },
-		{ static_cast<uint32_t>(MultiFileReaderColumnMapping::BY_FIELD_ID), "BY_FIELD_ID" }
+		{ static_cast<uint32_t>(MultiFileReaderColumnMappingMode::BY_NAME), "BY_NAME" },
+		{ static_cast<uint32_t>(MultiFileReaderColumnMappingMode::BY_FIELD_ID), "BY_FIELD_ID" }
 	};
 	return values;
 }
 
 template<>
-const char* EnumUtil::ToChars<MultiFileReaderColumnMapping>(MultiFileReaderColumnMapping value) {
-	return StringUtil::EnumToString(GetMultiFileReaderColumnMappingValues(), 2, "MultiFileReaderColumnMapping", static_cast<uint32_t>(value));
+const char* EnumUtil::ToChars<MultiFileReaderColumnMappingMode>(MultiFileReaderColumnMappingMode value) {
+	return StringUtil::EnumToString(GetMultiFileReaderColumnMappingModeValues(), 2, "MultiFileReaderColumnMappingMode", static_cast<uint32_t>(value));
 }
 
 template<>
-MultiFileReaderColumnMapping EnumUtil::FromString<MultiFileReaderColumnMapping>(const char *value) {
-	return static_cast<MultiFileReaderColumnMapping>(StringUtil::StringToEnum(GetMultiFileReaderColumnMappingValues(), 2, "MultiFileReaderColumnMapping", value));
+MultiFileReaderColumnMappingMode EnumUtil::FromString<MultiFileReaderColumnMappingMode>(const char *value) {
+	return static_cast<MultiFileReaderColumnMappingMode>(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
@@ -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<string>();
-		options.mapping = EnumUtil::FromString<MultiFileReaderColumnMapping>(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<MultiFileReaderGlobalState> 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
@@ -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>(MetricsType value);
 
 template<>
-const char* EnumUtil::ToChars<MultiFileReaderColumnMapping>(MultiFileReaderColumnMapping value);
+const char* EnumUtil::ToChars<MultiFileReaderColumnMappingMode>(MultiFileReaderColumnMappingMode value);
 
 template<>
 const char* EnumUtil::ToChars<NType>(NType value);
@@ -1160,7 +1160,7 @@ template<>
 MetricsType EnumUtil::FromString<MetricsType>(const char *value);
 
 template<>
-MultiFileReaderColumnMapping EnumUtil::FromString<MultiFileReaderColumnMapping>(const char *value);
+MultiFileReaderColumnMappingMode EnumUtil::FromString<MultiFileReaderColumnMappingMode>(const char *value);
 
 template<>
 NType EnumUtil::FromString<NType>(const char *value);

diff --git 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<MultiFileReaderColumnDefinition> 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
@@ -17,15 +17,15 @@ 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;
 	bool hive_partitioning = false;
 	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<LogicalType> hive_types_schema;