vendor: Update vendored sources to duckdb/duckdb@cd9b4ef

MultiFileReader: simplify constant handling, and allow virtual columns returned by the multi file reader to be constant (duckdb/duckdb#17149)

Author: krlmlr

src/duckdb/src/common/multi_file/multi_file_column_mapper.cpp

@@ -425,6 +425,11 @@ ResultColumnMapping MultiFileColumnMapper::CreateColumnMappingByMapper(const Col
 			auto expr =
 			    multi_file_reader.GetVirtualColumnExpression(context, reader_data, local_columns, global_column_id,
 			                                                 virtual_column_type, local_idx, global_column_reference);
+			if (expr && expr->type == ExpressionType::VALUE_CONSTANT) {
+				// the column is constant after all - handle it
+				expressions.push_back(std::move(expr));
+				continue;
+			}
 			if (!global_column_reference) {
 				auto is_reference = expr->type == ExpressionType::BOUND_REF;
 				expressions.push_back(std::move(expr));
@@ -626,6 +631,23 @@ static bool EvaluateFilterAgainstConstant(TableFilter &filter, const Value &cons
 	}
 }
 
+Value MultiFileColumnMapper::GetConstantValue(idx_t global_index) {
+	auto global_column_id = global_column_ids[global_index].GetPrimaryIndex();
+	auto &expr = reader_data.expressions[global_index];
+	if (expr->type == ExpressionType::VALUE_CONSTANT) {
+		return expr->Cast<BoundConstantExpression>().value;
+	}
+	for (idx_t i = 0; i < reader_data.constant_map.size(); i++) {
+		auto &constant_map_entry = reader_data.constant_map[MultiFileConstantMapIndex(i)];
+		if (constant_map_entry.column_idx.GetIndex() == global_index) {
+			return constant_map_entry.value;
+		}
+	}
+	auto &global_column = global_columns[global_column_id];
+	throw InternalException("Column '%s' is not present in the file, but no constant_map entry exists for it!",
+	                        global_column.name);
+}
+
 ReaderInitializeType
 MultiFileColumnMapper::EvaluateConstantFilters(ResultColumnMapping &mapping,
                                                map<idx_t, reference<TableFilter>> &remaining_filters) {
@@ -645,36 +667,7 @@ MultiFileColumnMapper::EvaluateConstantFilters(ResultColumnMapping &mapping,
 		}
 
 		//! FIXME: this does not check for filters against struct fields that are not present in the file
-		auto global_column_id = global_column_ids[global_index].GetPrimaryIndex();
-		Value constant_value;
-		auto virtual_it = virtual_columns.find(global_column_id);
-		if (virtual_it != virtual_columns.end()) {
-			auto &virtual_column = virtual_it->second;
-			if (virtual_column.name == "filename") {
-				constant_value = Value(reader_data.reader->GetFileName());
-			} else if (global_column_id == MultiFileReader::COLUMN_IDENTIFIER_FILE_INDEX) {
-				constant_value = Value::UBIGINT(reader_data.reader->file_list_idx.GetIndex());
-			} else {
-				throw InternalException("Unrecognized virtual column found: %s", virtual_column.name);
-			}
-		} else {
-			bool has_constant = false;
-			for (idx_t i = 0; i < reader_data.constant_map.size(); i++) {
-				auto &constant_map_entry = reader_data.constant_map[MultiFileConstantMapIndex(i)];
-				if (constant_map_entry.column_idx.GetIndex() == global_index) {
-					has_constant = true;
-					constant_value = constant_map_entry.value;
-					break;
-				}
-			}
-			if (!has_constant) {
-				auto &global_column = global_columns[global_column_id];
-				throw InternalException(
-				    "Column '%s' is not present in the file, but no constant_map entry exists for it!",
-				    global_column.name);
-			}
-		}
-
+		auto constant_value = GetConstantValue(global_index);
 		if (!EvaluateFilterAgainstConstant(*global_filter, constant_value)) {
 			return ReaderInitializeType::SKIP_READING_FILE;
 		}

src/duckdb/src/common/multi_file/multi_file_reader.cpp

@@ -22,6 +22,7 @@ constexpr column_t MultiFileReader::COLUMN_IDENTIFIER_FILE_INDEX;
 constexpr int32_t MultiFileReader::ORDINAL_FIELD_ID;
 constexpr int32_t MultiFileReader::FILENAME_FIELD_ID;
 constexpr int32_t MultiFileReader::ROW_ID_FIELD_ID;
+constexpr int32_t MultiFileReader::LAST_UPDATED_SEQUENCE_NUMBER_ID;
 
 MultiFileReaderGlobalState::~MultiFileReaderGlobalState() {
 }

src/duckdb/src/function/table/version/pragma_version.cpp

@@ -1,5 +1,5 @@
 #ifndef DUCKDB_PATCH_VERSION
-#define DUCKDB_PATCH_VERSION "0-dev2575"
+#define DUCKDB_PATCH_VERSION "0-dev2577"
 #endif
 #ifndef DUCKDB_MINOR_VERSION
 #define DUCKDB_MINOR_VERSION 3
@@ -8,10 +8,10 @@
 #define DUCKDB_MAJOR_VERSION 1
 #endif
 #ifndef DUCKDB_VERSION
-#define DUCKDB_VERSION "v1.3.0-dev2575"
+#define DUCKDB_VERSION "v1.3.0-dev2577"
 #endif
 #ifndef DUCKDB_SOURCE_ID
-#define DUCKDB_SOURCE_ID "453acf2e75"
+#define DUCKDB_SOURCE_ID "cd9b4eff85"
 #endif
 #include "duckdb/function/table/system_functions.hpp"
 #include "duckdb/main/database.hpp"

src/duckdb/src/include/duckdb/common/multi_file/multi_file_column_mapper.hpp

@@ -34,6 +34,7 @@ class MultiFileColumnMapper {
 	unique_ptr<TableFilterSet> CreateFilters(map<idx_t, reference<TableFilter>> &filters, ResultColumnMapping &mapping);
 	ReaderInitializeType EvaluateConstantFilters(ResultColumnMapping &mapping,
 	                                             map<idx_t, reference<TableFilter>> &remaining_filters);
+	Value GetConstantValue(idx_t global_index);
 
 private:
 	ClientContext &context;

src/duckdb/src/include/duckdb/common/multi_file/multi_file_reader.hpp

@@ -39,8 +39,10 @@ struct MultiFileReader {
 	static constexpr int32_t ORDINAL_FIELD_ID = 2147483645;
 	// Reserved field id used for the "_pos" field according to the iceberg spec (used for file_row_number)
 	static constexpr int32_t FILENAME_FIELD_ID = 2147483646;
-	// Reserved field id used for the "_row_id" field according to the iceberg spec (used for file_row_number)
+	// Reserved field id used for the "_row_id" field according to the iceberg spec
 	static constexpr int32_t ROW_ID_FIELD_ID = 2147483540;
+	// Reserved field id used for the "_last_updated_sequence_number" field according to the iceberg spec
+	static constexpr int32_t LAST_UPDATED_SEQUENCE_NUMBER_ID = 2147483539;
 
 public:
 	virtual ~MultiFileReader();