duckdb 0.8.1-dev51.0 → 0.8.1-dev96.0

package/src/duckdb/src/common/types/row/tuple_data_scatter_gather.cpp

@@ -30,7 +30,7 @@ inline void TupleDataValueStore(const string_t &source, const data_ptr_t &row_lo
 		Store<string_t>(source, row_location + offset_in_row);
 	} else {
 		memcpy(heap_location, source.GetData(), source.GetSize());
-		Store<string_t>(string_t((const char *)heap_location, source.GetSize()), row_location + offset_in_row);
+		Store<string_t>(string_t(const_char_ptr_cast(heap_location), source.GetSize()), row_location + offset_in_row);
 		heap_location += source.GetSize();
 	}
 }
@@ -57,7 +57,7 @@ static inline T TupleDataWithinListValueLoad(const data_ptr_t &location, data_pt
 template <>
 inline string_t TupleDataWithinListValueLoad(const data_ptr_t &location, data_ptr_t &heap_location) {
 	const auto size = Load<uint32_t>(location);
-	string_t result((const char *)heap_location, size);
+	string_t result(const_char_ptr_cast(heap_location), size);
 	heap_location += size;
 	return result;
 }
@@ -96,7 +96,7 @@ void TupleDataCollection::ComputeHeapSizes(Vector &heap_sizes_v, const Vector &s
 	switch (type) {
 	case PhysicalType::VARCHAR: {
 		// Only non-inlined strings are stored in the heap
-		const auto source_data = (string_t *)source_vector_data.data;
+		const auto source_data = UnifiedVectorFormat::GetData<string_t>(source_vector_data);
 		for (idx_t i = 0; i < append_count; i++) {
 			const auto source_idx = source_sel.get_index(append_sel.get_index(i));
 			if (source_validity.RowIsValid(source_idx)) {
@@ -175,7 +175,7 @@ void TupleDataCollection::ComputeFixedWithinListHeapSizes(Vector &heap_sizes_v,
                                                           const UnifiedVectorFormat &list_data) {
 	// List data
 	const auto list_sel = *list_data.sel;
-	const auto list_entries = (list_entry_t *)list_data.data;
+	const auto list_entries = UnifiedVectorFormat::GetData<list_entry_t>(list_data);
 	const auto &list_validity = list_data.validity;
 
 	// Target
@@ -206,12 +206,12 @@ void TupleDataCollection::StringWithinListComputeHeapSizes(Vector &heap_sizes_v,
 	// Source
 	const auto &source_data = source_format.data;
 	const auto source_sel = *source_data.sel;
-	const auto data = (string_t *)source_data.data;
+	const auto data = UnifiedVectorFormat::GetData<string_t>(source_data);
 	const auto &source_validity = source_data.validity;
 
 	// List data
 	const auto list_sel = *list_data.sel;
-	const auto list_entries = (list_entry_t *)list_data.data;
+	const auto list_entries = UnifiedVectorFormat::GetData<list_entry_t>(list_data);
 	const auto &list_validity = list_data.validity;
 
 	// Target
@@ -249,7 +249,7 @@ void TupleDataCollection::StructWithinListComputeHeapSizes(Vector &heap_sizes_v,
                                                            const UnifiedVectorFormat &list_data) {
 	// List data
 	const auto list_sel = *list_data.sel;
-	const auto list_entries = (list_entry_t *)list_data.data;
+	const auto list_entries = UnifiedVectorFormat::GetData<list_entry_t>(list_data);
 	const auto &list_validity = list_data.validity;
 
 	// Target
@@ -305,13 +305,13 @@ void TupleDataCollection::ListWithinListComputeHeapSizes(Vector &heap_sizes_v, c
                                                          const UnifiedVectorFormat &list_data) {
 	// List data (of the list Vector that "source_v" is in)
 	const auto list_sel = *list_data.sel;
-	const auto list_entries = (list_entry_t *)list_data.data;
+	const auto list_entries = UnifiedVectorFormat::GetData<list_entry_t>(list_data);
 	const auto &list_validity = list_data.validity;
 
 	// Child list
 	const auto &child_list_data = source_format.data;
 	const auto child_list_sel = *child_list_data.sel;
-	const auto child_list_entries = (list_entry_t *)child_list_data.data;
+	const auto child_list_entries = UnifiedVectorFormat::GetData<list_entry_t>(child_list_data);
 	const auto &child_list_validity = child_list_data.validity;
 
 	// Figure out actual child list size (differs from ListVector::GetListSize if dict/const vector)
@@ -384,7 +384,7 @@ void TupleDataCollection::ListWithinListComputeHeapSizes(Vector &heap_sizes_v, c
 	// Create a combined child_list_data to be used as list_data in the recursion
 	auto &combined_child_list_data = combined_list_data.combined_data;
 	combined_child_list_data.sel = list_data.sel;
-	combined_child_list_data.data = (data_ptr_t)combined_list_entries;
+	combined_child_list_data.data = data_ptr_cast(combined_list_entries);
 	combined_child_list_data.validity = list_data.validity;
 
 	// Combine the selection vectors
@@ -439,7 +439,7 @@ static void TupleDataTemplatedScatter(const Vector &source, const TupleDataVecto
 	// Source
 	const auto &source_data = source_format.data;
 	const auto source_sel = *source_data.sel;
-	const auto data = (T *)source_data.data;
+	const auto data = UnifiedVectorFormat::GetData<T>(source_data);
 	const auto &validity = source_data.validity;
 
 	// Target
@@ -535,7 +535,7 @@ static void TupleDataListScatter(const Vector &source, const TupleDataVectorForm
 	// Source
 	const auto &source_data = source_format.data;
 	const auto source_sel = *source_data.sel;
-	const auto data = (list_entry_t *)source_data.data;
+	const auto data = UnifiedVectorFormat::GetData<list_entry_t>(source_data);
 	const auto &validity = source_data.validity;
 
 	// Target
@@ -582,12 +582,12 @@ static void TupleDataTemplatedWithinListScatter(const Vector &source, const Tupl
 	// Source
 	const auto &source_data = source_format.data;
 	const auto source_sel = *source_data.sel;
-	const auto data = (T *)source_data.data;
+	const auto data = UnifiedVectorFormat::GetData<T>(source_data);
 	const auto &source_validity = source_data.validity;
 
 	// List data
 	const auto list_sel = *list_data.sel;
-	const auto list_entries = (list_entry_t *)list_data.data;
+	const auto list_entries = UnifiedVectorFormat::GetData<list_entry_t>(list_data);
 	const auto &list_validity = list_data.validity;
 
 	// Target
@@ -641,7 +641,7 @@ static void TupleDataStructWithinListScatter(const Vector &source, const TupleDa
 
 	// List data
 	const auto list_sel = *list_data.sel;
-	const auto list_entries = (list_entry_t *)list_data.data;
+	const auto list_entries = UnifiedVectorFormat::GetData<list_entry_t>(list_data);
 	const auto &list_validity = list_data.validity;
 
 	// Target
@@ -693,13 +693,13 @@ static void TupleDataListWithinListScatter(const Vector &child_list, const Tuple
                                            const vector<TupleDataScatterFunction> &child_functions) {
 	// List data (of the list Vector that "child_list" is in)
 	const auto list_sel = *list_data.sel;
-	const auto list_entries = (list_entry_t *)list_data.data;
+	const auto list_entries = UnifiedVectorFormat::GetData<list_entry_t>(list_data);
 	const auto &list_validity = list_data.validity;
 
 	// Child list
 	const auto &child_list_data = child_list_format.data;
 	const auto child_list_sel = *child_list_data.sel;
-	const auto child_list_entries = (list_entry_t *)child_list_data.data;
+	const auto child_list_entries = UnifiedVectorFormat::GetData<list_entry_t>(child_list_data);
 	const auto &child_list_validity = child_list_data.validity;
 
 	// Target

package/src/duckdb/src/common/types/string_heap.cpp

@@ -51,7 +51,7 @@ string_t StringHeap::AddBlob(const string_t &data) {
 
 string_t StringHeap::EmptyString(idx_t len) {
 	D_ASSERT(len > string_t::INLINE_LENGTH);
-	auto insert_pos = (const char *)allocator.Allocate(len);
+	auto insert_pos = const_char_ptr_cast(allocator.Allocate(len));
 	return string_t(insert_pos, len);
 }
 

package/src/duckdb/src/common/types/value.cpp

@@ -730,7 +730,7 @@ Value Value::EMPTYLIST(const LogicalType &child_type) {
 Value Value::BLOB(const_data_ptr_t data, idx_t len) {
 	Value result(LogicalType::BLOB);
 	result.is_null = false;
-	result.value_info_ = make_shared<StringValueInfo>(string((const char *)data, len));
+	result.value_info_ = make_shared<StringValueInfo>(string(const_char_ptr_cast(data), len));
 	return result;
 }
 
@@ -744,7 +744,7 @@ Value Value::BLOB(const string &data) {
 Value Value::BIT(const_data_ptr_t data, idx_t len) {
 	Value result(LogicalType::BIT);
 	result.is_null = false;
-	result.value_info_ = make_shared<StringValueInfo>(string((const char *)data, len));
+	result.value_info_ = make_shared<StringValueInfo>(string(const_char_ptr_cast(data), len));
 	return result;
 }