duckdb 0.8.2-dev157.0 → 0.8.2-dev1573.0

package/src/duckdb/src/include/duckdb/core_functions/aggregate/algebraic/covar.hpp

@@ -5,6 +5,7 @@
 //
 //
 //===----------------------------------------------------------------------===//
+// COVAR_POP(y,x)
 
 #pragma once
 
@@ -29,7 +30,7 @@ struct CovarOperation {
 	}
 
 	template <class A_TYPE, class B_TYPE, class STATE, class OP>
-	static void Operation(STATE &state, const A_TYPE &x, const B_TYPE &y, AggregateBinaryInput &idata) {
+	static void Operation(STATE &state, const A_TYPE &y, const B_TYPE &x, AggregateBinaryInput &idata) {
 		// update running mean and d^2
 		const uint64_t n = ++(state.count);
 
@@ -39,6 +40,7 @@ struct CovarOperation {
 		const double dy = (y - state.meany);
 		const double meany = state.meany + dy / n;
 
+		//  Schubert and Gertz SSDBM 2018 (4.3)
 		const double C = state.co_moment + dx * (y - meany);
 
 		state.meanx = meanx;

package/src/duckdb/src/include/duckdb/core_functions/aggregate/algebraic_functions.hpp

@@ -5,7 +5,9 @@
 //
 //
 //===----------------------------------------------------------------------===//
-// This file is generated by scripts/generate_functions.py
+// This file is automatically generated by scripts/generate_functions.py
+// Do not edit this file manually, your changes will be overwritten
+//===----------------------------------------------------------------------===//
 
 #pragma once
 

package/src/duckdb/src/include/duckdb/core_functions/aggregate/distributive_functions.hpp

@@ -5,7 +5,9 @@
 //
 //
 //===----------------------------------------------------------------------===//
-// This file is generated by scripts/generate_functions.py
+// This file is automatically generated by scripts/generate_functions.py
+// Do not edit this file manually, your changes will be overwritten
+//===----------------------------------------------------------------------===//
 
 #pragma once
 

package/src/duckdb/src/include/duckdb/core_functions/aggregate/holistic_functions.hpp

@@ -5,7 +5,9 @@
 //
 //
 //===----------------------------------------------------------------------===//
-// This file is generated by scripts/generate_functions.py
+// This file is automatically generated by scripts/generate_functions.py
+// Do not edit this file manually, your changes will be overwritten
+//===----------------------------------------------------------------------===//
 
 #pragma once
 

package/src/duckdb/src/include/duckdb/core_functions/aggregate/nested_functions.hpp

@@ -5,7 +5,9 @@
 //
 //
 //===----------------------------------------------------------------------===//
-// This file is generated by scripts/generate_functions.py
+// This file is automatically generated by scripts/generate_functions.py
+// Do not edit this file manually, your changes will be overwritten
+//===----------------------------------------------------------------------===//
 
 #pragma once
 

package/src/duckdb/src/include/duckdb/core_functions/aggregate/regression/regr_count.hpp

@@ -5,6 +5,7 @@
 //
 //
 //===----------------------------------------------------------------------===//
+// REGR_COUNT(y, x)
 
 #pragma once
 

package/src/duckdb/src/include/duckdb/core_functions/aggregate/regression/regr_slope.hpp

@@ -25,9 +25,9 @@ struct RegrSlopeOperation {
 	}
 
 	template <class A_TYPE, class B_TYPE, class STATE, class OP>
-	static void Operation(STATE &state, const A_TYPE &x, const B_TYPE &y, AggregateBinaryInput &idata) {
-		CovarOperation::Operation<A_TYPE, B_TYPE, CovarState, OP>(state.cov_pop, x, y, idata);
-		STDDevBaseOperation::Execute<A_TYPE, StddevState>(state.var_pop, y);
+	static void Operation(STATE &state, const A_TYPE &y, const B_TYPE &x, AggregateBinaryInput &idata) {
+		CovarOperation::Operation<A_TYPE, B_TYPE, CovarState, OP>(state.cov_pop, y, x,idata);
+		STDDevBaseOperation::Execute<A_TYPE, StddevState>(state.var_pop, x);
 	}
 
 	template <class STATE, class OP>

package/src/duckdb/src/include/duckdb/core_functions/aggregate/regression_functions.hpp

@@ -5,7 +5,9 @@
 //
 //
 //===----------------------------------------------------------------------===//
-// This file is generated by scripts/generate_functions.py
+// This file is automatically generated by scripts/generate_functions.py
+// Do not edit this file manually, your changes will be overwritten
+//===----------------------------------------------------------------------===//
 
 #pragma once
 

package/src/duckdb/src/include/duckdb/core_functions/scalar/bit_functions.hpp

@@ -5,7 +5,9 @@
 //
 //
 //===----------------------------------------------------------------------===//
-// This file is generated by scripts/generate_functions.py
+// This file is automatically generated by scripts/generate_functions.py
+// Do not edit this file manually, your changes will be overwritten
+//===----------------------------------------------------------------------===//
 
 #pragma once
 

package/src/duckdb/src/include/duckdb/core_functions/scalar/blob_functions.hpp

@@ -5,7 +5,9 @@
 //
 //
 //===----------------------------------------------------------------------===//
-// This file is generated by scripts/generate_functions.py
+// This file is automatically generated by scripts/generate_functions.py
+// Do not edit this file manually, your changes will be overwritten
+//===----------------------------------------------------------------------===//
 
 #pragma once
 

package/src/duckdb/src/include/duckdb/core_functions/scalar/date_functions.hpp

@@ -5,7 +5,9 @@
 //
 //
 //===----------------------------------------------------------------------===//
-// This file is generated by scripts/generate_functions.py
+// This file is automatically generated by scripts/generate_functions.py
+// Do not edit this file manually, your changes will be overwritten
+//===----------------------------------------------------------------------===//
 
 #pragma once
 
@@ -162,8 +164,8 @@ struct DecadeFun {
 
 struct EpochFun {
 	static constexpr const char *Name = "epoch";
-	static constexpr const char *Parameters = "ts";
-	static constexpr const char *Description = "Extract the epoch component from a date or timestamp";
+	static constexpr const char *Parameters = "temporal";
+	static constexpr const char *Description = "Extract the epoch component from a temporal type";
 	static constexpr const char *Example = "epoch(timestamp '2021-08-03 11:59:44.123456')";
 
 	static ScalarFunctionSet GetFunctions();
@@ -171,11 +173,29 @@ struct EpochFun {
 
 struct EpochMsFun {
 	static constexpr const char *Name = "epoch_ms";
-	static constexpr const char *Parameters = "ms";
-	static constexpr const char *Description = "Converts ms since epoch to a timestamp";
-	static constexpr const char *Example = "epoch_ms(701222400000)";
+	static constexpr const char *Parameters = "temporal";
+	static constexpr const char *Description = "Extract the epoch component in milliseconds from a temporal type";
+	static constexpr const char *Example = "epoch_ms(timestamp '2021-08-03 11:59:44.123456')";
 
-	static ScalarFunction GetFunction();
+	static ScalarFunctionSet GetFunctions();
+};
+
+struct EpochUsFun {
+	static constexpr const char *Name = "epoch_us";
+	static constexpr const char *Parameters = "temporal";
+	static constexpr const char *Description = "Extract the epoch component in microseconds from a temporal type";
+	static constexpr const char *Example = "epoch_us(timestamp '2021-08-03 11:59:44.123456')";
+
+	static ScalarFunctionSet GetFunctions();
+};
+
+struct EpochNsFun {
+	static constexpr const char *Name = "epoch_ns";
+	static constexpr const char *Parameters = "temporal";
+	static constexpr const char *Description = "Extract the epoch component in nanoseconds from a temporal type";
+	static constexpr const char *Example = "epoch_ns(timestamp '2021-08-03 11:59:44.123456')";
+
+	static ScalarFunctionSet GetFunctions();
 };
 
 struct EraFun {
@@ -277,7 +297,7 @@ struct MakeTimestampFun {
 	static constexpr const char *Description = "The timestamp for the given parts";
 	static constexpr const char *Example = "make_timestamp(1992, 9, 20, 13, 34, 27.123456)";
 
-	static ScalarFunction GetFunction();
+	static ScalarFunctionSet GetFunctions();
 };
 
 struct MicrosecondsFun {
@@ -472,8 +492,8 @@ struct ToSecondsFun {
 struct ToTimestampFun {
 	static constexpr const char *Name = "to_timestamp";
 	static constexpr const char *Parameters = "sec";
-	static constexpr const char *Description = "Converts sec since epoch to a timestamp";
-	static constexpr const char *Example = "to_timestamp(701222400)";
+	static constexpr const char *Description = "Converts secs since epoch to a timestamp with time zone";
+	static constexpr const char *Example = "to_timestamp(1284352323.5)";
 
 	static ScalarFunction GetFunction();
 };
@@ -490,7 +510,7 @@ struct ToYearsFun {
 struct TryStrpTimeFun {
 	static constexpr const char *Name = "try_strptime";
 	static constexpr const char *Parameters = "text,format";
-	static constexpr const char *Description = "Converts string to timestamp with time zone according to the format string if %Z is specified. Returns NULL on failure.";
+	static constexpr const char *Description = "Converts string to timestamp using the format string (timestamp with time zone if %Z is specified). Returns NULL on failure.";
 	static constexpr const char *Example = "try_strptime('Wed, 1 January 1992 - 08:38:40 PM', '%a, %-d %B %Y - %I:%M:%S %p')";
 
 	static ScalarFunctionSet GetFunctions();

package/src/duckdb/src/include/duckdb/core_functions/scalar/enum_functions.hpp

@@ -5,7 +5,9 @@
 //
 //
 //===----------------------------------------------------------------------===//
-// This file is generated by scripts/generate_functions.py
+// This file is automatically generated by scripts/generate_functions.py
+// Do not edit this file manually, your changes will be overwritten
+//===----------------------------------------------------------------------===//
 
 #pragma once
 

package/src/duckdb/src/include/duckdb/core_functions/scalar/generic_functions.hpp

@@ -5,7 +5,9 @@
 //
 //
 //===----------------------------------------------------------------------===//
-// This file is generated by scripts/generate_functions.py
+// This file is automatically generated by scripts/generate_functions.py
+// Do not edit this file manually, your changes will be overwritten
+//===----------------------------------------------------------------------===//
 
 #pragma once
 

package/src/duckdb/src/include/duckdb/core_functions/scalar/list_functions.hpp

@@ -5,7 +5,9 @@
 //
 //
 //===----------------------------------------------------------------------===//
-// This file is generated by scripts/generate_functions.py
+// This file is automatically generated by scripts/generate_functions.py
+// Do not edit this file manually, your changes will be overwritten
+//===----------------------------------------------------------------------===//
 
 #pragma once
 

package/src/duckdb/src/include/duckdb/core_functions/scalar/map_functions.hpp

@@ -5,7 +5,9 @@
 //
 //
 //===----------------------------------------------------------------------===//
-// This file is generated by scripts/generate_functions.py
+// This file is automatically generated by scripts/generate_functions.py
+// Do not edit this file manually, your changes will be overwritten
+//===----------------------------------------------------------------------===//
 
 #pragma once
 

package/src/duckdb/src/include/duckdb/core_functions/scalar/math_functions.hpp

@@ -5,7 +5,9 @@
 //
 //
 //===----------------------------------------------------------------------===//
-// This file is generated by scripts/generate_functions.py
+// This file is automatically generated by scripts/generate_functions.py
+// Do not edit this file manually, your changes will be overwritten
+//===----------------------------------------------------------------------===//
 
 #pragma once
 

package/src/duckdb/src/include/duckdb/core_functions/scalar/operators_functions.hpp

@@ -5,7 +5,9 @@
 //
 //
 //===----------------------------------------------------------------------===//
-// This file is generated by scripts/generate_functions.py
+// This file is automatically generated by scripts/generate_functions.py
+// Do not edit this file manually, your changes will be overwritten
+//===----------------------------------------------------------------------===//
 
 #pragma once
 

package/src/duckdb/src/include/duckdb/core_functions/scalar/random_functions.hpp

@@ -5,7 +5,9 @@
 //
 //
 //===----------------------------------------------------------------------===//
-// This file is generated by scripts/generate_functions.py
+// This file is automatically generated by scripts/generate_functions.py
+// Do not edit this file manually, your changes will be overwritten
+//===----------------------------------------------------------------------===//
 
 #pragma once
 

package/src/duckdb/src/include/duckdb/core_functions/scalar/string_functions.hpp

@@ -5,7 +5,9 @@
 //
 //
 //===----------------------------------------------------------------------===//
-// This file is generated by scripts/generate_functions.py
+// This file is automatically generated by scripts/generate_functions.py
+// Do not edit this file manually, your changes will be overwritten
+//===----------------------------------------------------------------------===//
 
 #pragma once
 

package/src/duckdb/src/include/duckdb/core_functions/scalar/struct_functions.hpp

@@ -5,7 +5,9 @@
 //
 //
 //===----------------------------------------------------------------------===//
-// This file is generated by scripts/generate_functions.py
+// This file is automatically generated by scripts/generate_functions.py
+// Do not edit this file manually, your changes will be overwritten
+//===----------------------------------------------------------------------===//
 
 #pragma once
 

package/src/duckdb/src/include/duckdb/core_functions/scalar/union_functions.hpp

@@ -5,7 +5,9 @@
 //
 //
 //===----------------------------------------------------------------------===//
-// This file is generated by scripts/generate_functions.py
+// This file is automatically generated by scripts/generate_functions.py
+// Do not edit this file manually, your changes will be overwritten
+//===----------------------------------------------------------------------===//
 
 #pragma once
 

package/src/duckdb/src/include/duckdb/execution/aggregate_hashtable.hpp

@@ -128,6 +128,9 @@ public:
 	//! Executes the filter(if any) and update the aggregates
 	void Combine(GroupedAggregateHashTable &other);
 
+	//! Appends the data in the other HT to this one
+	void Append(GroupedAggregateHashTable &other);
+
 	TupleDataCollection &GetDataCollection() {
 		return *data_collection;
 	}
@@ -136,16 +139,29 @@ public:
 		return data_collection->Count();
 	}
 
+	idx_t DataSize() const {
+		return data_collection->SizeInBytes();
+	}
+
 	static idx_t InitialCapacity();
 	idx_t Capacity() {
 		return capacity;
 	}
 
+	static idx_t FirstPartSize(idx_t count, HtEntryType entry_type) {
+		idx_t entry_size = entry_type == HT_WIDTH_32 ? sizeof(aggr_ht_entry_32) : sizeof(aggr_ht_entry_64);
+		return NextPowerOfTwo(count * 2L) * entry_size;
+	}
+
+	idx_t TotalSize() const {
+		return DataSize() + FirstPartSize(Count(), entry_type);
+	}
+
 	idx_t ResizeThreshold();
 	idx_t MaxCapacity();
 	static idx_t GetMaxCapacity(HtEntryType entry_type, idx_t tuple_size);
 
-	void Partition(vector<GroupedAggregateHashTable *> &partition_hts, idx_t radix_bits);
+	void Partition(vector<GroupedAggregateHashTable *> &partition_hts, idx_t radix_bits, bool sink_done);
 	void InitializeFirstPart();
 
 	void Finalize();
@@ -165,7 +181,7 @@ private:
 	vector<data_ptr_t> payload_hds_ptrs;
 
 	//! The hashes of the HT
-	BufferHandle hashes_hdl;
+	AllocatedData hashes_hdl;
 	data_ptr_t hashes_hdl_ptr;
 	idx_t hash_offset; // Offset into the layout of the hash column
 
@@ -178,8 +194,10 @@ private:
 
 	vector<ExpressionType> predicates;
 
-	//! The arena allocator used by the aggregates for their internal state
+	//! The active arena allocator used by the aggregates for their internal state
 	shared_ptr<ArenaAllocator> aggregate_allocator;
+	//! Owning arena allocators that this HT has data from
+	vector<shared_ptr<ArenaAllocator>> stored_allocators;
 
 private:
 	GroupedAggregateHashTable(const GroupedAggregateHashTable &) = delete;

package/src/duckdb/src/include/duckdb/execution/executor.hpp

@@ -88,6 +88,7 @@ public:
 	void AddEvent(shared_ptr<Event> event);
 
 	void AddRecursiveCTE(PhysicalOperator &rec_cte);
+	void AddMaterializedCTE(PhysicalOperator &mat_cte);
 	void ReschedulePipelines(const vector<shared_ptr<MetaPipeline>> &pipelines, vector<shared_ptr<Event>> &events);
 
 	//! Whether or not the root of the pipeline is a result collector object
@@ -129,6 +130,8 @@ private:
 	vector<shared_ptr<Pipeline>> root_pipelines;
 	//! The recursive CTE's in this query plan
 	vector<reference<PhysicalOperator>> recursive_ctes;
+	//! The materialized CTE's in this query plan
+	vector<reference<PhysicalOperator>> materialized_ctes;
 	//! The pipeline executor for the root pipeline
 	unique_ptr<PipelineExecutor> root_executor;
 	//! The current root pipeline index

package/src/duckdb/src/include/duckdb/execution/index/art/art.hpp

@@ -112,14 +112,13 @@ private:
 	void Erase(Node &node, const ARTKey &key, idx_t depth, const row_t &row_id);
 
 	//! Returns all row IDs belonging to a key greater (or equal) than the search key
-	bool SearchGreater(ARTIndexScanState &state, ARTKey &key, bool inclusive, idx_t max_count,
-	                   vector<row_t> &result_ids);
+	bool SearchGreater(ARTIndexScanState &state, ARTKey &key, bool equal, idx_t max_count, vector<row_t> &result_ids);
 	//! Returns all row IDs belonging to a key less (or equal) than the upper_bound
-	bool SearchLess(ARTIndexScanState &state, ARTKey &upper_bound, bool inclusive, idx_t max_count,
+	bool SearchLess(ARTIndexScanState &state, ARTKey &upper_bound, bool equal, idx_t max_count,
 	                vector<row_t> &result_ids);
 	//! Returns all row IDs belonging to a key within the range of lower_bound and upper_bound
-	bool SearchCloseRange(ARTIndexScanState &state, ARTKey &lower_bound, ARTKey &upper_bound, bool left_inclusive,
-	                      bool right_inclusive, idx_t max_count, vector<row_t> &result_ids);
+	bool SearchCloseRange(ARTIndexScanState &state, ARTKey &lower_bound, ARTKey &upper_bound, bool left_equal,
+	                      bool right_equal, idx_t max_count, vector<row_t> &result_ids);
 
 	//! Initializes a merge operation by returning a set containing the buffer count of each fixed-size allocator
 	void InitializeMerge(ARTFlags &flags);

package/src/duckdb/src/include/duckdb/execution/index/art/iterator.hpp

@@ -14,9 +14,8 @@
 
 namespace duckdb {
 
+//! Keeps track of the byte leading to the currently active child of the node
 struct IteratorEntry {
-	IteratorEntry() {
-	}
 	IteratorEntry(Node node, uint8_t byte) : node(node), byte(byte) {
 	}
 
@@ -24,16 +23,23 @@ struct IteratorEntry {
 	uint8_t byte = 0;
 };
 
-//! Keeps track of the current key in the iterator
-class IteratorCurrentKey {
+//! Keeps track of the current key in the iterator leading down to the top node in the stack
+class IteratorKey {
 public:
-	//! Push byte into current key
-	void Push(const uint8_t key);
-	//! Pops n elements from the key
-	void Pop(const idx_t n);
+	//! Pushes a byte into the current key
+	inline void Push(const uint8_t key_byte) {
+		key_bytes.push_back(key_byte);
+	}
+	//! Pops n bytes from the current key
+	inline void Pop(const idx_t n) {
+		key_bytes.resize(key_bytes.size() - n);
+	}
 
 	//! Subscript operator
-	uint8_t &operator[](idx_t idx);
+	inline uint8_t &operator[](idx_t idx) {
+		D_ASSERT(idx < key_bytes.size());
+		return key_bytes[idx];
+	}
 	//! Greater than operator
 	bool operator>(const ARTKey &k) const;
 	//! Greater than or equal to operator
@@ -42,37 +48,35 @@ public:
 	bool operator==(const ARTKey &k) const;
 
 private:
-	//! The current key position
-	idx_t cur_key_pos = 0;
-	//! The current key corresponding to the current leaf
-	vector<uint8_t> key;
+	vector<uint8_t> key_bytes;
 };
 
 class Iterator {
 public:
-	//! All information about the current key
-	IteratorCurrentKey cur_key;
+	//! Holds the current key leading down to the top node on the stack
+	IteratorKey current_key;
 	//! Pointer to the ART
-	ART *art = nullptr;
+	optional_ptr<ART> art = nullptr;
 
-	//! Scan the tree
-	bool Scan(const ARTKey &key, const idx_t &max_count, vector<row_t> &result_ids, const bool &is_inclusive);
-	//! Finds the minimum value of the tree
+	//! Scans the tree, starting at the current top node on the stack, and ending at upper_bound.
+	//! If upper_bound is the empty ARTKey, than there is no upper bound
+	bool Scan(const ARTKey &upper_bound, const idx_t max_count, vector<row_t> &result_ids, const bool equal);
+	//! Finds the minimum (leaf) of the current subtree
 	void FindMinimum(Node &node);
-	//! Goes to the lower bound of the tree
-	bool LowerBound(Node node, const ARTKey &key, const bool &is_inclusive);
+	//! Finds the lower bound of the ART and adds the nodes to the stack. Returns false, if the lower
+	//! bound exceeds the maximum value of the ART
+	bool LowerBound(Node &node, const ARTKey &key, const bool equal, idx_t depth);
 
 private:
-	//! Stack of iterator entries
+	//! Stack of nodes from the root to the currently active node
 	stack<IteratorEntry> nodes;
 	//! Last visited leaf
-	Leaf *last_leaf = nullptr;
+	optional_ptr<Leaf> last_leaf = nullptr;
 
-	//! Go to the next node
+	//! Goes to the next leaf in the ART and sets it as last_leaf,
+	//! returns false if there is no next leaf
 	bool Next();
-	//! Push part of the key to the current key
-	void PushKey(const Node &node, const uint8_t byte);
-	//! Pop node from the stack of iterator entries
+	//! Pop the top node from the stack of iterator entries and adjust the current key
 	void PopNode();
 };
 } // namespace duckdb

package/src/duckdb/src/include/duckdb/execution/index/art/leaf.hpp

@@ -8,16 +8,13 @@
 
 #pragma once
 
-#include "duckdb/execution/index/art/art.hpp"
 #include "duckdb/execution/index/art/fixed_size_allocator.hpp"
+#include "duckdb/execution/index/art/art.hpp"
 #include "duckdb/execution/index/art/node.hpp"
-#include "duckdb/execution/index/art/prefix.hpp"
 
 namespace duckdb {
 
 // classes
-class Node;
-class ARTKey;
 class MetaBlockWriter;
 class MetaBlockReader;
 
@@ -28,8 +25,6 @@ class Leaf {
 public:
 	//! Number of row IDs
 	uint32_t count;
-	//! Compressed path (prefix)
-	Prefix prefix;
 	union {
 		//! The pointer to the head of the list of leaf segments
 		Node ptr;
@@ -38,13 +33,10 @@ public:
 	} row_ids;
 
 public:
-	//! Get a new leaf node, might cause a new buffer allocation, and initializes a leaf holding one
-	//! row ID and a prefix starting at depth
-	static Leaf &New(ART &art, Node &node, const ARTKey &key, const uint32_t depth, const row_t row_id);
-	//! Get a new leaf node, might cause a new buffer allocation, and initializes a leaf holding
-	//! n_row_ids row IDs and a prefix starting at depth
-	static Leaf &New(ART &art, Node &node, const ARTKey &key, const uint32_t depth, const row_t *row_ids,
-	                 const idx_t count);
+	//! Get a new leaf node, might cause a new buffer allocation, and initializes a leaf holding one row ID
+	static Leaf &New(ART &art, Node &node, const row_t row_id);
+	//! Get a new leaf node, might cause a new buffer allocation, and initializes a leaf holding n_row_ids row IDs
+	static Leaf &New(ART &art, Node &node, const row_t *row_ids, const idx_t count);
 	//! Free the leaf
 	static void Free(ART &art, Node &node);
 	//! Get a reference to the leaf
@@ -72,7 +64,7 @@ public:
 	//! and sets the ptr to point to the segment containing the row ID
 	uint32_t FindRowId(const ART &art, Node &ptr, const row_t row_id) const;
 
-	//! Returns the string representation of a leaf
+	//! Returns the string representation of the node, or only traverses and verifies the node and its subtree
 	string VerifyAndToString(const ART &art, const bool only_verify) const;
 
 	//! Serialize this leaf

package/src/duckdb/src/include/duckdb/execution/index/art/node.hpp

@@ -15,7 +15,7 @@ namespace duckdb {
 
 // classes
 enum class NType : uint8_t {
-	PREFIX_SEGMENT = 1,
+	PREFIX = 1,
 	LEAF_SEGMENT = 2,
 	LEAF = 3,
 	NODE_4 = 4,
@@ -38,11 +38,6 @@ struct ARTFlags;
 //! The remaining bytes are the position in the respective ART buffer.
 class Node : public SwizzleablePointer {
 public:
-	// constants (this allows testing performance with different ART node sizes)
-
-	//! Node prefixes (NOTE: this should always hold: PREFIX_SEGMENT_SIZE >= PREFIX_INLINE_BYTES)
-	static constexpr uint32_t PREFIX_INLINE_BYTES = 8;
-	static constexpr uint32_t PREFIX_SEGMENT_SIZE = 32;
 	//! Node thresholds
 	static constexpr uint8_t NODE_48_SHRINK_THRESHOLD = 12;
 	static constexpr uint8_t NODE_256_SHRINK_THRESHOLD = 36;
@@ -54,6 +49,7 @@ public:
 	//! Other constants
 	static constexpr uint8_t EMPTY_MARKER = 48;
 	static constexpr uint32_t LEAF_SEGMENT_SIZE = 8;
+	static constexpr uint8_t PREFIX_SIZE = 15;
 
 public:
 	//! Constructs an empty ARTNode
@@ -73,7 +69,7 @@ public:
 	//! Retrieve the node type from the leftmost byte
 	inline NType DecodeARTNodeType() const {
 		D_ASSERT(!IsSwizzled());
-		D_ASSERT(type >= (uint8_t)NType::PREFIX_SEGMENT);
+		D_ASSERT(type >= (uint8_t)NType::PREFIX);
 		D_ASSERT(type <= (uint8_t)NType::NODE_256);
 		return NType(type);
 	}
@@ -91,7 +87,7 @@ public:
 	//! Insert the child node at byte
 	static void InsertChild(ART &art, Node &node, const uint8_t byte, const Node child);
 	//! Delete the child node at the respective byte
-	static void DeleteChild(ART &art, Node &node, const uint8_t byte);
+	static void DeleteChild(ART &art, Node &node, Node &prefix, const uint8_t byte);
 
 	//! Get the child for the respective byte in the node
 	optional_ptr<Node> GetChild(ART &art, const uint8_t byte) const;
@@ -107,8 +103,6 @@ public:
 	string VerifyAndToString(ART &art, const bool only_verify);
 	//! Returns the capacity of the node
 	idx_t GetCapacity() const;
-	//! Returns a pointer to the prefix of the node
-	Prefix &GetPrefix(ART &art);
 	//! Returns the matching node type for a given count
 	static NType GetARTNodeTypeByCount(const idx_t count);
 	//! Get references to the different allocators