From b0cccae123adec43a4529322e14f3c07ed5bfe7e Mon Sep 17 00:00:00 2001 From: DuckDB Labs GitHub Bot Date: Thu, 11 Dec 2025 06:49:34 +0000 Subject: [PATCH] Update vendored DuckDB sources to 200198b3e0 --- .../src/function/table/version/pragma_version.cpp | 6 +++--- src/duckdb/src/optimizer/filter_combiner.cpp | 2 +- .../optimizer/statistics/operator/propagate_get.cpp | 13 ++++++++----- src/duckdb/src/storage/data_table.cpp | 5 ----- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/duckdb/src/function/table/version/pragma_version.cpp b/src/duckdb/src/function/table/version/pragma_version.cpp index d5a1641f4..ef0645a98 100644 --- a/src/duckdb/src/function/table/version/pragma_version.cpp +++ b/src/duckdb/src/function/table/version/pragma_version.cpp @@ -1,5 +1,5 @@ #ifndef DUCKDB_PATCH_VERSION -#define DUCKDB_PATCH_VERSION "4-dev6" +#define DUCKDB_PATCH_VERSION "4-dev14" #endif #ifndef DUCKDB_MINOR_VERSION #define DUCKDB_MINOR_VERSION 4 @@ -8,10 +8,10 @@ #define DUCKDB_MAJOR_VERSION 1 #endif #ifndef DUCKDB_VERSION -#define DUCKDB_VERSION "v1.4.4-dev6" +#define DUCKDB_VERSION "v1.4.4-dev14" #endif #ifndef DUCKDB_SOURCE_ID -#define DUCKDB_SOURCE_ID "e92f41065f" +#define DUCKDB_SOURCE_ID "200198b3e0" #endif #include "duckdb/function/table/system_functions.hpp" #include "duckdb/main/database.hpp" diff --git a/src/duckdb/src/optimizer/filter_combiner.cpp b/src/duckdb/src/optimizer/filter_combiner.cpp index f7099c9a1..e2480b963 100644 --- a/src/duckdb/src/optimizer/filter_combiner.cpp +++ b/src/duckdb/src/optimizer/filter_combiner.cpp @@ -367,7 +367,7 @@ FilterPushdownResult FilterCombiner::TryPushdownConstantFilter(TableFilterSet &t void ReplaceWithBoundReference(unique_ptr &root_expr) { ExpressionIterator::VisitExpressionMutable( root_expr, [&](BoundColumnRefExpression &col_ref, unique_ptr &expr) { - expr = make_uniq(col_ref.return_type, 0ULL); + expr = make_uniq(col_ref.alias, col_ref.return_type, 0ULL); }); } diff --git a/src/duckdb/src/optimizer/statistics/operator/propagate_get.cpp b/src/duckdb/src/optimizer/statistics/operator/propagate_get.cpp index b01f7d704..5112832b1 100644 --- a/src/duckdb/src/optimizer/statistics/operator/propagate_get.cpp +++ b/src/duckdb/src/optimizer/statistics/operator/propagate_get.cpp @@ -15,13 +15,15 @@ namespace duckdb { -static void GetColumnIndex(unique_ptr &expr, idx_t &index) { +static void GetColumnIndex(unique_ptr &expr, idx_t &index, string &alias) { if (expr->type == ExpressionType::BOUND_REF) { auto &bound_ref = expr->Cast(); index = bound_ref.index; + alias = bound_ref.alias; return; } - ExpressionIterator::EnumerateChildren(*expr, [&](unique_ptr &child) { GetColumnIndex(child, index); }); + ExpressionIterator::EnumerateChildren(*expr, + [&](unique_ptr &child) { GetColumnIndex(child, index, alias); }); } FilterPropagateResult StatisticsPropagator::PropagateTableFilter(ColumnBinding stats_binding, BaseStatistics &stats, @@ -32,15 +34,16 @@ FilterPropagateResult StatisticsPropagator::PropagateTableFilter(ColumnBinding s // get physical storage index of the filter // since it is a table filter, every storage index is the same idx_t physical_index = DConstants::INVALID_INDEX; - GetColumnIndex(expr_filter.expr, physical_index); + string column_alias; + GetColumnIndex(expr_filter.expr, physical_index, column_alias); D_ASSERT(physical_index != DConstants::INVALID_INDEX); - auto column_ref = make_uniq(stats.GetType(), stats_binding); + auto column_ref = make_uniq(column_alias, stats.GetType(), stats_binding); auto filter_expr = expr_filter.ToExpression(*column_ref); // handle the filter before updating the statistics // otherwise the filter can be pruned by the updated statistics auto propagate_result = HandleFilter(filter_expr); - auto colref = make_uniq(stats.GetType(), physical_index); + auto colref = make_uniq(column_alias, stats.GetType(), physical_index); UpdateFilterStatistics(*filter_expr); // replace BoundColumnRefs with BoundRefs diff --git a/src/duckdb/src/storage/data_table.cpp b/src/duckdb/src/storage/data_table.cpp index 6c23d9d27..2e0a2b55e 100644 --- a/src/duckdb/src/storage/data_table.cpp +++ b/src/duckdb/src/storage/data_table.cpp @@ -149,11 +149,6 @@ DataTable::DataTable(ClientContext &context, DataTable &parent, BoundConstraint // ALTER COLUMN to add a new constraint. - // Clone the storage info vector or the table. - for (const auto &index_info : parent.info->index_storage_infos) { - info->index_storage_infos.push_back(IndexStorageInfo(index_info.name)); - } - // Bind all indexes. info->BindIndexes(context);