duckdb 0.7.2-dev1901.0 → 0.7.2-dev2233.0

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

@@ -0,0 +1,1200 @@
+#include "duckdb/common/fast_mem.hpp"
+#include "duckdb/common/types/null_value.hpp"
+#include "duckdb/common/types/row/tuple_data_collection.hpp"
+
+namespace duckdb {
+
+using ValidityBytes = TupleDataLayout::ValidityBytes;
+
+template <class T>
+static constexpr idx_t TupleDataWithinListFixedSize() {
+	return sizeof(T);
+}
+
+template <>
+constexpr idx_t TupleDataWithinListFixedSize<string_t>() {
+	return sizeof(uint32_t);
+}
+
+template <class T>
+static inline void TupleDataValueStore(const T &source, const data_ptr_t &row_location, const idx_t offset_in_row,
+                                       data_ptr_t &heap_location) {
+	Store<T>(source, row_location + offset_in_row);
+}
+
+template <>
+inline void TupleDataValueStore(const string_t &source, const data_ptr_t &row_location, const idx_t offset_in_row,
+                                data_ptr_t &heap_location) {
+	if (source.IsInlined()) {
+		Store<string_t>(source, row_location + offset_in_row);
+	} else {
+		memcpy(heap_location, source.GetDataUnsafe(), source.GetSize());
+		Store<string_t>(string_t((const char *)heap_location, source.GetSize()), row_location + offset_in_row);
+		heap_location += source.GetSize();
+	}
+}
+
+template <class T>
+static inline void TupleDataWithinListValueStore(const T &source, const data_ptr_t &location,
+                                                 data_ptr_t &heap_location) {
+	Store<T>(source, location);
+}
+
+template <>
+inline void TupleDataWithinListValueStore(const string_t &source, const data_ptr_t &location,
+                                          data_ptr_t &heap_location) {
+	Store<uint32_t>(source.GetSize(), location);
+	memcpy(heap_location, source.GetDataUnsafe(), source.GetSize());
+	heap_location += source.GetSize();
+}
+
+template <class T>
+static inline T TupleDataWithinListValueLoad(const data_ptr_t &location, data_ptr_t &heap_location) {
+	return Load<T>(location);
+}
+
+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);
+	heap_location += size;
+	return result;
+}
+
+void TupleDataCollection::ComputeHeapSizes(TupleDataChunkState &chunk_state, const DataChunk &new_chunk,
+                                           const SelectionVector &append_sel, const idx_t append_count) {
+	auto heap_sizes = FlatVector::GetData<idx_t>(chunk_state.heap_sizes);
+	std::fill_n(heap_sizes, new_chunk.size(), 0);
+
+	for (idx_t col_idx = 0; col_idx < new_chunk.ColumnCount(); col_idx++) {
+		auto &source_v = new_chunk.data[col_idx];
+		auto &source_format = chunk_state.vector_data[col_idx];
+		TupleDataCollection::ComputeHeapSizes(chunk_state.heap_sizes, source_v, source_format, append_sel,
+		                                      append_count);
+	}
+}
+
+static inline idx_t StringHeapSize(const string_t &val) {
+	return val.IsInlined() ? 0 : val.GetSize();
+}
+
+void TupleDataCollection::ComputeHeapSizes(Vector &heap_sizes_v, const Vector &source_v,
+                                           TupleDataVectorFormat &source_format, const SelectionVector &append_sel,
+                                           const idx_t append_count) {
+	const auto type = source_v.GetType().InternalType();
+	if (type != PhysicalType::VARCHAR && type != PhysicalType::STRUCT && type != PhysicalType::LIST) {
+		return;
+	}
+
+	auto heap_sizes = FlatVector::GetData<idx_t>(heap_sizes_v);
+
+	const auto &source_vector_data = source_format.data;
+	const auto &source_sel = *source_vector_data.sel;
+	const auto &source_validity = source_vector_data.validity;
+
+	switch (type) {
+	case PhysicalType::VARCHAR: {
+		// Only non-inlined strings are stored in the heap
+		const auto source_data = (string_t *)source_vector_data.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)) {
+				heap_sizes[i] += StringHeapSize(source_data[source_idx]);
+			} else {
+				heap_sizes[i] += StringHeapSize(NullValue<string_t>());
+			}
+		}
+		break;
+	}
+	case PhysicalType::STRUCT: {
+		// Recurse through the struct children
+		auto &struct_sources = StructVector::GetEntries(source_v);
+		for (idx_t struct_col_idx = 0; struct_col_idx < struct_sources.size(); struct_col_idx++) {
+			const auto &struct_source = struct_sources[struct_col_idx];
+			auto &struct_format = source_format.child_formats[struct_col_idx];
+			TupleDataCollection::ComputeHeapSizes(heap_sizes_v, *struct_source, struct_format, append_sel,
+			                                      append_count);
+		}
+		break;
+	}
+	case PhysicalType::LIST: {
+		// Lists are stored entirely in the heap
+		for (idx_t i = 0; i < append_count; i++) {
+			auto source_idx = source_sel.get_index(append_sel.get_index(i));
+			if (source_validity.RowIsValid(source_idx)) {
+				heap_sizes[i] += sizeof(uint64_t); // Size of the list
+			}
+		}
+
+		// Recurse
+		D_ASSERT(source_format.child_formats.size() == 1);
+		auto &child_source_v = ListVector::GetEntry(source_v);
+		auto &child_format = source_format.child_formats[0];
+		TupleDataCollection::WithinListHeapComputeSizes(heap_sizes_v, child_source_v, child_format, append_sel,
+		                                                append_count, source_vector_data);
+		break;
+	}
+	default:
+		throw NotImplementedException("ComputeHeapSizes for %s", LogicalTypeIdToString(source_v.GetType().id()));
+	}
+}
+
+void TupleDataCollection::WithinListHeapComputeSizes(Vector &heap_sizes_v, const Vector &source_v,
+                                                     TupleDataVectorFormat &source_format,
+                                                     const SelectionVector &append_sel, const idx_t append_count,
+                                                     const UnifiedVectorFormat &list_data) {
+	auto type = source_v.GetType().InternalType();
+	if (TypeIsConstantSize(type)) {
+		TupleDataCollection::ComputeFixedWithinListHeapSizes(heap_sizes_v, source_v, source_format, append_sel,
+		                                                     append_count, list_data);
+		return;
+	}
+
+	switch (type) {
+	case PhysicalType::VARCHAR:
+		TupleDataCollection::StringWithinListComputeHeapSizes(heap_sizes_v, source_v, source_format, append_sel,
+		                                                      append_count, list_data);
+		break;
+	case PhysicalType::STRUCT:
+		TupleDataCollection::StructWithinListComputeHeapSizes(heap_sizes_v, source_v, source_format, append_sel,
+		                                                      append_count, list_data);
+		break;
+	case PhysicalType::LIST:
+		TupleDataCollection::ListWithinListComputeHeapSizes(heap_sizes_v, source_v, source_format, append_sel,
+		                                                    append_count, list_data);
+		break;
+	default:
+		throw NotImplementedException("WithinListHeapComputeSizes for %s",
+		                              LogicalTypeIdToString(source_v.GetType().id()));
+	}
+}
+
+void TupleDataCollection::ComputeFixedWithinListHeapSizes(Vector &heap_sizes_v, const Vector &source_v,
+                                                          TupleDataVectorFormat &source_format,
+                                                          const SelectionVector &append_sel, const idx_t append_count,
+                                                          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_validity = list_data.validity;
+
+	// Target
+	auto heap_sizes = FlatVector::GetData<idx_t>(heap_sizes_v);
+
+	D_ASSERT(TypeIsConstantSize(source_v.GetType().InternalType()));
+	const auto type_size = GetTypeIdSize(source_v.GetType().InternalType());
+	for (idx_t i = 0; i < append_count; i++) {
+		const auto list_idx = list_sel.get_index(append_sel.get_index(i));
+		if (!list_validity.RowIsValid(list_idx)) {
+			continue; // Original list entry is invalid - no need to serialize the child
+		}
+
+		// Get the current list length
+		const auto &list_length = list_entries[list_idx].length;
+
+		// Size is validity mask and all values
+		auto &heap_size = heap_sizes[i];
+		heap_size += ValidityBytes::SizeInBytes(list_length);
+		heap_size += list_length * type_size;
+	}
+}
+
+void TupleDataCollection::StringWithinListComputeHeapSizes(Vector &heap_sizes_v, const Vector &source_v,
+                                                           TupleDataVectorFormat &source_format,
+                                                           const SelectionVector &append_sel, const idx_t append_count,
+                                                           const UnifiedVectorFormat &list_data) {
+	// 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 &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_validity = list_data.validity;
+
+	// Target
+	auto heap_sizes = FlatVector::GetData<idx_t>(heap_sizes_v);
+
+	for (idx_t i = 0; i < append_count; i++) {
+		const auto list_idx = list_sel.get_index(append_sel.get_index(i));
+		if (!list_validity.RowIsValid(list_idx)) {
+			continue; // Original list entry is invalid - no need to serialize the child
+		}
+
+		// Get the current list entry
+		const auto &list_entry = list_entries[list_idx];
+		const auto &list_offset = list_entry.offset;
+		const auto &list_length = list_entry.length;
+
+		// Size is validity mask and all string sizes
+		auto &heap_size = heap_sizes[i];
+		heap_size += ValidityBytes::SizeInBytes(list_length);
+		heap_size += list_length * TupleDataWithinListFixedSize<string_t>();
+
+		// Plus all the actual strings
+		for (idx_t child_i = 0; child_i < list_length; child_i++) {
+			const auto child_source_idx = source_sel.get_index(list_offset + child_i);
+			if (source_validity.RowIsValid(child_source_idx)) {
+				heap_size += data[child_source_idx].GetSize();
+			}
+		}
+	}
+}
+
+void TupleDataCollection::StructWithinListComputeHeapSizes(Vector &heap_sizes_v, const Vector &source_v,
+                                                           TupleDataVectorFormat &source_format,
+                                                           const SelectionVector &append_sel, const idx_t append_count,
+                                                           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_validity = list_data.validity;
+
+	// Target
+	auto heap_sizes = FlatVector::GetData<idx_t>(heap_sizes_v);
+
+	for (idx_t i = 0; i < append_count; i++) {
+		const auto list_idx = list_sel.get_index(append_sel.get_index(i));
+		if (!list_validity.RowIsValid(list_idx)) {
+			continue; // Original list entry is invalid - no need to serialize the child
+		}
+
+		// Get the current list length
+		const auto &list_length = list_entries[list_idx].length;
+
+		// Size is just the validity mask
+		heap_sizes[i] += ValidityBytes::SizeInBytes(list_length);
+	}
+
+	// Recurse
+	auto &struct_sources = StructVector::GetEntries(source_v);
+	for (idx_t struct_col_idx = 0; struct_col_idx < struct_sources.size(); struct_col_idx++) {
+		auto &struct_source = *struct_sources[struct_col_idx];
+		auto &struct_format = source_format.child_formats[struct_col_idx];
+		TupleDataCollection::WithinListHeapComputeSizes(heap_sizes_v, struct_source, struct_format, append_sel,
+		                                                append_count, list_data);
+	}
+}
+
+static void ApplySliceRecursive(const Vector &source_v, TupleDataVectorFormat &source_format,
+                                const SelectionVector &combined_sel, const idx_t count) {
+	D_ASSERT(source_format.combined_list_data);
+	auto &combined_list_data = *source_format.combined_list_data;
+
+	combined_list_data.selection_data = source_format.data.sel->Slice(combined_sel, count);
+	source_format.data.owned_sel.Initialize(combined_list_data.selection_data);
+	source_format.data.sel = &source_format.data.owned_sel;
+
+	if (source_v.GetType().InternalType() == PhysicalType::STRUCT) {
+		// We have to apply it to the child vectors too
+		auto &struct_sources = StructVector::GetEntries(source_v);
+		for (idx_t struct_col_idx = 0; struct_col_idx < struct_sources.size(); struct_col_idx++) {
+			auto &struct_source = *struct_sources[struct_col_idx];
+			auto &struct_format = source_format.child_formats[struct_col_idx];
+			struct_format.combined_list_data = make_uniq<CombinedListData>();
+			ApplySliceRecursive(struct_source, struct_format, *source_format.data.sel, count);
+		}
+	}
+}
+
+void TupleDataCollection::ListWithinListComputeHeapSizes(Vector &heap_sizes_v, const Vector &source_v,
+                                                         TupleDataVectorFormat &source_format,
+                                                         const SelectionVector &append_sel, const idx_t append_count,
+                                                         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_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_validity = child_list_data.validity;
+
+	// Target
+	auto heap_sizes = FlatVector::GetData<idx_t>(heap_sizes_v);
+
+	// Construct combined list entries and a selection vector for the child list child
+	auto &child_format = source_format.child_formats[0];
+	child_format.combined_list_data = make_uniq<CombinedListData>();
+	auto &combined_list_data = *child_format.combined_list_data;
+	auto &combined_list_entries = combined_list_data.combined_list_entries;
+	const auto child_list_child_count = ListVector::GetListSize(source_v);
+	SelectionVector combined_sel(child_list_child_count);
+	for (idx_t i = 0; i < child_list_child_count; i++) {
+		combined_sel.set_index(i, 0);
+	}
+	idx_t combined_list_offset = 0;
+
+	for (idx_t i = 0; i < append_count; i++) {
+		const auto list_idx = list_sel.get_index(append_sel.get_index(i));
+		if (!list_validity.RowIsValid(list_idx)) {
+			continue; // Original list entry is invalid - no need to serialize the child list
+		}
+
+		// Get the current list entry
+		const auto &list_entry = list_entries[list_idx];
+		const auto &list_offset = list_entry.offset;
+		const auto &list_length = list_entry.length;
+
+		// Size is the validity mask and the list sizes
+		auto &heap_size = heap_sizes[i];
+		heap_size += ValidityBytes::SizeInBytes(list_length);
+		heap_size += list_length * sizeof(uint64_t);
+
+		idx_t child_list_size = 0;
+		for (idx_t child_i = 0; child_i < list_length; child_i++) {
+			const auto child_list_idx = child_list_sel.get_index(list_offset + child_i);
+			const auto &child_list_entry = child_list_entries[child_list_idx];
+			if (child_list_validity.RowIsValid(child_list_idx)) {
+				const auto &child_list_offset = child_list_entry.offset;
+				const auto &child_list_length = child_list_entry.length;
+
+				// Add this child's list entry's to the combined selection vector
+				for (idx_t child_value_i = 0; child_value_i < child_list_length; child_value_i++) {
+					auto idx = combined_list_offset + child_list_size + child_value_i;
+					auto loc = child_list_offset + child_value_i;
+					combined_sel.set_index(idx, loc);
+				}
+
+				child_list_size += child_list_length;
+			}
+		}
+
+		// Combine the child list entries into one
+		combined_list_entries[list_idx] = {combined_list_offset, child_list_size};
+		combined_list_offset += child_list_size;
+	}
+
+	// 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.validity = list_data.validity;
+
+	// Combine the selection vectors
+	D_ASSERT(source_format.child_formats.size() == 1);
+	auto &child_source = ListVector::GetEntry(source_v);
+	ApplySliceRecursive(child_source, child_format, combined_sel, child_list_child_count);
+
+	// Recurse
+	TupleDataCollection::WithinListHeapComputeSizes(heap_sizes_v, child_source, child_format, append_sel, append_count,
+	                                                combined_child_list_data);
+}
+
+void TupleDataCollection::Scatter(TupleDataChunkState &chunk_state, const DataChunk &new_chunk,
+                                  const SelectionVector &append_sel, const idx_t append_count) const {
+	const auto row_locations = FlatVector::GetData<data_ptr_t>(chunk_state.row_locations);
+
+	// Set the validity mask for each row before inserting data
+	const auto validity_bytes = ValidityBytes::SizeInBytes(layout.ColumnCount());
+	for (idx_t i = 0; i < append_count; i++) {
+		FastMemset(row_locations[i], ~0, validity_bytes);
+	}
+
+	if (!layout.AllConstant()) {
+		// Set the heap size for each row
+		const auto heap_size_offset = layout.GetHeapSizeOffset();
+		const auto heap_sizes = FlatVector::GetData<idx_t>(chunk_state.heap_sizes);
+		for (idx_t i = 0; i < append_count; i++) {
+			Store<uint32_t>(heap_sizes[i], row_locations[i] + heap_size_offset);
+		}
+	}
+
+	// Write the data
+	for (const auto &col_idx : chunk_state.column_ids) {
+		Scatter(chunk_state, new_chunk.data[col_idx], col_idx, append_sel, append_count);
+	}
+}
+
+void TupleDataCollection::Scatter(TupleDataChunkState &chunk_state, const Vector &source, const column_t column_id,
+                                  const SelectionVector &append_sel, const idx_t append_count) const {
+	const auto &scatter_function = scatter_functions[column_id];
+	scatter_function.function(source, chunk_state.vector_data[column_id], append_sel, append_count, layout,
+	                          chunk_state.row_locations, chunk_state.heap_locations, column_id,
+	                          chunk_state.vector_data[column_id].data, scatter_function.child_functions);
+}
+
+template <class T>
+static void TupleDataTemplatedScatter(const Vector &source, const TupleDataVectorFormat &source_format,
+                                      const SelectionVector &append_sel, const idx_t append_count,
+                                      const TupleDataLayout &layout, Vector &row_locations, Vector &heap_locations,
+                                      const idx_t col_idx, const UnifiedVectorFormat &dummy_arg,
+                                      const vector<TupleDataScatterFunction> &child_functions) {
+	// Source
+	const auto &source_data = source_format.data;
+	const auto source_sel = *source_data.sel;
+	const auto data = (T *)source_data.data;
+	const auto &validity = source_data.validity;
+
+	// Target
+	auto target_locations = FlatVector::GetData<data_ptr_t>(row_locations);
+	auto target_heap_locations = FlatVector::GetData<data_ptr_t>(heap_locations);
+
+	// Precompute mask indexes
+	idx_t entry_idx;
+	idx_t idx_in_entry;
+	ValidityBytes::GetEntryIndex(col_idx, entry_idx, idx_in_entry);
+
+	const auto offset_in_row = layout.GetOffsets()[col_idx];
+	if (validity.AllValid()) {
+		for (idx_t i = 0; i < append_count; i++) {
+			const auto source_idx = source_sel.get_index(append_sel.get_index(i));
+			TupleDataValueStore<T>(data[source_idx], target_locations[i], offset_in_row, target_heap_locations[i]);
+		}
+	} else {
+		for (idx_t i = 0; i < append_count; i++) {
+			const auto source_idx = source_sel.get_index(append_sel.get_index(i));
+			if (validity.RowIsValid(source_idx)) {
+				TupleDataValueStore<T>(data[source_idx], target_locations[i], offset_in_row, target_heap_locations[i]);
+			} else {
+				TupleDataValueStore<T>(NullValue<T>(), target_locations[i], offset_in_row, target_heap_locations[i]);
+				ValidityBytes(target_locations[i]).SetInvalidUnsafe(entry_idx, idx_in_entry);
+			}
+		}
+	}
+}
+
+static void TupleDataStructScatter(const Vector &source, const TupleDataVectorFormat &source_format,
+                                   const SelectionVector &append_sel, const idx_t append_count,
+                                   const TupleDataLayout &layout, Vector &row_locations, Vector &heap_locations,
+                                   const idx_t col_idx, const UnifiedVectorFormat &dummy_arg,
+                                   const vector<TupleDataScatterFunction> &child_functions) {
+	// Source
+	const auto &source_data = source_format.data;
+	const auto source_sel = *source_data.sel;
+	const auto &validity = source_data.validity;
+
+	// Target
+	auto target_locations = FlatVector::GetData<data_ptr_t>(row_locations);
+
+	// Precompute mask indexes
+	idx_t entry_idx;
+	idx_t idx_in_entry;
+	ValidityBytes::GetEntryIndex(col_idx, entry_idx, idx_in_entry);
+
+	// Set validity of the STRUCT in this layout
+	if (!validity.AllValid()) {
+		for (idx_t i = 0; i < append_count; i++) {
+			const auto source_idx = source_sel.get_index(append_sel.get_index(i));
+			if (!validity.RowIsValid(source_idx)) {
+				ValidityBytes(target_locations[i]).SetInvalidUnsafe(entry_idx, idx_in_entry);
+			}
+		}
+	}
+
+	// Create a Vector of pointers to the TupleDataLayout of the STRUCT
+	Vector struct_row_locations(LogicalType::POINTER, append_count);
+	auto struct_target_locations = FlatVector::GetData<data_ptr_t>(struct_row_locations);
+	const auto offset_in_row = layout.GetOffsets()[col_idx];
+	for (idx_t i = 0; i < append_count; i++) {
+		struct_target_locations[i] = target_locations[i] + offset_in_row;
+	}
+
+	const auto &struct_layout = layout.GetStructLayout(col_idx);
+	auto &struct_sources = StructVector::GetEntries(source);
+	D_ASSERT(struct_layout.ColumnCount() == struct_sources.size());
+
+	// Set the validity of the entries within the STRUCTs
+	const auto validity_bytes = ValidityBytes::SizeInBytes(struct_layout.ColumnCount());
+	for (idx_t i = 0; i < append_count; i++) {
+		memset(struct_target_locations[i], ~0, validity_bytes);
+	}
+
+	// Recurse through the struct children
+	for (idx_t struct_col_idx = 0; struct_col_idx < struct_layout.ColumnCount(); struct_col_idx++) {
+		auto &struct_source = *struct_sources[struct_col_idx];
+		const auto &struct_source_format = source_format.child_formats[struct_col_idx];
+		const auto &struct_scatter_function = child_functions[struct_col_idx];
+		struct_scatter_function.function(struct_source, struct_source_format, append_sel, append_count, struct_layout,
+		                                 struct_row_locations, heap_locations, struct_col_idx, dummy_arg,
+		                                 struct_scatter_function.child_functions);
+	}
+}
+
+static void TupleDataListScatter(const Vector &source, const TupleDataVectorFormat &source_format,
+                                 const SelectionVector &append_sel, const idx_t append_count,
+                                 const TupleDataLayout &layout, Vector &row_locations, Vector &heap_locations,
+                                 const idx_t col_idx, const UnifiedVectorFormat &dummy_arg,
+                                 const vector<TupleDataScatterFunction> &child_functions) {
+	// 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 &validity = source_data.validity;
+
+	// Target
+	auto target_locations = FlatVector::GetData<data_ptr_t>(row_locations);
+	auto target_heap_locations = FlatVector::GetData<data_ptr_t>(heap_locations);
+
+	// Precompute mask indexes
+	idx_t entry_idx;
+	idx_t idx_in_entry;
+	ValidityBytes::GetEntryIndex(col_idx, entry_idx, idx_in_entry);
+
+	// Set validity of the LIST in this layout, and store pointer to where it's stored
+	const auto offset_in_row = layout.GetOffsets()[col_idx];
+	for (idx_t i = 0; i < append_count; i++) {
+		const auto source_idx = source_sel.get_index(append_sel.get_index(i));
+		if (validity.RowIsValid(source_idx)) {
+			auto &target_heap_location = target_heap_locations[i];
+			Store<data_ptr_t>(target_heap_location, target_locations[i] + offset_in_row);
+
+			// Store list length and skip over it
+			Store<uint64_t>(data[source_idx].length, target_heap_location);
+			target_heap_location += sizeof(uint64_t);
+		} else {
+			ValidityBytes(target_locations[i]).SetInvalidUnsafe(entry_idx, idx_in_entry);
+		}
+	}
+
+	// Recurse
+	D_ASSERT(child_functions.size() == 1);
+	auto &child_source = ListVector::GetEntry(source);
+	auto &child_format = source_format.child_formats[0];
+	const auto &child_function = child_functions[0];
+	child_function.function(child_source, child_format, append_sel, append_count, layout, row_locations, heap_locations,
+	                        col_idx, source_format.data, child_function.child_functions);
+}
+
+template <class T>
+static void TupleDataTemplatedWithinListScatter(const Vector &source, const TupleDataVectorFormat &source_format,
+                                                const SelectionVector &append_sel, const idx_t append_count,
+                                                const TupleDataLayout &layout, Vector &row_locations,
+                                                Vector &heap_locations, const idx_t col_idx,
+                                                const UnifiedVectorFormat &list_data,
+                                                const vector<TupleDataScatterFunction> &child_functions) {
+	// Source
+	const auto &source_data = source_format.data;
+	const auto source_sel = *source_data.sel;
+	const auto data = (T *)source_data.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_validity = list_data.validity;
+
+	// Target
+	auto target_heap_locations = FlatVector::GetData<data_ptr_t>(heap_locations);
+
+	for (idx_t i = 0; i < append_count; i++) {
+		const auto list_idx = list_sel.get_index(append_sel.get_index(i));
+		if (!list_validity.RowIsValid(list_idx)) {
+			continue; // Original list entry is invalid - no need to serialize the child
+		}
+
+		// Get the current list entry
+		const auto &list_entry = list_entries[list_idx];
+		const auto &list_offset = list_entry.offset;
+		const auto &list_length = list_entry.length;
+
+		// Initialize validity mask and skip heap pointer over it
+		auto &target_heap_location = target_heap_locations[i];
+		ValidityBytes child_mask(target_heap_location);
+		child_mask.SetAllValid(list_length);
+		target_heap_location += ValidityBytes::SizeInBytes(list_length);
+
+		// Get the start to the fixed-size data and skip the heap pointer over it
+		const auto child_data_location = target_heap_location;
+		target_heap_location += list_length * TupleDataWithinListFixedSize<T>();
+
+		// Store the data and validity belonging to this list entry
+		for (idx_t child_i = 0; child_i < list_length; child_i++) {
+			const auto child_source_idx = source_sel.get_index(list_offset + child_i);
+			if (source_validity.RowIsValid(child_source_idx)) {
+				TupleDataWithinListValueStore<T>(data[child_source_idx],
+				                                 child_data_location + child_i * TupleDataWithinListFixedSize<T>(),
+				                                 target_heap_location);
+			} else {
+				child_mask.SetInvalidUnsafe(child_i);
+			}
+		}
+	}
+}
+
+static void TupleDataStructWithinListScatter(const Vector &source, const TupleDataVectorFormat &source_format,
+                                             const SelectionVector &append_sel, const idx_t append_count,
+                                             const TupleDataLayout &layout, Vector &row_locations,
+                                             Vector &heap_locations, const idx_t col_idx,
+                                             const UnifiedVectorFormat &list_data,
+                                             const vector<TupleDataScatterFunction> &child_functions) {
+	// Source
+	const auto &source_data = source_format.data;
+	const auto source_sel = *source_data.sel;
+	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_validity = list_data.validity;
+
+	// Target
+	auto target_heap_locations = FlatVector::GetData<data_ptr_t>(heap_locations);
+
+	// Initialize the validity of the STRUCTs
+	for (idx_t i = 0; i < append_count; i++) {
+		const auto list_idx = list_sel.get_index(append_sel.get_index(i));
+		if (!list_validity.RowIsValid(list_idx)) {
+			continue; // Original list entry is invalid - no need to serialize the child
+		}
+
+		// Get the current list entry
+		const auto &list_entry = list_entries[list_idx];
+		const auto &list_offset = list_entry.offset;
+		const auto &list_length = list_entry.length;
+
+		// Initialize validity mask and skip the heap pointer over it
+		auto &target_heap_location = target_heap_locations[i];
+		ValidityBytes child_mask(target_heap_location);
+		child_mask.SetAllValid(list_length);
+		target_heap_location += ValidityBytes::SizeInBytes(list_length);
+
+		// Store the validity belonging to this list entry
+		for (idx_t child_i = 0; child_i < list_length; child_i++) {
+			const auto child_source_idx = source_sel.get_index(list_offset + child_i);
+			if (!source_validity.RowIsValid(child_source_idx)) {
+				child_mask.SetInvalidUnsafe(child_i);
+			}
+		}
+	}
+
+	// Recurse through the children
+	auto &struct_sources = StructVector::GetEntries(source);
+	for (idx_t struct_col_idx = 0; struct_col_idx < struct_sources.size(); struct_col_idx++) {
+		auto &struct_source = *struct_sources[struct_col_idx];
+		auto &struct_format = source_format.child_formats[struct_col_idx];
+		const auto &struct_scatter_function = child_functions[struct_col_idx];
+		struct_scatter_function.function(struct_source, struct_format, append_sel, append_count, layout, row_locations,
+		                                 heap_locations, struct_col_idx, list_data,
+		                                 struct_scatter_function.child_functions);
+	}
+}
+
+static void TupleDataListWithinListScatter(const Vector &child_list, const TupleDataVectorFormat &child_list_format,
+                                           const SelectionVector &append_sel, const idx_t append_count,
+                                           const TupleDataLayout &layout, Vector &row_locations, Vector &heap_locations,
+                                           const idx_t col_idx, const UnifiedVectorFormat &list_data,
+                                           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_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_validity = child_list_data.validity;
+
+	// Target
+	auto target_heap_locations = FlatVector::GetData<data_ptr_t>(heap_locations);
+
+	for (idx_t i = 0; i < append_count; i++) {
+		const auto list_idx = list_sel.get_index(append_sel.get_index(i));
+		if (!list_validity.RowIsValid(list_idx)) {
+			continue; // Original list entry is invalid - no need to serialize the child list
+		}
+
+		// Get the current list entry
+		const auto &list_entry = list_entries[list_idx];
+		const auto &list_offset = list_entry.offset;
+		const auto &list_length = list_entry.length;
+
+		// Initialize validity mask and skip heap pointer over it
+		auto &target_heap_location = target_heap_locations[i];
+		ValidityBytes child_mask(target_heap_location);
+		child_mask.SetAllValid(list_length);
+		target_heap_location += ValidityBytes::SizeInBytes(list_length);
+
+		// Get the start to the fixed-size data and skip the heap pointer over it
+		const auto child_data_location = target_heap_location;
+		target_heap_location += list_length * sizeof(uint64_t);
+
+		for (idx_t child_i = 0; child_i < list_length; child_i++) {
+			const auto child_list_idx = child_list_sel.get_index(list_offset + child_i);
+			if (child_list_validity.RowIsValid(child_list_idx)) {
+				const auto &child_list_length = child_list_entries[child_list_idx].length;
+				Store<uint64_t>(child_list_length, child_data_location + child_i * sizeof(uint64_t));
+			} else {
+				child_mask.SetInvalidUnsafe(child_i);
+			}
+		}
+	}
+
+	// Recurse
+	D_ASSERT(child_functions.size() == 1);
+	auto &child_vec = ListVector::GetEntry(child_list);
+	auto &child_format = child_list_format.child_formats[0];
+	auto &combined_child_list_data = child_format.combined_list_data->combined_data;
+	const auto &child_function = child_functions[0];
+	child_function.function(child_vec, child_format, append_sel, append_count, layout, row_locations, heap_locations,
+	                        col_idx, combined_child_list_data, child_function.child_functions);
+}
+
+template <class T>
+tuple_data_scatter_function_t TupleDataGetScatterFunction(bool within_list) {
+	return within_list ? TupleDataTemplatedWithinListScatter<T> : TupleDataTemplatedScatter<T>;
+}
+
+TupleDataScatterFunction TupleDataCollection::GetScatterFunction(const LogicalType &type, bool within_list) {
+	TupleDataScatterFunction result;
+	switch (type.InternalType()) {
+	case PhysicalType::BOOL:
+		result.function = TupleDataGetScatterFunction<bool>(within_list);
+		break;
+	case PhysicalType::INT8:
+		result.function = TupleDataGetScatterFunction<int8_t>(within_list);
+		break;
+	case PhysicalType::INT16:
+		result.function = TupleDataGetScatterFunction<int16_t>(within_list);
+		break;
+	case PhysicalType::INT32:
+		result.function = TupleDataGetScatterFunction<int32_t>(within_list);
+		break;
+	case PhysicalType::INT64:
+		result.function = TupleDataGetScatterFunction<int64_t>(within_list);
+		break;
+	case PhysicalType::INT128:
+		result.function = TupleDataGetScatterFunction<hugeint_t>(within_list);
+		break;
+	case PhysicalType::UINT8:
+		result.function = TupleDataGetScatterFunction<uint8_t>(within_list);
+		break;
+	case PhysicalType::UINT16:
+		result.function = TupleDataGetScatterFunction<uint16_t>(within_list);
+		break;
+	case PhysicalType::UINT32:
+		result.function = TupleDataGetScatterFunction<uint32_t>(within_list);
+		break;
+	case PhysicalType::UINT64:
+		result.function = TupleDataGetScatterFunction<uint64_t>(within_list);
+		break;
+	case PhysicalType::FLOAT:
+		result.function = TupleDataGetScatterFunction<float>(within_list);
+		break;
+	case PhysicalType::DOUBLE:
+		result.function = TupleDataGetScatterFunction<double>(within_list);
+		break;
+	case PhysicalType::INTERVAL:
+		result.function = TupleDataGetScatterFunction<interval_t>(within_list);
+		break;
+	case PhysicalType::VARCHAR:
+		result.function = TupleDataGetScatterFunction<string_t>(within_list);
+		break;
+	case PhysicalType::STRUCT: {
+		result.function = within_list ? TupleDataStructWithinListScatter : TupleDataStructScatter;
+		for (const auto &child_type : StructType::GetChildTypes(type)) {
+			result.child_functions.push_back(GetScatterFunction(child_type.second, within_list));
+		}
+		break;
+	}
+	case PhysicalType::LIST:
+		result.function = within_list ? TupleDataListWithinListScatter : TupleDataListScatter;
+		result.child_functions.emplace_back(GetScatterFunction(ListType::GetChildType(type), true));
+		break;
+	default:
+		throw InternalException("Unsupported type for TupleDataCollection::GetScatterFunction");
+	}
+	return result;
+}
+
+void TupleDataCollection::Gather(Vector &row_locations, const SelectionVector &scan_sel, const idx_t scan_count,
+                                 DataChunk &result, const SelectionVector &target_sel) const {
+	D_ASSERT(result.ColumnCount() == layout.ColumnCount());
+	vector<column_t> column_ids;
+	column_ids.reserve(layout.ColumnCount());
+	for (idx_t col_idx = 0; col_idx < layout.ColumnCount(); col_idx++) {
+		column_ids.emplace_back(col_idx);
+	}
+	Gather(row_locations, scan_sel, scan_count, column_ids, result, target_sel);
+}
+
+void TupleDataCollection::Gather(Vector &row_locations, const SelectionVector &scan_sel, const idx_t scan_count,
+                                 const vector<column_t> &column_ids, DataChunk &result,
+                                 const SelectionVector &target_sel) const {
+	for (idx_t col_idx = 0; col_idx < column_ids.size(); col_idx++) {
+		Gather(row_locations, scan_sel, scan_count, column_ids[col_idx], result.data[col_idx], target_sel);
+	}
+}
+
+void TupleDataCollection::Gather(Vector &row_locations, const SelectionVector &scan_sel, const idx_t scan_count,
+                                 const column_t column_id, Vector &result, const SelectionVector &target_sel) const {
+	const auto &gather_function = gather_functions[column_id];
+	gather_function.function(layout, row_locations, column_id, scan_sel, scan_count, result, target_sel, result,
+	                         gather_function.child_functions);
+}
+
+template <class T>
+static void TupleDataTemplatedGather(const TupleDataLayout &layout, Vector &row_locations, const idx_t col_idx,
+                                     const SelectionVector &scan_sel, const idx_t scan_count, Vector &target,
+                                     const SelectionVector &target_sel, Vector &dummy_vector,
+                                     const vector<TupleDataGatherFunction> &child_functions) {
+	// Source
+	auto source_locations = FlatVector::GetData<data_ptr_t>(row_locations);
+
+	// Target
+	auto target_data = FlatVector::GetData<T>(target);
+	auto &target_validity = FlatVector::Validity(target);
+
+	// Precompute mask indexes
+	idx_t entry_idx;
+	idx_t idx_in_entry;
+	ValidityBytes::GetEntryIndex(col_idx, entry_idx, idx_in_entry);
+
+	const auto offset_in_row = layout.GetOffsets()[col_idx];
+	for (idx_t i = 0; i < scan_count; i++) {
+		const auto &source_row = source_locations[scan_sel.get_index(i)];
+		const auto target_idx = target_sel.get_index(i);
+		ValidityBytes row_mask(source_row);
+		if (row_mask.RowIsValid(row_mask.GetValidityEntry(entry_idx), idx_in_entry)) {
+			target_data[target_idx] = Load<T>(source_row + offset_in_row);
+		} else {
+			target_validity.SetInvalid(target_idx);
+		}
+	}
+}
+
+static void TupleDataStructGather(const TupleDataLayout &layout, Vector &row_locations, const idx_t col_idx,
+                                  const SelectionVector &scan_sel, const idx_t scan_count, Vector &target,
+                                  const SelectionVector &target_sel, Vector &dummy_vector,
+                                  const vector<TupleDataGatherFunction> &child_functions) {
+	// Source
+	auto source_locations = FlatVector::GetData<data_ptr_t>(row_locations);
+
+	// Target
+	auto &target_validity = FlatVector::Validity(target);
+
+	// Precompute mask indexes
+	idx_t entry_idx;
+	idx_t idx_in_entry;
+	ValidityBytes::GetEntryIndex(col_idx, entry_idx, idx_in_entry);
+
+	// Get validity of the struct and create a Vector of pointers to the start of the TupleDataLayout of the STRUCT
+	Vector struct_row_locations(LogicalType::POINTER);
+	auto struct_source_locations = FlatVector::GetData<data_ptr_t>(struct_row_locations);
+	const auto offset_in_row = layout.GetOffsets()[col_idx];
+	for (idx_t i = 0; i < scan_count; i++) {
+		const auto source_idx = scan_sel.get_index(i);
+		const auto &source_row = source_locations[source_idx];
+
+		// Set the validity
+		ValidityBytes row_mask(source_row);
+		if (!row_mask.RowIsValid(row_mask.GetValidityEntry(entry_idx), idx_in_entry)) {
+			const auto target_idx = target_sel.get_index(i);
+			target_validity.SetInvalid(target_idx);
+		}
+
+		// Set the pointer
+		struct_source_locations[source_idx] = source_row + offset_in_row;
+	}
+
+	// Get the struct layout and struct entries
+	const auto &struct_layout = layout.GetStructLayout(col_idx);
+	auto &struct_targets = StructVector::GetEntries(target);
+	D_ASSERT(struct_layout.ColumnCount() == struct_targets.size());
+
+	// Recurse through the struct children
+	for (idx_t struct_col_idx = 0; struct_col_idx < struct_layout.ColumnCount(); struct_col_idx++) {
+		auto &struct_target = *struct_targets[struct_col_idx];
+		const auto &struct_gather_function = child_functions[struct_col_idx];
+		struct_gather_function.function(struct_layout, struct_row_locations, struct_col_idx, scan_sel, scan_count,
+		                                struct_target, target_sel, dummy_vector,
+		                                struct_gather_function.child_functions);
+	}
+}
+
+static void TupleDataListGather(const TupleDataLayout &layout, Vector &row_locations, const idx_t col_idx,
+                                const SelectionVector &scan_sel, const idx_t scan_count, Vector &target,
+                                const SelectionVector &target_sel, Vector &dummy_vector,
+                                const vector<TupleDataGatherFunction> &child_functions) {
+	// Source
+	auto source_locations = FlatVector::GetData<data_ptr_t>(row_locations);
+
+	// Target
+	auto target_list_entries = FlatVector::GetData<list_entry_t>(target);
+	auto &target_validity = FlatVector::Validity(target);
+
+	// Precompute mask indexes
+	idx_t entry_idx;
+	idx_t idx_in_entry;
+	ValidityBytes::GetEntryIndex(col_idx, entry_idx, idx_in_entry);
+
+	// Load pointers to the data from the row
+	Vector heap_locations(LogicalType::POINTER);
+	auto source_heap_locations = FlatVector::GetData<data_ptr_t>(heap_locations);
+	auto &source_heap_validity = FlatVector::Validity(heap_locations);
+
+	const auto offset_in_row = layout.GetOffsets()[col_idx];
+	uint64_t target_list_offset = 0;
+	for (idx_t i = 0; i < scan_count; i++) {
+		const auto source_idx = scan_sel.get_index(i);
+		const auto target_idx = target_sel.get_index(i);
+
+		const auto &source_row = source_locations[source_idx];
+		ValidityBytes row_mask(source_row);
+		if (row_mask.RowIsValid(row_mask.GetValidityEntry(entry_idx), idx_in_entry)) {
+			auto &source_heap_location = source_heap_locations[source_idx];
+			source_heap_location = Load<data_ptr_t>(source_row + offset_in_row);
+
+			// Load list size and skip over
+			const auto list_length = Load<uint64_t>(source_heap_location);
+			source_heap_location += sizeof(uint64_t);
+
+			// Initialize list entry, and increment offset
+			target_list_entries[target_idx] = {target_list_offset, list_length};
+			target_list_offset += list_length;
+		} else {
+			source_heap_validity.SetInvalid(source_idx);
+			target_validity.SetInvalid(target_idx);
+		}
+	}
+	auto list_size_before = ListVector::GetListSize(target);
+	ListVector::Reserve(target, list_size_before + target_list_offset);
+	ListVector::SetListSize(target, list_size_before + target_list_offset);
+
+	// Recurse
+	D_ASSERT(child_functions.size() == 1);
+	const auto &child_function = child_functions[0];
+	child_function.function(layout, heap_locations, list_size_before, scan_sel, scan_count,
+	                        ListVector::GetEntry(target), target_sel, target, child_function.child_functions);
+}
+
+template <class T>
+static void TupleDataTemplatedWithinListGather(const TupleDataLayout &layout, Vector &heap_locations,
+                                               const idx_t list_size_before, const SelectionVector &scan_sel,
+                                               const idx_t scan_count, Vector &target,
+                                               const SelectionVector &target_sel, Vector &list_vector,
+                                               const vector<TupleDataGatherFunction> &child_functions) {
+	// Source
+	auto source_heap_locations = FlatVector::GetData<data_ptr_t>(heap_locations);
+	auto &source_heap_validity = FlatVector::Validity(heap_locations);
+
+	// Target
+	auto target_data = FlatVector::GetData<T>(target);
+	auto &target_validity = FlatVector::Validity(target);
+
+	// List parent
+	const auto list_entries = FlatVector::GetData<list_entry_t>(list_vector);
+
+	uint64_t target_offset = list_size_before;
+	for (idx_t i = 0; i < scan_count; i++) {
+		const auto source_idx = scan_sel.get_index(i);
+		if (!source_heap_validity.RowIsValid(source_idx)) {
+			continue;
+		}
+
+		const auto &list_length = list_entries[target_sel.get_index(i)].length;
+
+		// Initialize validity mask
+		auto &source_heap_location = source_heap_locations[source_idx];
+		ValidityBytes source_mask(source_heap_location);
+		source_heap_location += ValidityBytes::SizeInBytes(list_length);
+
+		// Get the start to the fixed-size data and skip the heap pointer over it
+		const auto source_data_location = source_heap_location;
+		source_heap_location += list_length * TupleDataWithinListFixedSize<T>();
+
+		// Load the child validity and data belonging to this list entry
+		for (idx_t child_i = 0; child_i < list_length; child_i++) {
+			if (source_mask.RowIsValidUnsafe(child_i)) {
+				target_data[target_offset + child_i] = TupleDataWithinListValueLoad<T>(
+				    source_data_location + child_i * TupleDataWithinListFixedSize<T>(), source_heap_location);
+			} else {
+				target_validity.SetInvalid(target_offset + child_i);
+			}
+		}
+		target_offset += list_length;
+	}
+}
+
+static void TupleDataStructWithinListGather(const TupleDataLayout &layout, Vector &heap_locations,
+                                            const idx_t list_size_before, const SelectionVector &scan_sel,
+                                            const idx_t scan_count, Vector &target, const SelectionVector &target_sel,
+                                            Vector &list_vector,
+                                            const vector<TupleDataGatherFunction> &child_functions) {
+	// Source
+	auto source_heap_locations = FlatVector::GetData<data_ptr_t>(heap_locations);
+	auto &source_heap_validity = FlatVector::Validity(heap_locations);
+
+	// Target
+	auto &target_validity = FlatVector::Validity(target);
+
+	// List parent
+	const auto list_entries = FlatVector::GetData<list_entry_t>(list_vector);
+
+	uint64_t target_offset = list_size_before;
+	for (idx_t i = 0; i < scan_count; i++) {
+		const auto source_idx = scan_sel.get_index(i);
+		if (!source_heap_validity.RowIsValid(source_idx)) {
+			continue;
+		}
+
+		const auto &list_length = list_entries[target_sel.get_index(i)].length;
+
+		// Initialize validity mask and skip over it
+		auto &source_heap_location = source_heap_locations[source_idx];
+		ValidityBytes source_mask(source_heap_location);
+		source_heap_location += ValidityBytes::SizeInBytes(list_length);
+
+		// Load the child validity belonging to this list entry
+		for (idx_t child_i = 0; child_i < list_length; child_i++) {
+			if (!source_mask.RowIsValidUnsafe(child_i)) {
+				target_validity.SetInvalid(target_offset + child_i);
+			}
+		}
+		target_offset += list_length;
+	}
+
+	// Recurse
+	auto &struct_targets = StructVector::GetEntries(target);
+	for (idx_t struct_col_idx = 0; struct_col_idx < struct_targets.size(); struct_col_idx++) {
+		auto &struct_target = *struct_targets[struct_col_idx];
+		const auto &struct_gather_function = child_functions[struct_col_idx];
+		struct_gather_function.function(layout, heap_locations, list_size_before, scan_sel, scan_count, struct_target,
+		                                target_sel, list_vector, struct_gather_function.child_functions);
+	}
+}
+
+static void TupleDataListWithinListGather(const TupleDataLayout &layout, Vector &heap_locations,
+                                          const idx_t list_size_before, const SelectionVector &scan_sel,
+                                          const idx_t scan_count, Vector &target, const SelectionVector &target_sel,
+                                          Vector &list_vector, const vector<TupleDataGatherFunction> &child_functions) {
+	// Source
+	auto source_heap_locations = FlatVector::GetData<data_ptr_t>(heap_locations);
+	auto &source_heap_validity = FlatVector::Validity(heap_locations);
+
+	// Target
+	auto target_list_entries = FlatVector::GetData<list_entry_t>(target);
+	auto &target_validity = FlatVector::Validity(target);
+	const auto child_list_size_before = ListVector::GetListSize(target);
+
+	// List parent
+	const auto list_entries = FlatVector::GetData<list_entry_t>(list_vector);
+
+	// We need to create a vector that has the combined list sizes (hugeint_t has same size as list_entry_t)
+	Vector combined_list_vector(LogicalType::HUGEINT);
+	auto combined_list_entries = FlatVector::GetData<list_entry_t>(combined_list_vector);
+
+	uint64_t target_offset = list_size_before;
+	uint64_t target_child_offset = child_list_size_before;
+	for (idx_t i = 0; i < scan_count; i++) {
+		const auto source_idx = scan_sel.get_index(i);
+		if (!source_heap_validity.RowIsValid(source_idx)) {
+			continue;
+		}
+
+		const auto &list_length = list_entries[target_sel.get_index(i)].length;
+
+		// Initialize validity mask and skip over it
+		auto &source_heap_location = source_heap_locations[source_idx];
+		ValidityBytes source_mask(source_heap_location);
+		source_heap_location += ValidityBytes::SizeInBytes(list_length);
+
+		// Get the start to the fixed-size data and skip the heap pointer over it
+		const auto source_data_location = source_heap_location;
+		source_heap_location += list_length * sizeof(uint64_t);
+
+		// Set the offset of the combined list entry
+		auto &combined_list_entry = combined_list_entries[target_sel.get_index(i)];
+		combined_list_entry.offset = target_child_offset;
+
+		// Load the child validity and data belonging to this list entry
+		for (idx_t child_i = 0; child_i < list_length; child_i++) {
+			if (source_mask.RowIsValidUnsafe(child_i)) {
+				auto &target_list_entry = target_list_entries[target_offset + child_i];
+				target_list_entry.offset = target_child_offset;
+				target_list_entry.length = Load<uint64_t>(source_data_location + child_i * sizeof(uint64_t));
+				target_child_offset += target_list_entry.length;
+			} else {
+				target_validity.SetInvalid(target_offset + child_i);
+			}
+		}
+
+		// Set the length of the combined list entry
+		combined_list_entry.length = target_child_offset - combined_list_entry.offset;
+
+		target_offset += list_length;
+	}
+	ListVector::Reserve(target, target_child_offset);
+	ListVector::SetListSize(target, target_child_offset);
+
+	// Recurse
+	D_ASSERT(child_functions.size() == 1);
+	const auto &child_function = child_functions[0];
+	child_function.function(layout, heap_locations, child_list_size_before, scan_sel, scan_count,
+	                        ListVector::GetEntry(target), target_sel, combined_list_vector,
+	                        child_function.child_functions);
+}
+
+template <class T>
+tuple_data_gather_function_t TupleDataGetGatherFunction(bool within_list) {
+	return within_list ? TupleDataTemplatedWithinListGather<T> : TupleDataTemplatedGather<T>;
+}
+
+TupleDataGatherFunction TupleDataCollection::GetGatherFunction(const LogicalType &type, bool within_list) {
+	TupleDataGatherFunction result;
+	switch (type.InternalType()) {
+	case PhysicalType::BOOL:
+		result.function = TupleDataGetGatherFunction<bool>(within_list);
+		break;
+	case PhysicalType::INT8:
+		result.function = TupleDataGetGatherFunction<int8_t>(within_list);
+		break;
+	case PhysicalType::INT16:
+		result.function = TupleDataGetGatherFunction<int16_t>(within_list);
+		break;
+	case PhysicalType::INT32:
+		result.function = TupleDataGetGatherFunction<int32_t>(within_list);
+		break;
+	case PhysicalType::INT64:
+		result.function = TupleDataGetGatherFunction<int64_t>(within_list);
+		break;
+	case PhysicalType::INT128:
+		result.function = TupleDataGetGatherFunction<hugeint_t>(within_list);
+		break;
+	case PhysicalType::UINT8:
+		result.function = TupleDataGetGatherFunction<uint8_t>(within_list);
+		break;
+	case PhysicalType::UINT16:
+		result.function = TupleDataGetGatherFunction<uint16_t>(within_list);
+		break;
+	case PhysicalType::UINT32:
+		result.function = TupleDataGetGatherFunction<uint32_t>(within_list);
+		break;
+	case PhysicalType::UINT64:
+		result.function = TupleDataGetGatherFunction<uint64_t>(within_list);
+		break;
+	case PhysicalType::FLOAT:
+		result.function = TupleDataGetGatherFunction<float>(within_list);
+		break;
+	case PhysicalType::DOUBLE:
+		result.function = TupleDataGetGatherFunction<double>(within_list);
+		break;
+	case PhysicalType::INTERVAL:
+		result.function = TupleDataGetGatherFunction<interval_t>(within_list);
+		break;
+	case PhysicalType::VARCHAR:
+		result.function = TupleDataGetGatherFunction<string_t>(within_list);
+		break;
+	case PhysicalType::STRUCT: {
+		result.function = within_list ? TupleDataStructWithinListGather : TupleDataStructGather;
+		for (const auto &child_type : StructType::GetChildTypes(type)) {
+			result.child_functions.push_back(GetGatherFunction(child_type.second, within_list));
+		}
+		break;
+	}
+	case PhysicalType::LIST:
+		result.function = within_list ? TupleDataListWithinListGather : TupleDataListGather;
+		result.child_functions.push_back(GetGatherFunction(ListType::GetChildType(type), true));
+		break;
+	default:
+		throw InternalException("Unsupported type for TupleDataCollection::GetGatherFunction");
+	}
+	return result;
+}
+
+} // namespace duckdb