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

package/src/duckdb/src/include/duckdb/common/virtual_file_system.hpp

@@ -10,6 +10,7 @@
 
 #include "duckdb/common/file_system.hpp"
 #include "duckdb/common/map.hpp"
+#include "duckdb/common/unordered_set.hpp"
 
 namespace duckdb {
 
@@ -22,120 +23,60 @@ public:
 	                                FileCompressionType compression = FileCompressionType::UNCOMPRESSED,
 	                                FileOpener *opener = nullptr) override;
 
-	void Read(FileHandle &handle, void *buffer, int64_t nr_bytes, idx_t location) override {
-		handle.file_system.Read(handle, buffer, nr_bytes, location);
-	};
+	void Read(FileHandle &handle, void *buffer, int64_t nr_bytes, idx_t location) override;
+	void Write(FileHandle &handle, void *buffer, int64_t nr_bytes, idx_t location) override;
 
-	void Write(FileHandle &handle, void *buffer, int64_t nr_bytes, idx_t location) override {
-		handle.file_system.Write(handle, buffer, nr_bytes, location);
-	}
+	int64_t Read(FileHandle &handle, void *buffer, int64_t nr_bytes) override;
 
-	int64_t Read(FileHandle &handle, void *buffer, int64_t nr_bytes) override {
-		return handle.file_system.Read(handle, buffer, nr_bytes);
-	}
+	int64_t Write(FileHandle &handle, void *buffer, int64_t nr_bytes) override;
 
-	int64_t Write(FileHandle &handle, void *buffer, int64_t nr_bytes) override {
-		return handle.file_system.Write(handle, buffer, nr_bytes);
-	}
+	int64_t GetFileSize(FileHandle &handle) override;
+	time_t GetLastModifiedTime(FileHandle &handle) override;
+	FileType GetFileType(FileHandle &handle) override;
 
-	int64_t GetFileSize(FileHandle &handle) override {
-		return handle.file_system.GetFileSize(handle);
-	}
-	time_t GetLastModifiedTime(FileHandle &handle) override {
-		return handle.file_system.GetLastModifiedTime(handle);
-	}
-	FileType GetFileType(FileHandle &handle) override {
-		return handle.file_system.GetFileType(handle);
-	}
+	void Truncate(FileHandle &handle, int64_t new_size) override;
 
-	void Truncate(FileHandle &handle, int64_t new_size) override {
-		handle.file_system.Truncate(handle, new_size);
-	}
-
-	void FileSync(FileHandle &handle) override {
-		handle.file_system.FileSync(handle);
-	}
+	void FileSync(FileHandle &handle) override;
 
 	// need to look up correct fs for this
-	bool DirectoryExists(const string &directory) override {
-		return FindFileSystem(directory)->DirectoryExists(directory);
-	}
-	void CreateDirectory(const string &directory) override {
-		FindFileSystem(directory)->CreateDirectory(directory);
-	}
+	bool DirectoryExists(const string &directory) override;
+	void CreateDirectory(const string &directory) override;
 
-	void RemoveDirectory(const string &directory) override {
-		FindFileSystem(directory)->RemoveDirectory(directory);
-	}
+	void RemoveDirectory(const string &directory) override;
 
 	bool ListFiles(const string &directory, const std::function<void(const string &, bool)> &callback,
-	               FileOpener *opener = nullptr) override {
-		return FindFileSystem(directory)->ListFiles(directory, callback, opener);
-	}
-
-	void MoveFile(const string &source, const string &target) override {
-		FindFileSystem(source)->MoveFile(source, target);
-	}
-
-	bool FileExists(const string &filename) override {
-		return FindFileSystem(filename)->FileExists(filename);
-	}
-
-	bool IsPipe(const string &filename) override {
-		return FindFileSystem(filename)->IsPipe(filename);
-	}
-	virtual void RemoveFile(const string &filename) override {
-		FindFileSystem(filename)->RemoveFile(filename);
-	}
-
-	virtual vector<string> Glob(const string &path, FileOpener *opener = nullptr) override {
-		return FindFileSystem(path)->Glob(path, opener);
-	}
-
-	void RegisterSubSystem(unique_ptr<FileSystem> fs) override {
-		sub_systems.push_back(std::move(fs));
-	}
-
-	void UnregisterSubSystem(const string &name) override {
-		for (auto sub_system = sub_systems.begin(); sub_system != sub_systems.end(); sub_system++) {
-			if (sub_system->get()->GetName() == name) {
-				sub_systems.erase(sub_system);
-				return;
-			}
-		}
-		throw InvalidInputException("Could not find filesystem with name %s", name);
-	}
-
-	void RegisterSubSystem(FileCompressionType compression_type, unique_ptr<FileSystem> fs) override {
-		compressed_fs[compression_type] = std::move(fs);
-	}
-
-	vector<string> ListSubSystems() override {
-		vector<string> names(sub_systems.size());
-		for (idx_t i = 0; i < sub_systems.size(); i++) {
-			names[i] = sub_systems[i]->GetName();
-		}
-		return names;
-	}
-
-	std::string GetName() const override {
-		return "VirtualFileSystem";
-	}
+	               FileOpener *opener = nullptr) override;
+
+	void MoveFile(const string &source, const string &target) override;
+
+	bool FileExists(const string &filename) override;
+
+	bool IsPipe(const string &filename) override;
+	virtual void RemoveFile(const string &filename) override;
+
+	virtual vector<string> Glob(const string &path, FileOpener *opener = nullptr) override;
+
+	void RegisterSubSystem(unique_ptr<FileSystem> fs) override;
+
+	void UnregisterSubSystem(const string &name) override;
+
+	void RegisterSubSystem(FileCompressionType compression_type, unique_ptr<FileSystem> fs) override;
+
+	vector<string> ListSubSystems() override;
+
+	std::string GetName() const override;
+
+	void SetDisabledFileSystems(const vector<string> &names) override;
 
 private:
-	FileSystem *FindFileSystem(const string &path) {
-		for (auto &sub_system : sub_systems) {
-			if (sub_system->CanHandleFile(path)) {
-				return sub_system.get();
-			}
-		}
-		return default_fs.get();
-	}
+	FileSystem &FindFileSystem(const string &path);
+	FileSystem &FindFileSystemInternal(const string &path);
 
 private:
 	vector<unique_ptr<FileSystem>> sub_systems;
 	map<FileCompressionType, unique_ptr<FileSystem>> compressed_fs;
 	const unique_ptr<FileSystem> default_fs;
+	unordered_set<string> disabled_file_systems;
 };
 
 } // namespace duckdb

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

@@ -31,10 +31,10 @@ struct CorrOperation {
 	}
 
 	template <class A_TYPE, class B_TYPE, class STATE, class OP>
-	static void Operation(STATE &state, const A_TYPE &x_input, const B_TYPE &y_input, AggregateBinaryInput &idata) {
-		CovarOperation::Operation<A_TYPE, B_TYPE, CovarState, OP>(state.cov_pop, x_input, y_input, idata);
-		STDDevBaseOperation::Execute<A_TYPE, StddevState>(state.dev_pop_x, x_input);
-		STDDevBaseOperation::Execute<B_TYPE, StddevState>(state.dev_pop_y, y_input);
+	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.dev_pop_x, x);
+		STDDevBaseOperation::Execute<B_TYPE, StddevState>(state.dev_pop_y, y);
 	}
 
 	template <class STATE, class OP>

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);