duckdb 0.8.2-dev161.0 → 0.8.2-dev1764.0

package/binding.gyp

@@ -75,8 +75,9 @@
                 "src/duckdb/ub_src_function.cpp", 
                 "src/duckdb/ub_src_function_cast.cpp", 
                 "src/duckdb/ub_src_function_pragma.cpp", 
-                "src/duckdb/ub_src_function_scalar_generic.cpp", 
+                "src/duckdb/ub_src_function_scalar_compressed_materialization.cpp", 
                 "src/duckdb/ub_src_function_scalar.cpp", 
+                "src/duckdb/ub_src_function_scalar_generic.cpp", 
                 "src/duckdb/ub_src_function_scalar_list.cpp", 
                 "src/duckdb/ub_src_function_scalar_operators.cpp", 
                 "src/duckdb/ub_src_function_scalar_sequence.cpp", 
@@ -94,6 +95,7 @@
                 "src/duckdb/ub_src_main_relation.cpp", 
                 "src/duckdb/ub_src_main_settings.cpp", 
                 "src/duckdb/ub_src_optimizer.cpp", 
+                "src/duckdb/ub_src_optimizer_compressed_materialization.cpp", 
                 "src/duckdb/ub_src_optimizer_join_order.cpp", 
                 "src/duckdb/ub_src_optimizer_matcher.cpp", 
                 "src/duckdb/ub_src_optimizer_pullup.cpp", 
@@ -130,6 +132,7 @@
                 "src/duckdb/ub_src_storage_checkpoint.cpp", 
                 "src/duckdb/ub_src_storage_compression.cpp", 
                 "src/duckdb/ub_src_storage_compression_chimp.cpp", 
+                "src/duckdb/ub_src_storage_serialization.cpp", 
                 "src/duckdb/ub_src_storage_statistics.cpp", 
                 "src/duckdb/ub_src_storage_table.cpp", 
                 "src/duckdb/ub_src_transaction.cpp", 
@@ -237,18 +240,18 @@
                 "src/duckdb/third_party/zstd/compress/zstd_lazy.cpp", 
                 "src/duckdb/third_party/zstd/compress/zstd_ldm.cpp", 
                 "src/duckdb/third_party/zstd/compress/zstd_opt.cpp", 
-                "src/duckdb/extension/icu/./icu-datepart.cpp", 
-                "src/duckdb/extension/icu/./icu-timezone.cpp", 
-                "src/duckdb/extension/icu/./icu-makedate.cpp", 
-                "src/duckdb/extension/icu/./icu-table-range.cpp", 
-                "src/duckdb/extension/icu/./icu-datefunc.cpp", 
                 "src/duckdb/extension/icu/./icu-list-range.cpp", 
-                "src/duckdb/extension/icu/./icu-dateadd.cpp", 
+                "src/duckdb/extension/icu/./icu-table-range.cpp", 
                 "src/duckdb/extension/icu/./icu-datesub.cpp", 
+                "src/duckdb/extension/icu/./icu-dateadd.cpp", 
                 "src/duckdb/extension/icu/./icu-timebucket.cpp", 
-                "src/duckdb/extension/icu/./icu-strptime.cpp", 
+                "src/duckdb/extension/icu/./icu-makedate.cpp", 
+                "src/duckdb/extension/icu/./icu-timezone.cpp", 
+                "src/duckdb/extension/icu/./icu-datefunc.cpp", 
+                "src/duckdb/extension/icu/./icu-datepart.cpp", 
                 "src/duckdb/extension/icu/./icu_extension.cpp", 
                 "src/duckdb/extension/icu/./icu-datetrunc.cpp", 
+                "src/duckdb/extension/icu/./icu-strptime.cpp", 
                 "src/duckdb/ub_extension_icu_third_party_icu_common.cpp", 
                 "src/duckdb/ub_extension_icu_third_party_icu_i18n.cpp", 
                 "src/duckdb/extension/icu/third_party/icu/stubdata/stubdata.cpp", 
