duckdb 0.3.2-dev597.0 → 0.3.2-dev633.0

package/src/duckdb.hpp

@@ -10,8 +10,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 #pragma once
 #define DUCKDB_AMALGAMATION 1
-#define DUCKDB_SOURCE_ID "a3ba38f05"
-#define DUCKDB_VERSION "0.3.2-dev597"
+#define DUCKDB_SOURCE_ID "c07e22907"
+#define DUCKDB_VERSION "0.3.2-dev633"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -1034,6 +1034,8 @@ public:
 	static constexpr const LogicalTypeId TABLE = LogicalTypeId::TABLE;
 	static constexpr const LogicalTypeId INVALID = LogicalTypeId::INVALID;
 
+	static constexpr const LogicalTypeId ROW_TYPE = LogicalTypeId::BIGINT;
+
 	// explicitly allowing these functions to be capitalized to be in-line with the remaining functions
 	DUCKDB_API static LogicalType DECIMAL(int width, int scale);                 // NOLINT
 	DUCKDB_API static LogicalType VARCHAR_COLLATION(string collation);           // NOLINT
@@ -1044,11 +1046,11 @@ public:
 	DUCKDB_API static LogicalType ENUM(const string &enum_name, Vector &ordered_data, idx_t size); // NOLINT
 	DUCKDB_API static LogicalType USER(const string &user_type_name); // NOLINT
 	//! A list of all NUMERIC types (integral and floating point types)
-	DUCKDB_API static const vector<LogicalType> NUMERIC;
+	DUCKDB_API static const vector<LogicalType> Numeric();
 	//! A list of all INTEGRAL types
-	DUCKDB_API static const vector<LogicalType> INTEGRAL;
+	DUCKDB_API static const vector<LogicalType> Integral();
 	//! A list of ALL SQL types
-	DUCKDB_API static const vector<LogicalType> ALL_TYPES;
+	DUCKDB_API static const vector<LogicalType> AllTypes();
 };
 
 struct DecimalType {
@@ -1144,7 +1146,6 @@ bool IsValidType() {
 }
 
 //! The PhysicalType used by the row identifiers column
-extern const LogicalType LOGICAL_ROW_TYPE;
 extern const PhysicalType ROW_TYPE;
 
 DUCKDB_API string TypeIdToString(PhysicalType type);
@@ -3492,11 +3493,11 @@ struct ConstantVector {
 		return vector.validity;
 	}
 	DUCKDB_API static const SelectionVector *ZeroSelectionVector(idx_t count, SelectionVector &owned_sel);
+	DUCKDB_API static const SelectionVector *ZeroSelectionVector();
 	//! Turns "vector" into a constant vector by referencing a value within the source vector
 	DUCKDB_API static void Reference(Vector &vector, Vector &source, idx_t position, idx_t count);
 
 	static const sel_t ZERO_VECTOR[STANDARD_VECTOR_SIZE];
-	static const SelectionVector ZERO_SELECTION_VECTOR;
 };
 
 struct DictionaryVector {
@@ -3556,9 +3557,8 @@ struct FlatVector {
 		D_ASSERT(vector.GetVectorType() == VectorType::FLAT_VECTOR);
 		return !vector.validity.RowIsValid(idx);
 	}
-
-	static const sel_t INCREMENTAL_VECTOR[STANDARD_VECTOR_SIZE];
-	static const SelectionVector INCREMENTAL_SELECTION_VECTOR;
+	DUCKDB_API static const SelectionVector *IncrementalSelectionVector(idx_t count, SelectionVector &owned_sel);
+	DUCKDB_API static const SelectionVector *IncrementalSelectionVector();
 };
 
 struct ListVector {
@@ -4415,8 +4415,9 @@ public:
 	template <class LEFT_TYPE, class RIGHT_TYPE, class OP>
 	static idx_t Select(Vector &left, Vector &right, const SelectionVector *sel, idx_t count, SelectionVector *true_sel,
 	                    SelectionVector *false_sel) {
+		SelectionVector owned_sel;
 		if (!sel) {
-			sel = &FlatVector::INCREMENTAL_SELECTION_VECTOR;
+			sel = FlatVector::IncrementalSelectionVector(count, owned_sel);
 		}
 		if (left.GetVectorType() == VectorType::CONSTANT_VECTOR &&
 		    right.GetVectorType() == VectorType::CONSTANT_VECTOR) {
@@ -4585,8 +4586,9 @@ public:
 	template <class A_TYPE, class B_TYPE, class C_TYPE, class OP>
 	static idx_t Select(Vector &a, Vector &b, Vector &c, const SelectionVector *sel, idx_t count,
 	                    SelectionVector *true_sel, SelectionVector *false_sel) {
+		SelectionVector owned_sel;
 		if (!sel) {
-			sel = &FlatVector::INCREMENTAL_SELECTION_VECTOR;
+			sel = FlatVector::IncrementalSelectionVector(count, owned_sel);
 		}
 		VectorData adata, bdata, cdata;
 		a.Orrify(count, adata);
@@ -10373,7 +10375,7 @@ public:
 
 
 
-#ifdef DUCKDB_BUILD_LOADABLE_EXTENSION
+#if defined(DUCKDB_BUILD_LOADABLE_EXTENSION) && defined(DUCKDB_EXTENSION_MAIN)
 #ifdef _WIN32
 #ifndef NOMINMAX
 #define NOMINMAX