From ff8462812851f75e87ea541ce6f96d31ec79b875 Mon Sep 17 00:00:00 2001 From: ben fleis Date: Wed, 8 Jul 2026 16:43:51 +0200 Subject: [PATCH] ALL YOUR PATCHES ARE BELONG TO DELTA apply 2 more patches that arrived while I was fixing the last batch. --- duckdb | 2 +- src/delta_extension.cpp | 2 ++ src/delta_utils.cpp | 1 + src/functions/delta_scan/delta_multi_file_list.cpp | 1 + src/functions/delta_transaction_utils/idempotency_helpers.cpp | 2 ++ src/include/delta_log_types.hpp | 2 ++ src/include/storage/delta_insert.hpp | 2 ++ src/include/storage/delta_transaction.hpp | 1 + src/storage/delta_catalog.cpp | 1 + src/storage/delta_insert.cpp | 1 + src/storage/delta_transaction.cpp | 3 +++ 11 files changed, 17 insertions(+), 1 deletion(-) diff --git a/duckdb b/duckdb index 2daa4fc9..985b2f25 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit 2daa4fc9a48c638d10dcc613b1ed15d56c66f5b0 +Subproject commit 985b2f2515adf44ea65dd4239c7bfb30981b94dc diff --git a/src/delta_extension.cpp b/src/delta_extension.cpp index e240dd60..28381f9e 100644 --- a/src/delta_extension.cpp +++ b/src/delta_extension.cpp @@ -9,6 +9,8 @@ #include "duckdb.hpp" #include "duckdb/common/exception.hpp" +#include "duckdb/parser/parsed_data/attach_info.hpp" +#include "duckdb/main/attached_database.hpp" #include "duckdb/function/table_macro_function.hpp" #include "duckdb/main/extension/extension_loader.hpp" #include "duckdb/main/extension_helper.hpp" diff --git a/src/delta_utils.cpp b/src/delta_utils.cpp index a0ef85cb..cc20956d 100644 --- a/src/delta_utils.cpp +++ b/src/delta_utils.cpp @@ -6,6 +6,7 @@ #include "delta_log_types.hpp" #include "functions/delta_scan/delta_multi_file_list.hpp" #include "duckdb/common/operator/decimal_cast_operators.hpp" +#include "duckdb/logging/logger.hpp" #include "duckdb.hpp" #include "duckdb/planner/expression/bound_columnref_expression.hpp" diff --git a/src/functions/delta_scan/delta_multi_file_list.cpp b/src/functions/delta_scan/delta_multi_file_list.cpp index d2f74b6b..3f01498d 100644 --- a/src/functions/delta_scan/delta_multi_file_list.cpp +++ b/src/functions/delta_scan/delta_multi_file_list.cpp @@ -3,6 +3,7 @@ #include "functions/delta_scan/delta_multi_file_reader.hpp" #include "duckdb/common/local_file_system.hpp" +#include "duckdb/logging/logger.hpp" #include "duckdb/function/table_function.hpp" #include "duckdb/main/client_data.hpp" #include "duckdb/main/extension_helper.hpp" diff --git a/src/functions/delta_transaction_utils/idempotency_helpers.cpp b/src/functions/delta_transaction_utils/idempotency_helpers.cpp index 0f5896dd..8bdd603e 100644 --- a/src/functions/delta_transaction_utils/idempotency_helpers.cpp +++ b/src/functions/delta_transaction_utils/idempotency_helpers.cpp @@ -1,5 +1,7 @@ #include "delta_kernel_ffi.hpp" #include "duckdb/execution/expression_executor.hpp" +#include "duckdb/catalog/entry_lookup_info.hpp" +#include "duckdb/catalog/catalog.hpp" #include "duckdb/execution/expression_executor.hpp" #include "duckdb/function/scalar_function.hpp" #include "duckdb/planner/expression/bound_constant_expression.hpp" diff --git a/src/include/delta_log_types.hpp b/src/include/delta_log_types.hpp index 36654d61..08ece947 100644 --- a/src/include/delta_log_types.hpp +++ b/src/include/delta_log_types.hpp @@ -11,6 +11,8 @@ #define DEFINE_DEFAULT_ENGINE_BASE 1 #include "delta_kernel_ffi.hpp" #include "duckdb/main/database.hpp" +#include "duckdb/logging/log_type.hpp" +#include "duckdb/logging/log_manager.hpp" namespace duckdb { diff --git a/src/include/storage/delta_insert.hpp b/src/include/storage/delta_insert.hpp index ed8e2af8..e09ab07f 100644 --- a/src/include/storage/delta_insert.hpp +++ b/src/include/storage/delta_insert.hpp @@ -9,6 +9,8 @@ #pragma once #include "duckdb/execution/operator/persistent/physical_copy_to_file.hpp" +#include "duckdb/catalog/catalog_entry/schema_catalog_entry.hpp" +#include "duckdb/planner/parsed_data/bound_create_table_info.hpp" #include "duckdb/execution/physical_operator.hpp" #include "duckdb/common/index_vector.hpp" diff --git a/src/include/storage/delta_transaction.hpp b/src/include/storage/delta_transaction.hpp index a3f95ad1..e9b52b7c 100644 --- a/src/include/storage/delta_transaction.hpp +++ b/src/include/storage/delta_transaction.hpp @@ -16,6 +16,7 @@ class DeltaCatalog; class DeltaSchemaEntry; class DeltaTableEntry; class DeltaMultiFileList; +class TableFunctionCatalogEntry; struct DeltaDataFile; struct DeltaMultiFileColumnDefinition; diff --git a/src/storage/delta_catalog.cpp b/src/storage/delta_catalog.cpp index 44271141..ace86dfa 100644 --- a/src/storage/delta_catalog.cpp +++ b/src/storage/delta_catalog.cpp @@ -5,6 +5,7 @@ #include "duckdb/parser/parsed_data/drop_info.hpp" #include "duckdb/parser/parsed_data/create_schema_info.hpp" #include "duckdb/main/attached_database.hpp" +#include "duckdb/planner/logical_operator.hpp" #include "functions/delta_scan/delta_multi_file_list.hpp" diff --git a/src/storage/delta_insert.cpp b/src/storage/delta_insert.cpp index eadde223..c4f2e133 100644 --- a/src/storage/delta_insert.cpp +++ b/src/storage/delta_insert.cpp @@ -4,6 +4,7 @@ #include "duckdb/common/path.hpp" #include "duckdb/catalog/catalog_entry_retriever.hpp" +#include "duckdb/execution/physical_plan_generator.hpp" #include "duckdb/catalog/catalog_entry/copy_function_catalog_entry.hpp" #include "duckdb/main/client_data.hpp" #include "duckdb/planner/operator/logical_copy_to_file.hpp" diff --git a/src/storage/delta_transaction.cpp b/src/storage/delta_transaction.cpp index 58db4319..07e7e889 100644 --- a/src/storage/delta_transaction.cpp +++ b/src/storage/delta_transaction.cpp @@ -9,6 +9,9 @@ #include "storage/delta_catalog.hpp" #include "duckdb/main/client_properties.hpp" +#include "duckdb/logging/logging.hpp" +#include "duckdb/logging/logger.hpp" +#include "duckdb/common/exception/transaction_exception.hpp" #include "duckdb/common/arrow/arrow_converter.hpp" #include "duckdb/common/arrow/arrow_appender.hpp" #include "duckdb/catalog/catalog_entry/view_catalog_entry.hpp"