@@ -298,10 +301,10 @@
             ], 
             "defines": [
                 "NAPI_DISABLE_CPP_EXCEPTIONS=1", 
-                "NAPI_VERSION=5", 
-                "BUILD_PARQUET_EXTENSION", 
-                "BUILD_ICU_EXTENSION", 
-                "BUILD_JSON_EXTENSION"
+                "NAPI_VERSION=6", 
+                "DUCKDB_EXTENSION_PARQUET_LINKED", 
+                "DUCKDB_EXTENSION_ICU_LINKED", 
+                "DUCKDB_EXTENSION_JSON_LINKED"
             ], 
             "cflags_cc": [
                 "-frtti", 

package/binding.gyp.in

@@ -17,7 +17,7 @@
             ],
             "defines": [
                 "NAPI_DISABLE_CPP_EXCEPTIONS=1",
-                "NAPI_VERSION=5",
+                "NAPI_VERSION=6",
                 "${DEFINES}"
             ],
             "cflags_cc": [

package/configure.py

@@ -20,7 +20,7 @@ scripts_dir = 'scripts'
 sys.path.append(scripts_dir)
 import package_build
 
-defines = ['BUILD_{}_EXTENSION'.format(ext.upper()) for ext in extensions]
+defines = ['DUCKDB_EXTENSION_{}_LINKED'.format(ext.upper()) for ext in extensions]
 
 if os.environ.get('DUCKDB_NODE_BUILD_CACHE') == '1' and os.path.isfile(cache_file):
     with open(cache_file, 'rb') as f:

package/duckdb_extension_config.cmake

@@ -0,0 +1,10 @@
+################################################################################
+# NodeJS DuckDB extension config
+################################################################################
+#
+# This is the default extension configuration for NodeJS builds. Basically it means that all these extensions are
+# "baked in" to the NodeJS binaries Note that the configuration here is only when building Node using the main
+# CMakeLists.txt file with the `BUILD_R` variable.
+# TODO: unify this by making setup.py also use this configuration, making this the config for all Node builds
+duckdb_extension_load(json)
+duckdb_extension_load(icu)

package/package.json

@@ -2,7 +2,7 @@
   "name": "duckdb",
   "main": "./lib/duckdb.js",
   "types": "./lib/duckdb.d.ts",
-  "version": "0.8.2-dev161.0",
+  "version": "0.8.2-dev1764.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/duckdb/extension/icu/icu-dateadd.cpp

@@ -198,7 +198,7 @@ struct ICUDateAdd : public ICUDateFunc {
 		D_ASSERT(args.ColumnCount() == 1);
 
 		auto &func_expr = state.expr.Cast<BoundFunctionExpression>();
-		auto &info = (BindData &)*func_expr.bind_info;
+		auto &info = func_expr.bind_info->Cast<BindData>();
 		CalendarPtr calendar(info.calendar->clone());
 
 		auto end_date = Timestamp::GetCurrentTimestamp();
@@ -218,7 +218,7 @@ struct ICUDateAdd : public ICUDateFunc {
 		D_ASSERT(args.ColumnCount() == 2);
 
 		auto &func_expr = state.expr.Cast<BoundFunctionExpression>();
-		auto &info = (BindData &)*func_expr.bind_info;
+		auto &info = func_expr.bind_info->Cast<BindData>();
 		CalendarPtr calendar(info.calendar->clone());
 
 		BinaryExecutor::Execute<TA, TB, TR>(args.data[0], args.data[1], result, args.size(), [&](TA left, TB right) {

package/src/duckdb/extension/icu/icu-datefunc.cpp

@@ -37,7 +37,7 @@ ICUDateFunc::BindData::BindData(ClientContext &context) {
 }
 
 bool ICUDateFunc::BindData::Equals(const FunctionData &other_p) const {
-	auto &other = (const ICUDateFunc::BindData &)other_p;
+	auto &other = other_p.Cast<const BindData>();
 	return *calendar == *other.calendar;
 }
 

package/src/duckdb/extension/icu/icu-datepart.cpp

@@ -271,7 +271,7 @@ struct ICUDatePart : public ICUDateFunc {
 		auto &date_arg = args.data[1];
 
 		auto &func_expr = state.expr.Cast<BoundFunctionExpression>();
-		auto &info = (BIND_TYPE &)*func_expr.bind_info;
+		auto &info = func_expr.bind_info->Cast<BIND_TYPE>();
 		CalendarPtr calendar_ptr(info.calendar->clone());
 		auto calendar = calendar_ptr.get();
 
@@ -293,7 +293,7 @@ struct ICUDatePart : public ICUDateFunc {
 	static void StructFunction(DataChunk &args, ExpressionState &state, Vector &result) {
 		using BIND_TYPE = BindAdapterData<int64_t>;
 		auto &func_expr = state.expr.Cast<BoundFunctionExpression>();
-		auto &info = (BIND_TYPE &)*func_expr.bind_info;
+		auto &info = func_expr.bind_info->Cast<BIND_TYPE>();
 		CalendarPtr calendar_ptr(info.calendar->clone());
 		auto calendar = calendar_ptr.get();
 

package/src/duckdb/extension/icu/icu-datesub.cpp

@@ -96,7 +96,7 @@ struct ICUCalendarSub : public ICUDateFunc {
 		auto &enddate_arg = args.data[2];
 
 		auto &func_expr = state.expr.Cast<BoundFunctionExpression>();
-		auto &info = (BindData &)*func_expr.bind_info;
+		auto &info = func_expr.bind_info->Cast<BindData>();
 		CalendarPtr calendar(info.calendar->clone());
 
 		if (part_arg.GetVectorType() == VectorType::CONSTANT_VECTOR) {
@@ -218,7 +218,7 @@ struct ICUCalendarDiff : public ICUDateFunc {
 		auto &enddate_arg = args.data[2];
 
 		auto &func_expr = state.expr.Cast<BoundFunctionExpression>();
-		auto &info = (BindData &)*func_expr.bind_info;
+		auto &info = func_expr.bind_info->Cast<BindData>();
 		CalendarPtr calendar_ptr(info.calendar->clone());
 		auto calendar = calendar_ptr.get();
 

package/src/duckdb/extension/icu/icu-datetrunc.cpp

@@ -99,7 +99,7 @@ struct ICUDateTrunc : public ICUDateFunc {
 		auto &date_arg = args.data[1];
 
 		auto &func_expr = state.expr.Cast<BoundFunctionExpression>();
-		auto &info = (BindData &)*func_expr.bind_info;
+		auto &info = func_expr.bind_info->Cast<BindData>();
 		CalendarPtr calendar(info.calendar->clone());
 
 		if (part_arg.GetVectorType() == VectorType::CONSTANT_VECTOR) {

package/src/duckdb/extension/icu/icu-list-range.cpp

@@ -128,7 +128,7 @@ struct ICUListRange : public ICUDateFunc {
 		D_ASSERT(args.ColumnCount() == 3);
 
 		auto &func_expr = state.expr.Cast<BoundFunctionExpression>();
-		auto &bind_info = (BindData &)*func_expr.bind_info;
+		auto &bind_info = func_expr.bind_info->Cast<BindData>();
 		CalendarPtr calendar_ptr(bind_info.calendar->clone());
 		auto calendar = calendar_ptr.get();
 

package/src/duckdb/extension/icu/icu-makedate.cpp

@@ -85,6 +85,12 @@ struct ICUMakeTimestampTZFunc : public ICUDateFunc {
 		return GetTime(calendar, micros);
 	}
 
+	template <typename T>
+	static void FromMicros(DataChunk &input, ExpressionState &state, Vector &result) {
+		UnaryExecutor::Execute<T, timestamp_t>(input.data[0], result, input.size(),
+		                                       [&](T micros) { return timestamp_t(micros); });
+	}
+
 	template <typename T>
 	static void Execute(DataChunk &input, ExpressionState &state, Vector &result) {
 		auto &func_expr = state.expr.Cast<BoundFunctionExpression>();
@@ -138,6 +144,7 @@ struct ICUMakeTimestampTZFunc : public ICUDateFunc {
 		ScalarFunctionSet set(name);
 		set.AddFunction(GetSenaryFunction<int64_t>(LogicalType::BIGINT));
 		set.AddFunction(GetSeptenaryFunction<int64_t>(LogicalType::BIGINT));
+		set.AddFunction(ScalarFunction({LogicalType::BIGINT}, LogicalType::TIMESTAMP_TZ, FromMicros<int64_t>));
 
 		CreateScalarFunctionInfo func_info(set);
 		auto &catalog = Catalog::GetSystemCatalog(context);

package/src/duckdb/extension/icu/icu-strptime.cpp

@@ -249,8 +249,8 @@ struct ICUStrptime : public ICUDateFunc {
 
 	static bool CastFromVarchar(Vector &source, Vector &result, idx_t count, CastParameters &parameters) {
 		auto &cast_data = parameters.cast_data->Cast<CastData>();
-		auto info = (BindData *)cast_data.info.get();
-		CalendarPtr cal(info->calendar->clone());
+		auto &info = cast_data.info->Cast<BindData>();
+		CalendarPtr cal(info.calendar->clone());
 
 		UnaryExecutor::ExecuteWithNulls<string_t, timestamp_t>(
 		    source, result, count, [&](string_t input, ValidityMask &mask, idx_t idx) {
@@ -476,8 +476,8 @@ struct ICUStrftime : public ICUDateFunc {
 
 	static bool CastToVarchar(Vector &source, Vector &result, idx_t count, CastParameters &parameters) {
 		auto &cast_data = parameters.cast_data->Cast<CastData>();
-		auto info = (BindData *)cast_data.info.get();
-		CalendarPtr calendar(info->calendar->clone());
+		auto &info = cast_data.info->Cast<BindData>();
+		CalendarPtr calendar(info.calendar->clone());
 
 		UnaryExecutor::ExecuteWithNulls<timestamp_t, string_t>(source, result, count,
 		                                                       [&](timestamp_t input, ValidityMask &mask, idx_t idx) {

package/src/duckdb/extension/icu/icu-table-range.cpp

@@ -55,7 +55,7 @@ struct ICUTableRange {
 		bool greater_than_check;
 
 		bool Equals(const FunctionData &other_p) const override {
-			auto &other = (const BindData &)other_p;
+			auto &other = other_p.Cast<const BindData>();
 			return other.start == start && other.end == end && other.increment == increment &&
 			       other.inclusive_bound == inclusive_bound && other.greater_than_check == greater_than_check &&
 			       *calendar == *other.calendar;
@@ -65,7 +65,7 @@ struct ICUTableRange {
 			return make_uniq<BindData>(*this);
 		}
 
-		bool Finished(timestamp_t current_value) {
+		bool Finished(timestamp_t current_value) const {
 			if (greater_than_check) {
 				if (inclusive_bound) {
 					return current_value > end;
@@ -139,15 +139,15 @@ struct ICUTableRange {
 	};
 
 	static unique_ptr<GlobalTableFunctionState> Init(ClientContext &context, TableFunctionInitInput &input) {
-		auto &bind_data = (BindData &)*input.bind_data;
+		auto &bind_data = input.bind_data->Cast<BindData>();
 		return make_uniq<State>(bind_data.start);
 	}
 
 	static void ICUTableRangeFunction(ClientContext &context, TableFunctionInput &data_p, DataChunk &output) {
-		auto &bind_data = (BindData &)*data_p.bind_data;
+		auto &bind_data = data_p.bind_data->Cast<BindData>();
 		CalendarPtr calendar_ptr(bind_data.calendar->clone());
 		auto calendar = calendar_ptr.get();
-		auto &state = (State &)*data_p.global_state;
+		auto &state = data_p.global_state->Cast<State>();
 		if (state.finished) {
 			return;
 		}

package/src/duckdb/extension/icu/icu-timebucket.cpp

@@ -75,8 +75,8 @@ struct ICUTimeBucket : public ICUDateFunc {
 
 	static inline timestamp_t WidthConvertibleToDaysCommon(int32_t bucket_width_days, const timestamp_t ts,
 	                                                       const timestamp_t origin, icu::Calendar *calendar) {
-		static part_trunc_t trunc_days = TruncationFactory(DatePartSpecifier::DAY);
-		static part_sub_t sub_days = SubtractFactory(DatePartSpecifier::DAY);
+		const auto trunc_days = TruncationFactory(DatePartSpecifier::DAY);
+		const auto sub_days = SubtractFactory(DatePartSpecifier::DAY);
 
 		uint64_t tmp_micros = SetTime(calendar, ts);
 		trunc_days(calendar, tmp_micros);
@@ -97,8 +97,8 @@ struct ICUTimeBucket : public ICUDateFunc {
 
 	static inline timestamp_t WidthConvertibleToMonthsCommon(int32_t bucket_width_months, const timestamp_t ts,
 	                                                         const timestamp_t origin, icu::Calendar *calendar) {
-		static part_trunc_t trunc_months = TruncationFactory(DatePartSpecifier::MONTH);
-		static part_sub_t sub_months = SubtractFactory(DatePartSpecifier::MONTH);
+		const auto trunc_months = TruncationFactory(DatePartSpecifier::MONTH);
+		const auto sub_months = SubtractFactory(DatePartSpecifier::MONTH);
 
 		uint64_t tmp_micros = SetTime(calendar, ts);
 		trunc_months(calendar, tmp_micros);
@@ -126,7 +126,7 @@ struct ICUTimeBucket : public ICUDateFunc {
 		D_ASSERT(args.ColumnCount() == 2);
 
 		auto &func_expr = state.expr.Cast<BoundFunctionExpression>();
-		auto &info = (BindData &)*func_expr.bind_info;
+		auto &info = func_expr.bind_info->Cast<BindData>();
 		CalendarPtr calendar(info.calendar->clone());
 
 		BinaryExecutor::Execute<TA, TB, TR>(args.data[0], args.data[1], result, args.size(), [&](TA left, TB right) {
@@ -139,7 +139,7 @@ struct ICUTimeBucket : public ICUDateFunc {
 		D_ASSERT(args.ColumnCount() == 3);
 
 		auto &func_expr = state.expr.Cast<BoundFunctionExpression>();
-		auto &info = (BindData &)*func_expr.bind_info;
+		auto &info = func_expr.bind_info->Cast<BindData>();
 		CalendarPtr calendar(info.calendar->clone());
 
 		TernaryExecutor::Execute<TA, TB, TC, TR>(
@@ -153,7 +153,7 @@ struct ICUTimeBucket : public ICUDateFunc {
 			if (!Value::IsFinite(ts)) {
 				return ts;
 			}
-			static timestamp_t origin = Timestamp::FromEpochMicroSeconds(DEFAULT_ORIGIN_MICROS_1);
+			const auto origin = Timestamp::FromEpochMicroSeconds(DEFAULT_ORIGIN_MICROS_1);
 			return WidthConvertibleToMicrosCommon(bucket_width.micros, ts, origin, calendar);
 		}
 	};
@@ -163,7 +163,7 @@ struct ICUTimeBucket : public ICUDateFunc {
 			if (!Value::IsFinite(ts)) {
 				return ts;
 			}
-			static timestamp_t origin = Timestamp::FromEpochMicroSeconds(DEFAULT_ORIGIN_MICROS_1);
+			const auto origin = Timestamp::FromEpochMicroSeconds(DEFAULT_ORIGIN_MICROS_1);
 			return WidthConvertibleToDaysCommon(bucket_width.days, ts, origin, calendar);
 		}
 	};
@@ -173,7 +173,7 @@ struct ICUTimeBucket : public ICUDateFunc {
 			if (!Value::IsFinite(ts)) {
 				return ts;
 			}
-			static timestamp_t origin = Timestamp::FromEpochMicroSeconds(DEFAULT_ORIGIN_MICROS_2);
+			const auto origin = Timestamp::FromEpochMicroSeconds(DEFAULT_ORIGIN_MICROS_2);
 			return WidthConvertibleToMonthsCommon(bucket_width.months, ts, origin, calendar);
 		}
 	};
@@ -200,7 +200,7 @@ struct ICUTimeBucket : public ICUDateFunc {
 			if (!Value::IsFinite(ts)) {
 				return ts;
 			}
-			static timestamp_t origin = Timestamp::FromEpochMicroSeconds(DEFAULT_ORIGIN_MICROS_1);
+			const auto origin = Timestamp::FromEpochMicroSeconds(DEFAULT_ORIGIN_MICROS_1);
 			return Add(calendar,
 			           WidthConvertibleToMicrosCommon(bucket_width.micros, Sub(calendar, ts, offset), origin, calendar),
 			           offset);
@@ -213,7 +213,7 @@ struct ICUTimeBucket : public ICUDateFunc {
 			if (!Value::IsFinite(ts)) {
 				return ts;
 			}
-			static timestamp_t origin = Timestamp::FromEpochMicroSeconds(DEFAULT_ORIGIN_MICROS_1);
+			const auto origin = Timestamp::FromEpochMicroSeconds(DEFAULT_ORIGIN_MICROS_1);
 			return Add(calendar,
 			           WidthConvertibleToDaysCommon(bucket_width.days, Sub(calendar, ts, offset), origin, calendar),
 			           offset);
@@ -226,7 +226,7 @@ struct ICUTimeBucket : public ICUDateFunc {
 			if (!Value::IsFinite(ts)) {
 				return ts;
 			}
-			static timestamp_t origin = Timestamp::FromEpochMicroSeconds(DEFAULT_ORIGIN_MICROS_2);
+			const auto origin = Timestamp::FromEpochMicroSeconds(DEFAULT_ORIGIN_MICROS_2);
 			return Add(calendar,
 			           WidthConvertibleToMonthsCommon(bucket_width.months, Sub(calendar, ts, offset), origin, calendar),
 			           offset);
@@ -358,7 +358,7 @@ struct ICUTimeBucket : public ICUDateFunc {
 		D_ASSERT(args.ColumnCount() == 2);
 
 		auto &func_expr = state.expr.Cast<BoundFunctionExpression>();
-		auto &info = (BindData &)*func_expr.bind_info;
+		auto &info = func_expr.bind_info->Cast<BindData>();
 		CalendarPtr calendar_ptr(info.calendar->clone());
 		auto calendar = calendar_ptr.get();
 		SetTimeZone(calendar, string_t("UTC"));
@@ -414,7 +414,7 @@ struct ICUTimeBucket : public ICUDateFunc {
 		D_ASSERT(args.ColumnCount() == 3);
 
 		auto &func_expr = state.expr.Cast<BoundFunctionExpression>();
-		auto &info = (BindData &)*func_expr.bind_info;
+		auto &info = func_expr.bind_info->Cast<BindData>();
 		CalendarPtr calendar_ptr(info.calendar->clone());
 		auto calendar = calendar_ptr.get();
 		SetTimeZone(calendar, string_t("UTC"));
@@ -479,7 +479,7 @@ struct ICUTimeBucket : public ICUDateFunc {
 		D_ASSERT(args.ColumnCount() == 3);
 
 		auto &func_expr = state.expr.Cast<BoundFunctionExpression>();
-		auto &info = (BindData &)*func_expr.bind_info;
+		auto &info = func_expr.bind_info->Cast<BindData>();
 		CalendarPtr calendar_ptr(info.calendar->clone());
 		auto calendar = calendar_ptr.get();
 		SetTimeZone(calendar, string_t("UTC"));
@@ -547,7 +547,7 @@ struct ICUTimeBucket : public ICUDateFunc {
 		D_ASSERT(args.ColumnCount() == 3);
 
 		auto &func_expr = state.expr.Cast<BoundFunctionExpression>();
-		auto &info = (BindData &)*func_expr.bind_info;
+		auto &info = func_expr.bind_info->Cast<BindData>();
 		CalendarPtr calendar_ptr(info.calendar->clone());
 		auto calendar = calendar_ptr.get();
 

package/src/duckdb/extension/icu/icu-timezone.cpp

@@ -40,7 +40,7 @@ static duckdb::unique_ptr<GlobalTableFunctionState> ICUTimeZoneInit(ClientContex
 }
 
 static void ICUTimeZoneFunction(ClientContext &context, TableFunctionInput &data_p, DataChunk &output) {
-	auto &data = (ICUTimeZoneData &)*data_p.global_state;
+	auto &data = data_p.global_state->Cast<ICUTimeZoneData>();
 	idx_t index = 0;
 	while (index < STANDARD_VECTOR_SIZE) {
 		UErrorCode status = U_ZERO_ERROR;
@@ -125,8 +125,8 @@ struct ICUFromNaiveTimestamp : public ICUDateFunc {
 
 	static bool CastFromNaive(Vector &source, Vector &result, idx_t count, CastParameters &parameters) {
 		auto &cast_data = parameters.cast_data->Cast<CastData>();
-		auto info = (BindData *)cast_data.info.get();
-		CalendarPtr calendar(info->calendar->clone());
+		auto &info = cast_data.info->Cast<BindData>();
+		CalendarPtr calendar(info.calendar->clone());
 
 		UnaryExecutor::Execute<timestamp_t, timestamp_t>(
 		    source, result, count, [&](timestamp_t input) { return Operation(calendar.get(), input); });
@@ -188,8 +188,8 @@ struct ICUToNaiveTimestamp : public ICUDateFunc {
 
 	static bool CastToNaive(Vector &source, Vector &result, idx_t count, CastParameters &parameters) {
 		auto &cast_data = parameters.cast_data->Cast<CastData>();
-		auto info = (BindData *)cast_data.info.get();
-		CalendarPtr calendar(info->calendar->clone());
+		auto &info = cast_data.info->Cast<BindData>();
+		CalendarPtr calendar(info.calendar->clone());
 
 		UnaryExecutor::Execute<timestamp_t, timestamp_t>(
 		    source, result, count, [&](timestamp_t input) { return Operation(calendar.get(), input); });
@@ -225,7 +225,7 @@ struct ICULocalTimestampFunc : public ICUDateFunc {
 		}
 
 		bool Equals(const FunctionData &other_p) const override {
-			auto &other = (const BindDataNow &)other_p;
+			auto &other = other_p.Cast<const BindDataNow>();
 			if (now != other.now) {
 				return false;
 			}
@@ -247,7 +247,7 @@ struct ICULocalTimestampFunc : public ICUDateFunc {
 
 	static timestamp_t GetLocalTimestamp(ExpressionState &state) {
 		auto &func_expr = state.expr.Cast<BoundFunctionExpression>();
-		auto &info = (BindDataNow &)*func_expr.bind_info;
+		auto &info = func_expr.bind_info->Cast<BindDataNow>();
 		CalendarPtr calendar_ptr(info.calendar->clone());
 		auto calendar = calendar_ptr.get();
 
@@ -296,7 +296,7 @@ struct ICUTimeZoneFunc : public ICUDateFunc {
 	template <typename OP>
 	static void Execute(DataChunk &input, ExpressionState &state, Vector &result) {
 		auto &func_expr = state.expr.Cast<BoundFunctionExpression>();
-		auto &info = (BindData &)*func_expr.bind_info;
+		auto &info = func_expr.bind_info->Cast<BindData>();
 		CalendarPtr calendar_ptr(info.calendar->clone());
 		auto calendar = calendar_ptr.get();
 

package/src/duckdb/extension/icu/icu_extension.cpp

@@ -67,13 +67,13 @@ static int32_t ICUGetSortKey(icu::Collator &collator, string_t input, duckdb::un
                              int32_t &buffer_size) {
 	icu::UnicodeString unicode_string =
 	    icu::UnicodeString::fromUTF8(icu::StringPiece(input.GetData(), input.GetSize()));
-	int32_t string_size = collator.getSortKey(unicode_string, (uint8_t *)buffer.get(), buffer_size);
+	int32_t string_size = collator.getSortKey(unicode_string, reinterpret_cast<uint8_t *>(buffer.get()), buffer_size);
 	if (string_size > buffer_size) {
 		// have to resize the buffer
 		buffer_size = string_size;
 		buffer = duckdb::unique_ptr<char[]>(new char[buffer_size]);
 
-		string_size = collator.getSortKey(unicode_string, (uint8_t *)buffer.get(), buffer_size);
+		string_size = collator.getSortKey(unicode_string, reinterpret_cast<uint8_t *>(buffer.get()), buffer_size);
 	}
 	return string_size;
 }
@@ -185,7 +185,7 @@ static duckdb::unique_ptr<GlobalTableFunctionState> ICUCalendarInit(ClientContex
 }
 
 static void ICUCalendarFunction(ClientContext &context, TableFunctionInput &data_p, DataChunk &output) {
-	auto &data = (ICUCalendarData &)*data_p.global_state;
+	auto &data = data_p.global_state->Cast<ICUCalendarData>();
 	idx_t index = 0;
 	while (index < STANDARD_VECTOR_SIZE) {
 		if (!data.calendars) {