Skip to content

Commit e900bb9

Browse files
duckdblabs-botgithub-actions[bot]
duckdblabs-bot
authored and
github-actions[bot]
committed
Update vendored DuckDB sources to ff0e9d39e0
1 parent 9c49ee9 commit e900bb9

5 files changed

Lines changed: 80 additions & 69 deletions

File tree

‎CMakeLists.txt‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -350,44 +350,44 @@ set(DUCKDB_SRC_FILES
350350
src/duckdb/extension/core_functions/lambda_functions.cpp
351351
src/duckdb/extension/core_functions/function_list.cpp
352352
src/duckdb/extension/core_functions/core_functions_extension.cpp
353+
src/duckdb/ub_extension_core_functions_aggregate_holistic.cpp
354+
src/duckdb/ub_extension_core_functions_aggregate_algebraic.cpp
353355
src/duckdb/ub_extension_core_functions_aggregate_distributive.cpp
354-
src/duckdb/ub_extension_core_functions_aggregate_nested.cpp
355356
src/duckdb/ub_extension_core_functions_aggregate_regression.cpp
356-
src/duckdb/ub_extension_core_functions_aggregate_algebraic.cpp
357-
src/duckdb/ub_extension_core_functions_aggregate_holistic.cpp
358-
src/duckdb/ub_extension_core_functions_scalar_string.cpp
359-
src/duckdb/ub_extension_core_functions_scalar_bit.cpp
360-
src/duckdb/ub_extension_core_functions_scalar_operators.cpp
361-
src/duckdb/ub_extension_core_functions_scalar_enum.cpp
362-
src/duckdb/ub_extension_core_functions_scalar_map.cpp
363-
src/duckdb/ub_extension_core_functions_scalar_random.cpp
357+
src/duckdb/ub_extension_core_functions_aggregate_nested.cpp
364358
src/duckdb/ub_extension_core_functions_scalar_math.cpp
365-
src/duckdb/ub_extension_core_functions_scalar_union.cpp
366-
src/duckdb/ub_extension_core_functions_scalar_generic.cpp
367-
src/duckdb/ub_extension_core_functions_scalar_struct.cpp
359+
src/duckdb/ub_extension_core_functions_scalar_date.cpp
368360
src/duckdb/ub_extension_core_functions_scalar_list.cpp
361+
src/duckdb/ub_extension_core_functions_scalar_generic.cpp
362+
src/duckdb/ub_extension_core_functions_scalar_blob.cpp
363+
src/duckdb/ub_extension_core_functions_scalar_random.cpp
364+
src/duckdb/ub_extension_core_functions_scalar_string.cpp
369365
src/duckdb/ub_extension_core_functions_scalar_array.cpp
366+
src/duckdb/ub_extension_core_functions_scalar_map.cpp
367+
src/duckdb/ub_extension_core_functions_scalar_union.cpp
368+
src/duckdb/ub_extension_core_functions_scalar_operators.cpp
369+
src/duckdb/ub_extension_core_functions_scalar_enum.cpp
370+
src/duckdb/ub_extension_core_functions_scalar_bit.cpp
370371
src/duckdb/ub_extension_core_functions_scalar_debug.cpp
371-
src/duckdb/ub_extension_core_functions_scalar_blob.cpp
372-
src/duckdb/ub_extension_core_functions_scalar_date.cpp
373-
src/duckdb/extension/parquet/parquet_writer.cpp
374-
src/duckdb/extension/parquet/zstd_file_system.cpp
375-
src/duckdb/extension/parquet/parquet_crypto.cpp
376-
src/duckdb/extension/parquet/parquet_reader.cpp
372+
src/duckdb/ub_extension_core_functions_scalar_struct.cpp
373+
src/duckdb/extension/parquet/parquet_metadata.cpp
374+
src/duckdb/extension/parquet/serialize_parquet.cpp
375+
src/duckdb/extension/parquet/parquet_file_metadata_cache.cpp
376+
src/duckdb/extension/parquet/column_writer.cpp
377377
src/duckdb/extension/parquet/parquet_timestamp.cpp
378-
src/duckdb/extension/parquet/parquet_float16.cpp
378+
src/duckdb/extension/parquet/parquet_crypto.cpp
379379
src/duckdb/extension/parquet/parquet_statistics.cpp
380-
src/duckdb/extension/parquet/parquet_multi_file_info.cpp
381-
src/duckdb/extension/parquet/column_reader.cpp
380+
src/duckdb/extension/parquet/zstd_file_system.cpp
381+
src/duckdb/extension/parquet/parquet_writer.cpp
382382
src/duckdb/extension/parquet/geo_parquet.cpp
383383
src/duckdb/extension/parquet/parquet_extension.cpp
384-
src/duckdb/extension/parquet/column_writer.cpp
385-
src/duckdb/extension/parquet/parquet_file_metadata_cache.cpp
386-
src/duckdb/extension/parquet/serialize_parquet.cpp
387-
src/duckdb/extension/parquet/parquet_metadata.cpp
388-
src/duckdb/ub_extension_parquet_decoder.cpp
384+
src/duckdb/extension/parquet/column_reader.cpp
385+
src/duckdb/extension/parquet/parquet_multi_file_info.cpp
386+
src/duckdb/extension/parquet/parquet_float16.cpp
387+
src/duckdb/extension/parquet/parquet_reader.cpp
389388
src/duckdb/ub_extension_parquet_reader.cpp
390389
src/duckdb/ub_extension_parquet_reader_variant.cpp
390+
src/duckdb/ub_extension_parquet_decoder.cpp
391391
src/duckdb/ub_extension_parquet_writer.cpp
392392
src/duckdb/third_party/parquet/parquet_types.cpp
393393
src/duckdb/third_party/thrift/thrift/protocol/TProtocol.cpp
@@ -427,32 +427,32 @@ set(DUCKDB_SRC_FILES
427427
src/duckdb/third_party/brotli/enc/metablock.cpp
428428
src/duckdb/third_party/brotli/enc/static_dict.cpp
429429
src/duckdb/third_party/brotli/enc/utf8_util.cpp
430-
src/duckdb/extension/icu/./icu_extension.cpp
430+
src/duckdb/extension/icu/./icu-datesub.cpp
431+
src/duckdb/extension/icu/./icu-datefunc.cpp
431432
src/duckdb/extension/icu/./icu-strptime.cpp
432-
src/duckdb/extension/icu/./icu-datepart.cpp
433433
src/duckdb/extension/icu/./icu-makedate.cpp
434-
src/duckdb/extension/icu/./icu-datefunc.cpp
435-
src/duckdb/extension/icu/./icu-current.cpp
436-
src/duckdb/extension/icu/./icu-timezone.cpp
434+
src/duckdb/extension/icu/./icu-datepart.cpp
437435
src/duckdb/extension/icu/./icu-table-range.cpp
436+
src/duckdb/extension/icu/./icu-timezone.cpp
437+
src/duckdb/extension/icu/./icu-list-range.cpp
438+
src/duckdb/extension/icu/./icu-datetrunc.cpp
439+
src/duckdb/extension/icu/./icu-current.cpp
438440
src/duckdb/extension/icu/./icu-dateadd.cpp
441+
src/duckdb/extension/icu/./icu_extension.cpp
439442
src/duckdb/extension/icu/./icu-timebucket.cpp
440-
src/duckdb/extension/icu/./icu-datesub.cpp
441-
src/duckdb/extension/icu/./icu-datetrunc.cpp
442-
src/duckdb/extension/icu/./icu-list-range.cpp
443443
src/duckdb/ub_extension_icu_third_party_icu_common.cpp
444444
src/duckdb/ub_extension_icu_third_party_icu_i18n.cpp
445445
src/duckdb/extension/icu/third_party/icu/stubdata/stubdata.cpp
446-
src/duckdb/extension/json/json_reader.cpp
447-
src/duckdb/extension/json/json_functions.cpp
448-
src/duckdb/extension/json/json_extension.cpp
449-
src/duckdb/extension/json/json_scan.cpp
450446
src/duckdb/extension/json/json_multi_file_info.cpp
451447
src/duckdb/extension/json/json_enums.cpp
452448
src/duckdb/extension/json/serialize_json.cpp
453-
src/duckdb/extension/json/json_common.cpp
454-
src/duckdb/extension/json/json_deserializer.cpp
449+
src/duckdb/extension/json/json_reader.cpp
450+
src/duckdb/extension/json/json_extension.cpp
451+
src/duckdb/extension/json/json_scan.cpp
452+
src/duckdb/extension/json/json_functions.cpp
455453
src/duckdb/extension/json/json_serializer.cpp
454+
src/duckdb/extension/json/json_deserializer.cpp
455+
src/duckdb/extension/json/json_common.cpp
456456
src/duckdb/ub_extension_json_json_functions.cpp)
457457

458458
set(JEMALLOC_SRC_FILES

‎src/duckdb/extension/json/include/json_serializer.hpp‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,18 @@ struct JsonSerializer : Serializer {
3939
return serializer.GetRootObject();
4040
}
4141

42+
template <class T>
43+
static string SerializeToString(T &value) {
44+
auto doc = yyjson_mut_doc_new(nullptr);
45+
JsonSerializer serializer(doc, false, false, false);
46+
value.Serialize(serializer);
47+
auto result_obj = serializer.GetRootObject();
48+
idx_t len = 0;
49+
auto data = yyjson_mut_val_write_opts(result_obj, JSONCommon::WRITE_PRETTY_FLAG, nullptr,
50+
reinterpret_cast<size_t *>(&len), nullptr);
51+
return string(data, len);
52+
}
53+
4254
yyjson_mut_val *GetRootObject() {
4355
D_ASSERT(stack.size() == 1); // or we forgot to pop somewhere
4456
return stack.front();

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#ifndef DUCKDB_PATCH_VERSION
2-
#define DUCKDB_PATCH_VERSION "2-dev105"
2+
#define DUCKDB_PATCH_VERSION "2-dev114"
33
#endif
44
#ifndef DUCKDB_MINOR_VERSION
55
#define DUCKDB_MINOR_VERSION 4
@@ -8,10 +8,10 @@
88
#define DUCKDB_MAJOR_VERSION 1
99
#endif
1010
#ifndef DUCKDB_VERSION
11-
#define DUCKDB_VERSION "v1.4.2-dev105"
11+
#define DUCKDB_VERSION "v1.4.2-dev114"
1212
#endif
1313
#ifndef DUCKDB_SOURCE_ID
14-
#define DUCKDB_SOURCE_ID "b6dcebf822"
14+
#define DUCKDB_SOURCE_ID "ff0e9d39e0"
1515
#endif
1616
#include "duckdb/function/table/system_functions.hpp"
1717
#include "duckdb/main/database.hpp"

‎src/duckdb/src/parser/query_node/cte_node.cpp‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -71,23 +71,6 @@ void QueryNode::ExtractCTENodes(unique_ptr<QueryNode> &query_node) {
7171
query_node = std::move(root);
7272
}
7373

74-
void CTENode::Serialize(Serializer &serializer) const {
75-
if (materialized == CTEMaterialize::CTE_MATERIALIZE_NEVER) {
76-
// for non-materialized CTEs - don't serialize CTENode
77-
// older DuckDB versions only expect a CTENode to be there for materialized CTEs
78-
child->Serialize(serializer);
79-
return;
80-
}
81-
QueryNode::Serialize(serializer);
82-
serializer.WritePropertyWithDefault<string>(200, "cte_name", ctename);
83-
serializer.WritePropertyWithDefault<unique_ptr<QueryNode>>(201, "query", query);
84-
serializer.WritePropertyWithDefault<unique_ptr<QueryNode>>(202, "child", child);
85-
serializer.WritePropertyWithDefault<vector<string>>(203, "aliases", aliases);
86-
}
87-
88-
// In QueryNode::ExtractCTENodes we create a bunch of CTENodes from the CommonTableExpressionMap in the QueryNode
89-
// however, we might ALSO have a CTENode present depending on how the serialization is set up
90-
// if we ended up creating duplicate CTE nodes in QueryNode::ExtractCTENodes - this ends up de-duplicating them again
9174
void EraseDuplicateCTE(unique_ptr<QueryNode> &node, const string &ctename) {
9275
if (node->type != QueryNodeType::CTE_NODE) {
9376
// not a CTE
@@ -104,6 +87,23 @@ void EraseDuplicateCTE(unique_ptr<QueryNode> &node, const string &ctename) {
10487
}
10588
}
10689

90+
void CTENode::Serialize(Serializer &serializer) const {
91+
if (materialized != CTEMaterialize::CTE_MATERIALIZE_ALWAYS) {
92+
// for non-materialized CTEs - don't serialize CTENode
93+
// older DuckDB versions only expect a CTENode to be there for materialized CTEs
94+
child->Serialize(serializer);
95+
return;
96+
}
97+
auto child_copy = child->Copy();
98+
EraseDuplicateCTE(child_copy, ctename);
99+
100+
QueryNode::Serialize(serializer);
101+
serializer.WritePropertyWithDefault<string>(200, "cte_name", ctename);
102+
serializer.WritePropertyWithDefault<unique_ptr<QueryNode>>(201, "query", query);
103+
serializer.WritePropertyWithDefault<unique_ptr<QueryNode>>(202, "child", child_copy);
104+
serializer.WritePropertyWithDefault<vector<string>>(203, "aliases", aliases);
105+
}
106+
107107
unique_ptr<QueryNode> CTENode::Deserialize(Deserializer &deserializer) {
108108
auto result = duckdb::unique_ptr<CTENode>(new CTENode());
109109
deserializer.ReadPropertyWithDefault<string>(200, "cte_name", result->ctename);
@@ -113,8 +113,7 @@ unique_ptr<QueryNode> CTENode::Deserialize(Deserializer &deserializer) {
113113
// v1.4.0 and v1.4.1 wrote this property - deserialize it for BC with these versions
114114
deserializer.ReadPropertyWithExplicitDefault<CTEMaterialize>(204, "materialized", result->materialized,
115115
CTEMaterialize::CTE_MATERIALIZE_DEFAULT);
116-
EraseDuplicateCTE(result->child, result->ctename);
117-
return std::move(result);
116+
return std::move(result->child);
118117
}
119118
// TEMPORARY BUGFIX WARNING - none of this code should make it into main - this is a temporary work-around for v1.4
120119
// TEMPORARY BUGFIX END

‎src/duckdb/ub_extension_icu_third_party_icu_i18n.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -348,17 +348,17 @@
348348

349349
#include "extension/icu/third_party/icu/i18n/wintzimpl.cpp"
350350

351-
#include "extension/icu/third_party/icu/i18n/double-conversion-fast-dtoa.cpp"
352-
353-
#include "extension/icu/third_party/icu/i18n/double-conversion-string-to-double.cpp"
354-
355-
#include "extension/icu/third_party/icu/i18n/double-conversion-double-to-string.cpp"
351+
#include "extension/icu/third_party/icu/i18n/double-conversion-bignum.cpp"
356352

357353
#include "extension/icu/third_party/icu/i18n/double-conversion-strtod.cpp"
358354

359-
#include "extension/icu/third_party/icu/i18n/double-conversion-bignum.cpp"
355+
#include "extension/icu/third_party/icu/i18n/double-conversion-cached-powers.cpp"
360356

361357
#include "extension/icu/third_party/icu/i18n/double-conversion-bignum-dtoa.cpp"
362358

363-
#include "extension/icu/third_party/icu/i18n/double-conversion-cached-powers.cpp"
359+
#include "extension/icu/third_party/icu/i18n/double-conversion-string-to-double.cpp"
360+
361+
#include "extension/icu/third_party/icu/i18n/double-conversion-fast-dtoa.cpp"
362+
363+
#include "extension/icu/third_party/icu/i18n/double-conversion-double-to-string.cpp"
364364

0 commit comments

Comments
 (0)