Skip to content

Commit 0da13b1

Browse files
staticlibsstaticlibs
committed
Update vendored DuckDB sources to v1.2.2
1 parent a42abde commit 0da13b1

File tree

758 files changed

+56379
-56189
lines changed

Some content is hidden

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

758 files changed

+56379
-56189
lines changed

‎CMakeLists.txt

Lines changed: 39 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ set(DUCKDB_INCLUDE_DIRS
5252
src/duckdb/third_party/brotli/common
5353
src/duckdb/third_party/brotli/dec
5454
src/duckdb/third_party/brotli/enc
55+
src/duckdb/third_party/mbedtls
5556
src/duckdb/third_party/mbedtls/include
5657
src/duckdb/third_party/mbedtls/library
5758
src/duckdb/third_party/miniz
@@ -104,7 +105,6 @@ set(DUCKDB_SRC_FILES
104105
src/duckdb/ub_src_common_crypto.cpp
105106
src/duckdb/ub_src_common_enums.cpp
106107
src/duckdb/ub_src_common_exception.cpp
107-
src/duckdb/ub_src_common_multi_file.cpp
108108
src/duckdb/ub_src_common_operator.cpp
109109
src/duckdb/ub_src_common_progress_bar.cpp
110110
src/duckdb/ub_src_common_row_operations.cpp
@@ -279,27 +279,29 @@ set(DUCKDB_SRC_FILES
279279
src/duckdb/third_party/libpg_query/src_backend_parser_scansup.cpp
280280
src/duckdb/third_party/libpg_query/src_common_keywords.cpp
281281
src/duckdb/third_party/mbedtls/library/aes.cpp
282+
src/duckdb/third_party/mbedtls/library/aria.cpp
282283
src/duckdb/third_party/mbedtls/library/asn1parse.cpp
283-
src/duckdb/third_party/mbedtls/library/asn1write.cpp
284284
src/duckdb/third_party/mbedtls/library/base64.cpp
285285
src/duckdb/third_party/mbedtls/library/bignum.cpp
286-
src/duckdb/third_party/mbedtls/library/bignum_core.cpp
286+
src/duckdb/third_party/mbedtls/library/camellia.cpp
287287
src/duckdb/third_party/mbedtls/library/cipher.cpp
288288
src/duckdb/third_party/mbedtls/library/cipher_wrap.cpp
289289
src/duckdb/third_party/mbedtls/library/constant_time.cpp
290+
src/duckdb/third_party/mbedtls/library/entropy.cpp
291+
src/duckdb/third_party/mbedtls/library/entropy_poll.cpp
290292
src/duckdb/third_party/mbedtls/library/gcm.cpp
291293
src/duckdb/third_party/mbedtls/library/md.cpp
292294
src/duckdb/third_party/mbedtls/library/oid.cpp
293295
src/duckdb/third_party/mbedtls/library/pem.cpp
294296
src/duckdb/third_party/mbedtls/library/pk.cpp
295297
src/duckdb/third_party/mbedtls/library/pk_wrap.cpp
296298
src/duckdb/third_party/mbedtls/library/pkparse.cpp
297-
src/duckdb/third_party/mbedtls/library/platform.cpp
298299
src/duckdb/third_party/mbedtls/library/platform_util.cpp
299300
src/duckdb/third_party/mbedtls/library/rsa.cpp
300301
src/duckdb/third_party/mbedtls/library/rsa_alt_helpers.cpp
301302
src/duckdb/third_party/mbedtls/library/sha1.cpp
302303
src/duckdb/third_party/mbedtls/library/sha256.cpp
304+
src/duckdb/third_party/mbedtls/library/sha512.cpp
303305
src/duckdb/third_party/mbedtls/mbedtls_wrapper.cpp
304306
src/duckdb/third_party/yyjson/yyjson.cpp
305307
src/duckdb/third_party/zstd/common/debug.cpp
@@ -334,45 +336,41 @@ set(DUCKDB_SRC_FILES
334336
src/duckdb/third_party/zstd/dict/divsufsort.cpp
335337
src/duckdb/third_party/zstd/dict/fastcover.cpp
336338
src/duckdb/third_party/zstd/dict/zdict.cpp
337-
src/duckdb/extension/core_functions/lambda_functions.cpp
338339
src/duckdb/extension/core_functions/core_functions_extension.cpp
340+
src/duckdb/extension/core_functions/lambda_functions.cpp
339341
src/duckdb/extension/core_functions/function_list.cpp
342+
src/duckdb/ub_extension_core_functions_aggregate_algebraic.cpp
340343
src/duckdb/ub_extension_core_functions_aggregate_distributive.cpp
341-
src/duckdb/ub_extension_core_functions_aggregate_regression.cpp
342-
src/duckdb/ub_extension_core_functions_aggregate_nested.cpp
343344
src/duckdb/ub_extension_core_functions_aggregate_holistic.cpp
344-
src/duckdb/ub_extension_core_functions_aggregate_algebraic.cpp
345-
src/duckdb/ub_extension_core_functions_scalar_union.cpp
345+
src/duckdb/ub_extension_core_functions_aggregate_nested.cpp
346+
src/duckdb/ub_extension_core_functions_aggregate_regression.cpp
347+
src/duckdb/ub_extension_core_functions_scalar_struct.cpp
346348
src/duckdb/ub_extension_core_functions_scalar_generic.cpp
347-
src/duckdb/ub_extension_core_functions_scalar_enum.cpp
349+
src/duckdb/ub_extension_core_functions_scalar_string.cpp
348350
src/duckdb/ub_extension_core_functions_scalar_blob.cpp
349-
src/duckdb/ub_extension_core_functions_scalar_array.cpp
350-
src/duckdb/ub_extension_core_functions_scalar_map.cpp
351+
src/duckdb/ub_extension_core_functions_scalar_enum.cpp
352+
src/duckdb/ub_extension_core_functions_scalar_bit.cpp
351353
src/duckdb/ub_extension_core_functions_scalar_math.cpp
352-
src/duckdb/ub_extension_core_functions_scalar_debug.cpp
353-
src/duckdb/ub_extension_core_functions_scalar_list.cpp
354-
src/duckdb/ub_extension_core_functions_scalar_string.cpp
355354
src/duckdb/ub_extension_core_functions_scalar_random.cpp
356355
src/duckdb/ub_extension_core_functions_scalar_date.cpp
357-
src/duckdb/ub_extension_core_functions_scalar_struct.cpp
356+
src/duckdb/ub_extension_core_functions_scalar_debug.cpp
357+
src/duckdb/ub_extension_core_functions_scalar_list.cpp
358+
src/duckdb/ub_extension_core_functions_scalar_array.cpp
358359
src/duckdb/ub_extension_core_functions_scalar_operators.cpp
359-
src/duckdb/ub_extension_core_functions_scalar_bit.cpp
360+
src/duckdb/ub_extension_core_functions_scalar_union.cpp
361+
src/duckdb/ub_extension_core_functions_scalar_map.cpp
362+
src/duckdb/extension/parquet/column_reader.cpp
360363
src/duckdb/extension/parquet/column_writer.cpp
361-
src/duckdb/extension/parquet/serialize_parquet.cpp
362-
src/duckdb/extension/parquet/parquet_float16.cpp
364+
src/duckdb/extension/parquet/parquet_crypto.cpp
365+
src/duckdb/extension/parquet/parquet_extension.cpp
366+
src/duckdb/extension/parquet/parquet_metadata.cpp
363367
src/duckdb/extension/parquet/parquet_reader.cpp
364368
src/duckdb/extension/parquet/parquet_statistics.cpp
369+
src/duckdb/extension/parquet/parquet_timestamp.cpp
365370
src/duckdb/extension/parquet/parquet_writer.cpp
371+
src/duckdb/extension/parquet/serialize_parquet.cpp
366372
src/duckdb/extension/parquet/zstd_file_system.cpp
367-
src/duckdb/extension/parquet/parquet_crypto.cpp
368-
src/duckdb/extension/parquet/parquet_extension.cpp
369-
src/duckdb/extension/parquet/column_reader.cpp
370373
src/duckdb/extension/parquet/geo_parquet.cpp
371-
src/duckdb/extension/parquet/parquet_metadata.cpp
372-
src/duckdb/extension/parquet/parquet_timestamp.cpp
373-
src/duckdb/ub_extension_parquet_writer.cpp
374-
src/duckdb/ub_extension_parquet_reader.cpp
375-
src/duckdb/ub_extension_parquet_decoder.cpp
376374
src/duckdb/third_party/parquet/parquet_types.cpp
377375
src/duckdb/third_party/thrift/thrift/protocol/TProtocol.cpp
378376
src/duckdb/third_party/thrift/thrift/transport/TTransportException.cpp
@@ -411,32 +409,31 @@ set(DUCKDB_SRC_FILES
411409
src/duckdb/third_party/brotli/enc/metablock.cpp
412410
src/duckdb/third_party/brotli/enc/static_dict.cpp
413411
src/duckdb/third_party/brotli/enc/utf8_util.cpp
414-
src/duckdb/extension/icu/./icu-timezone.cpp
412+
src/duckdb/extension/icu/./icu-current.cpp
413+
src/duckdb/extension/icu/./icu-datepart.cpp
415414
src/duckdb/extension/icu/./icu-timebucket.cpp
416-
src/duckdb/extension/icu/./icu-strptime.cpp
417415
src/duckdb/extension/icu/./icu-datefunc.cpp
418-
src/duckdb/extension/icu/./icu_extension.cpp
419-
src/duckdb/extension/icu/./icu-table-range.cpp
420-
src/duckdb/extension/icu/./icu-datesub.cpp
421-
src/duckdb/extension/icu/./icu-list-range.cpp
422416
src/duckdb/extension/icu/./icu-makedate.cpp
423417
src/duckdb/extension/icu/./icu-datetrunc.cpp
424-
src/duckdb/extension/icu/./icu-datepart.cpp
425-
src/duckdb/extension/icu/./icu-current.cpp
418+
src/duckdb/extension/icu/./icu-strptime.cpp
419+
src/duckdb/extension/icu/./icu-datesub.cpp
420+
src/duckdb/extension/icu/./icu-timezone.cpp
421+
src/duckdb/extension/icu/./icu_extension.cpp
426422
src/duckdb/extension/icu/./icu-dateadd.cpp
423+
src/duckdb/extension/icu/./icu-list-range.cpp
424+
src/duckdb/extension/icu/./icu-table-range.cpp
427425
src/duckdb/ub_extension_icu_third_party_icu_common.cpp
428426
src/duckdb/ub_extension_icu_third_party_icu_i18n.cpp
429427
src/duckdb/extension/icu/third_party/icu/stubdata/stubdata.cpp
430-
src/duckdb/extension/json/json_multi_file_info.cpp
431-
src/duckdb/extension/json/json_deserializer.cpp
428+
src/duckdb/extension/json/buffered_json_reader.cpp
432429
src/duckdb/extension/json/json_enums.cpp
433-
src/duckdb/extension/json/json_scan.cpp
434-
src/duckdb/extension/json/json_functions.cpp
435-
src/duckdb/extension/json/serialize_json.cpp
436-
src/duckdb/extension/json/json_common.cpp
437-
src/duckdb/extension/json/json_reader.cpp
438430
src/duckdb/extension/json/json_extension.cpp
431+
src/duckdb/extension/json/json_common.cpp
432+
src/duckdb/extension/json/json_functions.cpp
433+
src/duckdb/extension/json/json_scan.cpp
439434
src/duckdb/extension/json/json_serializer.cpp
435+
src/duckdb/extension/json/json_deserializer.cpp
436+
src/duckdb/extension/json/serialize_json.cpp
440437
src/duckdb/ub_extension_json_json_functions.cpp)
441438

442439
set(JEMACLLOC_SRC_FILES

‎src/duckdb/extension/core_functions/aggregate/algebraic/avg.cpp

Lines changed: 0 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#include "core_functions/aggregate/algebraic_functions.hpp"
22
#include "core_functions/aggregate/sum_helpers.hpp"
33
#include "duckdb/common/types/hugeint.hpp"
4-
#include "duckdb/common/types/time.hpp"
54
#include "duckdb/common/exception.hpp"
65
#include "duckdb/function/function_set.hpp"
76
#include "duckdb/planner/expression.hpp"
@@ -23,21 +22,6 @@ struct AvgState {
2322
}
2423
};
2524

26-
struct IntervalAvgState {
27-
int64_t count;
28-
interval_t value;
29-
30-
void Initialize() {
31-
this->count = 0;
32-
this->value = interval_t();
33-
}
34-
35-
void Combine(const IntervalAvgState &other) {
36-
this->count += other.count;
37-
this->value = AddOperator::Operation<interval_t, interval_t, interval_t>(this->value, other.value);
38-
}
39-
};
40-
4125
struct KahanAvgState {
4226
uint64_t count;
4327
double value;
@@ -121,20 +105,6 @@ struct IntegerAverageOperationHugeint : public BaseSumOperation<AverageSetOperat
121105
}
122106
};
123107

124-
struct DiscreteAverageOperation : public BaseSumOperation<AverageSetOperation, AddToHugeint> {
125-
template <class T, class STATE>
126-
static void Finalize(STATE &state, T &target, AggregateFinalizeData &finalize_data) {
127-
if (state.count == 0) {
128-
finalize_data.ReturnNull();
129-
} else {
130-
hugeint_t remainder;
131-
target = Hugeint::Cast<T>(Hugeint::DivMod(state.value, state.count, remainder));
132-
// Round the result
133-
target += (remainder > (state.count / 2));
134-
}
135-
}
136-
};
137-
138108
struct HugeintAverageOperation : public BaseSumOperation<AverageSetOperation, HugeintAdd> {
139109
template <class T, class STATE>
140110
static void Finalize(STATE &state, T &target, AggregateFinalizeData &finalize_data) {
@@ -169,74 +139,6 @@ struct KahanAverageOperation : public BaseSumOperation<AverageSetOperation, Kaha
169139
}
170140
};
171141

172-
struct IntervalAverageOperation : public BaseSumOperation<AverageSetOperation, IntervalAdd> {
173-
// Override BaseSumOperation::Initialize because
174-
// IntervalAvgState does not have an assignment constructor from 0
175-
static void Initialize(IntervalAvgState &state) {
176-
AverageSetOperation::Initialize<IntervalAvgState>(state);
177-
}
178-
179-
template <class RESULT_TYPE, class STATE>
180-
static void Finalize(STATE &state, RESULT_TYPE &target, AggregateFinalizeData &finalize_data) {
181-
if (state.count == 0) {
182-
finalize_data.ReturnNull();
183-
} else {
184-
// DivideOperator does not borrow fractions right,
185-
// TODO: Maybe it should?
186-
// Copy PG implementation.
187-
const auto &value = state.value;
188-
const auto count = UnsafeNumericCast<int64_t>(state.count);
189-
190-
target.months = value.months / count;
191-
auto months_remainder = value.months % count;
192-
193-
target.days = value.days / count;
194-
auto days_remainder = value.days % count;
195-
196-
target.micros = value.micros / count;
197-
auto micros_remainder = value.micros % count;
198-
199-
// Shift the remainders right
200-
months_remainder *= Interval::DAYS_PER_MONTH;
201-
target.days += months_remainder / count;
202-
days_remainder += months_remainder % count;
203-
204-
days_remainder *= Interval::MICROS_PER_DAY;
205-
micros_remainder += days_remainder / count;
206-
target.micros += micros_remainder;
207-
}
208-
}
209-
};
210-
211-
struct TimeTZAverageOperation : public BaseSumOperation<AverageSetOperation, AddToHugeint> {
212-
template <class INPUT_TYPE, class STATE, class OP>
213-
static void Operation(STATE &state, const INPUT_TYPE &input, AggregateUnaryInput &aggr_unary) {
214-
const auto micros = Time::NormalizeTimeTZ(input).micros;
215-
AverageSetOperation::template AddValues<STATE>(state, 1);
216-
AddToHugeint::template AddNumber<STATE, int64_t>(state, micros);
217-
}
218-
219-
template <class INPUT_TYPE, class STATE, class OP>
220-
static void ConstantOperation(STATE &state, const INPUT_TYPE &input, AggregateUnaryInput &aggr_unary, idx_t count) {
221-
const auto micros = Time::NormalizeTimeTZ(input).micros;
222-
AverageSetOperation::template AddValues<STATE>(state, count);
223-
AddToHugeint::template AddConstant<STATE, int64_t>(state, micros, count);
224-
}
225-
226-
template <class T, class STATE>
227-
static void Finalize(STATE &state, T &target, AggregateFinalizeData &finalize_data) {
228-
if (state.count == 0) {
229-
finalize_data.ReturnNull();
230-
} else {
231-
uint64_t remainder;
232-
auto micros = Hugeint::Cast<int64_t>(Hugeint::DivModPositive(state.value, state.count, remainder));
233-
// Round the result
234-
micros += (remainder > (state.count / 2));
235-
target = dtime_tz_t(dtime_t(micros), 0);
236-
}
237-
}
238-
};
239-
240142
AggregateFunction GetAverageAggregate(PhysicalType type) {
241143
switch (type) {
242144
case PhysicalType::INT16: {
@@ -255,10 +157,6 @@ AggregateFunction GetAverageAggregate(PhysicalType type) {
255157
return AggregateFunction::UnaryAggregate<AvgState<hugeint_t>, hugeint_t, double, HugeintAverageOperation>(
256158
LogicalType::HUGEINT, LogicalType::DOUBLE);
257159
}
258-
case PhysicalType::INTERVAL: {
259-
return AggregateFunction::UnaryAggregate<IntervalAvgState, interval_t, interval_t, IntervalAverageOperation>(
260-
LogicalType::INTERVAL, LogicalType::INTERVAL);
261-
}
262160
default:
263161
throw InternalException("Unimplemented average aggregate");
264162
}
@@ -285,20 +183,8 @@ AggregateFunctionSet AvgFun::GetFunctions() {
285183
avg.AddFunction(GetAverageAggregate(PhysicalType::INT32));
286184
avg.AddFunction(GetAverageAggregate(PhysicalType::INT64));
287185
avg.AddFunction(GetAverageAggregate(PhysicalType::INT128));
288-
avg.AddFunction(GetAverageAggregate(PhysicalType::INTERVAL));
289186
avg.AddFunction(AggregateFunction::UnaryAggregate<AvgState<double>, double, double, NumericAverageOperation>(
290187
LogicalType::DOUBLE, LogicalType::DOUBLE));
291-
292-
avg.AddFunction(AggregateFunction::UnaryAggregate<AvgState<hugeint_t>, int64_t, int64_t, DiscreteAverageOperation>(
293-
LogicalType::TIMESTAMP, LogicalType::TIMESTAMP));
294-
avg.AddFunction(AggregateFunction::UnaryAggregate<AvgState<hugeint_t>, int64_t, int64_t, DiscreteAverageOperation>(
295-
LogicalType::TIMESTAMP_TZ, LogicalType::TIMESTAMP_TZ));
296-
avg.AddFunction(AggregateFunction::UnaryAggregate<AvgState<hugeint_t>, int64_t, int64_t, DiscreteAverageOperation>(
297-
LogicalType::TIME, LogicalType::TIME));
298-
avg.AddFunction(
299-
AggregateFunction::UnaryAggregate<AvgState<hugeint_t>, dtime_tz_t, dtime_tz_t, TimeTZAverageOperation>(
300-
LogicalType::TIME_TZ, LogicalType::TIME_TZ));
301-
302188
return avg;
303189
}
304190

‎src/duckdb/extension/core_functions/aggregate/distributive/arg_min_max.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -545,8 +545,8 @@ class ArgMinMaxNState {
545545
BinaryAggregateHeap<K, V, COMPARATOR> heap;
546546

547547
bool is_initialized = false;
548-
void Initialize(ArenaAllocator &allocator, idx_t nval) {
549-
heap.Initialize(allocator, nval);
548+
void Initialize(idx_t nval) {
549+
heap.Initialize(nval);
550550
is_initialized = true;
551551
}
552552
};
@@ -601,7 +601,7 @@ static void ArgMinMaxNUpdate(Vector inputs[], AggregateInputData &aggr_input, id
601601
if (nval >= MAX_N) {
602602
throw InvalidInputException("Invalid input for arg_min/arg_max: n value must be < %d", MAX_N);
603603
}
604-
state.Initialize(aggr_input.allocator, UnsafeNumericCast<idx_t>(nval));
604+
state.Initialize(UnsafeNumericCast<idx_t>(nval));
605605
}
606606

607607
// Now add the input to the heap

‎src/duckdb/extension/core_functions/core_functions_extension.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ namespace duckdb {
1212
template <class T>
1313
static void FillExtraInfo(const StaticFunctionDefinition &function, T &info) {
1414
info.internal = true;
15-
info.alias_of = function.alias_of;
1615
FillFunctionDescriptions(function, info);
1716
info.on_conflict = OnCreateConflict::ALTER_ON_CONFLICT;
1817
}

0 commit comments

Comments
 (0)