Skip to content

Commit a3be833

Browse files
duckdblabs-botgithub-actions[bot]
duckdblabs-bot
authored and
github-actions[bot]
committed
Update vendored DuckDB sources to 3073352fee
1 parent e3ebc15 commit a3be833

File tree

68 files changed

+1166
-641
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1166
-641
lines changed

‎CMakeLists.txt‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -346,47 +346,47 @@ set(DUCKDB_SRC_FILES
346346
src/duckdb/third_party/zstd/dict/fastcover.cpp
347347
src/duckdb/third_party/zstd/dict/zdict.cpp
348348
src/duckdb/extension/core_functions/core_functions_extension.cpp
349-
src/duckdb/extension/core_functions/lambda_functions.cpp
350349
src/duckdb/extension/core_functions/function_list.cpp
351-
src/duckdb/ub_extension_core_functions_scalar_date.cpp
352-
src/duckdb/ub_extension_core_functions_scalar_operators.cpp
353-
src/duckdb/ub_extension_core_functions_scalar_list.cpp
350+
src/duckdb/extension/core_functions/lambda_functions.cpp
351+
src/duckdb/ub_extension_core_functions_aggregate_algebraic.cpp
352+
src/duckdb/ub_extension_core_functions_aggregate_nested.cpp
353+
src/duckdb/ub_extension_core_functions_aggregate_holistic.cpp
354+
src/duckdb/ub_extension_core_functions_aggregate_regression.cpp
355+
src/duckdb/ub_extension_core_functions_aggregate_distributive.cpp
356+
src/duckdb/ub_extension_core_functions_scalar_generic.cpp
354357
src/duckdb/ub_extension_core_functions_scalar_array.cpp
355358
src/duckdb/ub_extension_core_functions_scalar_random.cpp
356-
src/duckdb/ub_extension_core_functions_scalar_bit.cpp
359+
src/duckdb/ub_extension_core_functions_scalar_list.cpp
360+
src/duckdb/ub_extension_core_functions_scalar_struct.cpp
361+
src/duckdb/ub_extension_core_functions_scalar_date.cpp
357362
src/duckdb/ub_extension_core_functions_scalar_enum.cpp
363+
src/duckdb/ub_extension_core_functions_scalar_operators.cpp
358364
src/duckdb/ub_extension_core_functions_scalar_math.cpp
359365
src/duckdb/ub_extension_core_functions_scalar_string.cpp
360-
src/duckdb/ub_extension_core_functions_scalar_union.cpp
361-
src/duckdb/ub_extension_core_functions_scalar_map.cpp
362366
src/duckdb/ub_extension_core_functions_scalar_debug.cpp
367+
src/duckdb/ub_extension_core_functions_scalar_bit.cpp
363368
src/duckdb/ub_extension_core_functions_scalar_blob.cpp
364-
src/duckdb/ub_extension_core_functions_scalar_struct.cpp
365-
src/duckdb/ub_extension_core_functions_scalar_generic.cpp
366-
src/duckdb/ub_extension_core_functions_aggregate_nested.cpp
367-
src/duckdb/ub_extension_core_functions_aggregate_regression.cpp
368-
src/duckdb/ub_extension_core_functions_aggregate_algebraic.cpp
369-
src/duckdb/ub_extension_core_functions_aggregate_holistic.cpp
370-
src/duckdb/ub_extension_core_functions_aggregate_distributive.cpp
371-
src/duckdb/extension/parquet/parquet_metadata.cpp
372-
src/duckdb/extension/parquet/serialize_parquet.cpp
373-
src/duckdb/extension/parquet/geo_parquet.cpp
374-
src/duckdb/extension/parquet/parquet_float16.cpp
375-
src/duckdb/extension/parquet/parquet_statistics.cpp
376-
src/duckdb/extension/parquet/parquet_file_metadata_cache.cpp
369+
src/duckdb/ub_extension_core_functions_scalar_union.cpp
370+
src/duckdb/ub_extension_core_functions_scalar_map.cpp
377371
src/duckdb/extension/parquet/parquet_crypto.cpp
378-
src/duckdb/extension/parquet/column_reader.cpp
372+
src/duckdb/extension/parquet/parquet_reader.cpp
373+
src/duckdb/extension/parquet/parquet_metadata.cpp
379374
src/duckdb/extension/parquet/parquet_writer.cpp
375+
src/duckdb/extension/parquet/zstd_file_system.cpp
376+
src/duckdb/extension/parquet/parquet_timestamp.cpp
380377
src/duckdb/extension/parquet/parquet_multi_file_info.cpp
381-
src/duckdb/extension/parquet/parquet_reader.cpp
382378
src/duckdb/extension/parquet/column_writer.cpp
383-
src/duckdb/extension/parquet/parquet_timestamp.cpp
384-
src/duckdb/extension/parquet/zstd_file_system.cpp
379+
src/duckdb/extension/parquet/geo_parquet.cpp
380+
src/duckdb/extension/parquet/parquet_file_metadata_cache.cpp
381+
src/duckdb/extension/parquet/parquet_statistics.cpp
385382
src/duckdb/extension/parquet/parquet_extension.cpp
386-
src/duckdb/ub_extension_parquet_reader.cpp
387-
src/duckdb/ub_extension_parquet_reader_variant.cpp
383+
src/duckdb/extension/parquet/parquet_float16.cpp
384+
src/duckdb/extension/parquet/serialize_parquet.cpp
385+
src/duckdb/extension/parquet/column_reader.cpp
388386
src/duckdb/ub_extension_parquet_decoder.cpp
389387
src/duckdb/ub_extension_parquet_writer.cpp
388+
src/duckdb/ub_extension_parquet_reader.cpp
389+
src/duckdb/ub_extension_parquet_reader_variant.cpp
390390
src/duckdb/third_party/parquet/parquet_types.cpp
391391
src/duckdb/third_party/thrift/thrift/protocol/TProtocol.cpp
392392
src/duckdb/third_party/thrift/thrift/transport/TTransportException.cpp
@@ -425,32 +425,32 @@ set(DUCKDB_SRC_FILES
425425
src/duckdb/third_party/brotli/enc/metablock.cpp
426426
src/duckdb/third_party/brotli/enc/static_dict.cpp
427427
src/duckdb/third_party/brotli/enc/utf8_util.cpp
428-
src/duckdb/extension/icu/./icu-table-range.cpp
429-
src/duckdb/extension/icu/./icu_extension.cpp
430428
src/duckdb/extension/icu/./icu-datetrunc.cpp
431-
src/duckdb/extension/icu/./icu-datesub.cpp
432-
src/duckdb/extension/icu/./icu-datefunc.cpp
433-
src/duckdb/extension/icu/./icu-dateadd.cpp
434-
src/duckdb/extension/icu/./icu-datepart.cpp
435429
src/duckdb/extension/icu/./icu-timezone.cpp
436430
src/duckdb/extension/icu/./icu-current.cpp
431+
src/duckdb/extension/icu/./icu-list-range.cpp
432+
src/duckdb/extension/icu/./icu-datefunc.cpp
437433
src/duckdb/extension/icu/./icu-strptime.cpp
438-
src/duckdb/extension/icu/./icu-makedate.cpp
434+
src/duckdb/extension/icu/./icu-dateadd.cpp
435+
src/duckdb/extension/icu/./icu_extension.cpp
439436
src/duckdb/extension/icu/./icu-timebucket.cpp
440-
src/duckdb/extension/icu/./icu-list-range.cpp
437+
src/duckdb/extension/icu/./icu-table-range.cpp
438+
src/duckdb/extension/icu/./icu-datepart.cpp
439+
src/duckdb/extension/icu/./icu-makedate.cpp
440+
src/duckdb/extension/icu/./icu-datesub.cpp
441441
src/duckdb/ub_extension_icu_third_party_icu_common.cpp
442442
src/duckdb/ub_extension_icu_third_party_icu_i18n.cpp
443443
src/duckdb/extension/icu/third_party/icu/stubdata/stubdata.cpp
444+
src/duckdb/extension/json/json_functions.cpp
444445
src/duckdb/extension/json/json_multi_file_info.cpp
445-
src/duckdb/extension/json/json_reader.cpp
446446
src/duckdb/extension/json/serialize_json.cpp
447-
src/duckdb/extension/json/json_extension.cpp
448-
src/duckdb/extension/json/json_enums.cpp
449-
src/duckdb/extension/json/json_scan.cpp
450-
src/duckdb/extension/json/json_functions.cpp
451447
src/duckdb/extension/json/json_common.cpp
452-
src/duckdb/extension/json/json_deserializer.cpp
448+
src/duckdb/extension/json/json_scan.cpp
449+
src/duckdb/extension/json/json_enums.cpp
450+
src/duckdb/extension/json/json_reader.cpp
453451
src/duckdb/extension/json/json_serializer.cpp
452+
src/duckdb/extension/json/json_extension.cpp
453+
src/duckdb/extension/json/json_deserializer.cpp
454454
src/duckdb/ub_extension_json_json_functions.cpp)
455455

456456
set(JEMALLOC_SRC_FILES

‎src/duckdb/src/catalog/catalog.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,7 @@ CatalogException Catalog::CreateMissingEntryException(CatalogEntryRetriever &ret
661661
if (unseen_schemas.size() >= max_schema_count) {
662662
break;
663663
}
664-
auto &catalog = database.get().GetCatalog();
664+
auto &catalog = database->GetCatalog();
665665
auto current_schemas = catalog.GetSchemas(context);
666666
for (auto &current_schema : current_schemas) {
667667
if (unseen_schemas.size() >= max_schema_count) {
@@ -1134,8 +1134,8 @@ vector<reference<SchemaCatalogEntry>> Catalog::GetAllSchemas(ClientContext &cont
11341134

11351135
auto &db_manager = DatabaseManager::Get(context);
11361136
auto databases = db_manager.GetDatabases(context);
1137-
for (auto database : databases) {
1138-
auto &catalog = database.get().GetCatalog();
1137+
for (auto &database : databases) {
1138+
auto &catalog = database->GetCatalog();
11391139
auto new_schemas = catalog.GetSchemas(context);
11401140
result.insert(result.end(), new_schemas.begin(), new_schemas.end());
11411141
}

‎src/duckdb/src/common/enum_util.cpp‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2745,6 +2745,7 @@ const StringUtil::EnumStringLiteral *GetMetricsTypeValues() {
27452745
{ static_cast<uint32_t>(MetricsType::SYSTEM_PEAK_BUFFER_MEMORY), "SYSTEM_PEAK_BUFFER_MEMORY" },
27462746
{ static_cast<uint32_t>(MetricsType::SYSTEM_PEAK_TEMP_DIR_SIZE), "SYSTEM_PEAK_TEMP_DIR_SIZE" },
27472747
{ static_cast<uint32_t>(MetricsType::TOTAL_BYTES_READ), "TOTAL_BYTES_READ" },
2748+
{ static_cast<uint32_t>(MetricsType::TOTAL_BYTES_WRITTEN), "TOTAL_BYTES_WRITTEN" },
27482749
{ static_cast<uint32_t>(MetricsType::ALL_OPTIMIZERS), "ALL_OPTIMIZERS" },
27492750
{ static_cast<uint32_t>(MetricsType::CUMULATIVE_OPTIMIZER_TIMING), "CUMULATIVE_OPTIMIZER_TIMING" },
27502751
{ static_cast<uint32_t>(MetricsType::PLANNER), "PLANNER" },
@@ -2787,12 +2788,12 @@ const StringUtil::EnumStringLiteral *GetMetricsTypeValues() {
27872788

27882789
template<>
27892790
const char* EnumUtil::ToChars<MetricsType>(MetricsType value) {
2790-
return StringUtil::EnumToString(GetMetricsTypeValues(), 53, "MetricsType", static_cast<uint32_t>(value));
2791+
return StringUtil::EnumToString(GetMetricsTypeValues(), 54, "MetricsType", static_cast<uint32_t>(value));
27912792
}
27922793

27932794
template<>
27942795
MetricsType EnumUtil::FromString<MetricsType>(const char *value) {
2795-
return static_cast<MetricsType>(StringUtil::StringToEnum(GetMetricsTypeValues(), 53, "MetricsType", value));
2796+
return static_cast<MetricsType>(StringUtil::StringToEnum(GetMetricsTypeValues(), 54, "MetricsType", value));
27962797
}
27972798

27982799
const StringUtil::EnumStringLiteral *GetMultiFileColumnMappingModeValues() {
@@ -4650,19 +4651,20 @@ const StringUtil::EnumStringLiteral *GetUndoFlagsValues() {
46504651
{ static_cast<uint32_t>(UndoFlags::INSERT_TUPLE), "INSERT_TUPLE" },
46514652
{ static_cast<uint32_t>(UndoFlags::DELETE_TUPLE), "DELETE_TUPLE" },
46524653
{ static_cast<uint32_t>(UndoFlags::UPDATE_TUPLE), "UPDATE_TUPLE" },
4653-
{ static_cast<uint32_t>(UndoFlags::SEQUENCE_VALUE), "SEQUENCE_VALUE" }
4654+
{ static_cast<uint32_t>(UndoFlags::SEQUENCE_VALUE), "SEQUENCE_VALUE" },
4655+
{ static_cast<uint32_t>(UndoFlags::ATTACHED_DATABASE), "ATTACHED_DATABASE" }
46544656
};
46554657
return values;
46564658
}
46574659

46584660
template<>
46594661
const char* EnumUtil::ToChars<UndoFlags>(UndoFlags value) {
4660-
return StringUtil::EnumToString(GetUndoFlagsValues(), 6, "UndoFlags", static_cast<uint32_t>(value));
4662+
return StringUtil::EnumToString(GetUndoFlagsValues(), 7, "UndoFlags", static_cast<uint32_t>(value));
46614663
}
46624664

46634665
template<>
46644666
UndoFlags EnumUtil::FromString<UndoFlags>(const char *value) {
4665-
return static_cast<UndoFlags>(StringUtil::StringToEnum(GetUndoFlagsValues(), 6, "UndoFlags", value));
4667+
return static_cast<UndoFlags>(StringUtil::StringToEnum(GetUndoFlagsValues(), 7, "UndoFlags", value));
46664668
}
46674669

46684670
const StringUtil::EnumStringLiteral *GetUnionInvalidReasonValues() {

‎src/duckdb/src/common/file_system.cpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -726,7 +726,10 @@ void FileHandle::Read(QueryContext context, void *buffer, idx_t nr_bytes, idx_t
726726
}
727727

728728
void FileHandle::Write(QueryContext context, void *buffer, idx_t nr_bytes, idx_t location) {
729-
// FIXME: Add profiling.
729+
if (context.GetClientContext() != nullptr) {
730+
context.GetClientContext()->client_data->profiler->AddBytesWritten(nr_bytes);
731+
}
732+
730733
file_system.Write(*this, buffer, UnsafeNumericCast<int64_t>(nr_bytes), location);
731734
}
732735

‎src/duckdb/src/common/types/data_chunk.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ void DataChunk::Initialize(Allocator &allocator, const vector<LogicalType> &type
5353
D_ASSERT(data.empty());
5454

5555
capacity = capacity_p;
56+
initial_capacity = capacity_p;
5657
for (idx_t i = 0; i < types.size(); i++) {
5758
// We copy the type here so we don't create another reference to the same shared_ptr<ExtraTypeInfo>
5859
// Otherwise, threads will constantly increment/decrement the atomic ref count to the same shared_ptr
@@ -92,7 +93,7 @@ void DataChunk::Reset() {
9293
for (idx_t i = 0; i < ColumnCount(); i++) {
9394
data[i].ResetFromCache(vector_caches[i]);
9495
}
95-
capacity = STANDARD_VECTOR_SIZE;
96+
capacity = initial_capacity;
9697
}
9798

9899
void DataChunk::Destroy() {

‎src/duckdb/src/execution/operator/helper/physical_transaction.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ SourceResultType PhysicalTransaction::GetData(ExecutionContext &context, DataChu
3535
if (DBConfig::GetSetting<ImmediateTransactionModeSetting>(context.client)) {
3636
// if immediate transaction mode is enabled then start all transactions immediately
3737
auto databases = DatabaseManager::Get(client).GetDatabases(client);
38-
for (auto db : databases) {
39-
context.client.transaction.ActiveTransaction().GetTransaction(db.get());
38+
for (auto &db : databases) {
39+
context.client.transaction.ActiveTransaction().GetTransaction(*db);
4040
}
4141
}
4242
} else {

‎src/duckdb/src/execution/operator/schema/physical_attach.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ SourceResultType PhysicalAttach::GetData(ExecutionContext &context, DataChunk &c
7373
attached_db->GetCatalog().SetDefaultTable(options.default_table.schema, options.default_table.name);
7474
}
7575
attached_db->FinalizeLoad(context.client);
76+
77+
db_manager.FinalizeAttach(context.client, *info, std::move(attached_db));
7678
return SourceResultType::FINISHED;
7779
}
7880

‎src/duckdb/src/function/scalar/system/write_log.cpp‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -114,14 +114,8 @@ unique_ptr<FunctionData> WriteLogBind(ClientContext &context, ScalarFunction &bo
114114
template <class T>
115115
void WriteLogValues(T &LogSource, LogLevel level, const string_t *data, const SelectionVector *sel, idx_t size,
116116
const string &type) {
117-
if (!type.empty()) {
118-
for (idx_t i = 0; i < size; i++) {
119-
DUCKDB_LOG_INTERNAL(LogSource, type.c_str(), level, data[sel->get_index(i)]);
120-
}
121-
} else {
122-
for (idx_t i = 0; i < size; i++) {
123-
DUCKDB_LOG_INTERNAL(LogSource, type.c_str(), level, data[sel->get_index(i)]);
124-
}
117+
for (idx_t i = 0; i < size; i++) {
118+
DUCKDB_LOG_INTERNAL(LogSource, type.c_str(), level, data[sel->get_index(i)]);
125119
}
126120
}
127121

0 commit comments

Comments
 (0)