duckdb 0.3.5-dev750.0 → 0.3.5-dev762.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "duckdb",
   "main": "./lib/duckdb.js",
-  "version": "0.3.5-dev750.0",
+  "version": "0.3.5-dev762.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/duckdb.cpp

@@ -45933,7 +45933,7 @@ void Vector::Orrify(idx_t count, VectorData &data) {
 		break;
 	default:
 		Normalify(count);
-		data.sel = FlatVector::IncrementalSelectionVector(count, data.owned_sel);
+		data.sel = FlatVector::IncrementalSelectionVector();
 		data.data = FlatVector::GetData(*this);
 		data.validity = FlatVector::Validity(*this);
 		break;
@@ -46128,8 +46128,7 @@ void Vector::UTFVerify(const SelectionVector &sel, idx_t count) {
 }
 
 void Vector::UTFVerify(idx_t count) {
-	SelectionVector owned_sel;
-	auto flat_sel = FlatVector::IncrementalSelectionVector(count, owned_sel);
+	auto flat_sel = FlatVector::IncrementalSelectionVector();
 
 	UTFVerify(*flat_sel, count);
 }
@@ -46247,8 +46246,7 @@ void Vector::Verify(const SelectionVector &sel, idx_t count) {
 }
 
 void Vector::Verify(idx_t count) {
-	SelectionVector owned_sel;
-	auto flat_sel = FlatVector::IncrementalSelectionVector(count, owned_sel);
+	auto flat_sel = FlatVector::IncrementalSelectionVector();
 	Verify(*flat_sel, count);
 }
 
@@ -46277,17 +46275,6 @@ void ConstantVector::SetNull(Vector &vector, bool is_null) {
 	}
 }
 
-const SelectionVector *FlatVector::IncrementalSelectionVector(idx_t count, SelectionVector &owned_sel) {
-	if (count <= STANDARD_VECTOR_SIZE) {
-		return FlatVector::IncrementalSelectionVector();
-	}
-	owned_sel.Initialize(count);
-	for (idx_t i = 0; i < count; i++) {
-		owned_sel.set_index(i, i);
-	}
-	return &owned_sel;
-}
-
 const SelectionVector *ConstantVector::ZeroSelectionVector(idx_t count, SelectionVector &owned_sel) {
 	if (count <= STANDARD_VECTOR_SIZE) {
 		return ConstantVector::ZeroSelectionVector();
@@ -49337,9 +49324,8 @@ static idx_t DistinctSelectConstant(Vector &left, Vector &right, const Selection
 template <class LEFT_TYPE, class RIGHT_TYPE, class OP>
 static idx_t DistinctSelect(Vector &left, Vector &right, const SelectionVector *sel, idx_t count,
                             SelectionVector *true_sel, SelectionVector *false_sel) {
-	SelectionVector owned_sel;
 	if (!sel) {
-		sel = FlatVector::IncrementalSelectionVector(count, owned_sel);
+		sel = FlatVector::IncrementalSelectionVector();
 	}
 	if (left.GetVectorType() == VectorType::CONSTANT_VECTOR && right.GetVectorType() == VectorType::CONSTANT_VECTOR) {
 		return DistinctSelectConstant<LEFT_TYPE, RIGHT_TYPE, OP>(left, right, sel, count, true_sel, false_sel);
@@ -49773,9 +49759,8 @@ static idx_t DistinctSelectNested(Vector &left, Vector &right, const SelectionVe
 	// a selection vector in a single pass. But to implement progressive comparisons,
 	// we have to make multiple passes, so we need to keep track of the original input positions
 	// and then scatter the output selections when we are done.
-	SelectionVector owned_sel;
 	if (!sel) {
-		sel = FlatVector::IncrementalSelectionVector(count, owned_sel);
+		sel = FlatVector::IncrementalSelectionVector();
 	}
 
 	// Make buffered selections for progressive comparisons
@@ -51697,8 +51682,7 @@ void VectorOperations::Copy(const Vector &source, Vector &target, idx_t source_c
 		break;
 	}
 	case VectorType::FLAT_VECTOR: {
-		SelectionVector owned_sel;
-		auto sel = FlatVector::IncrementalSelectionVector(source_count, owned_sel);
+		auto sel = FlatVector::IncrementalSelectionVector();
 		VectorOperations::Copy(source, target, *sel, source_count, source_offset, target_offset);
 		break;
 	}
@@ -51708,8 +51692,7 @@ void VectorOperations::Copy(const Vector &source, Vector &target, idx_t source_c
 		Vector flattened(source.GetType());
 		VectorOperations::GenerateSequence(flattened, source_count, start, increment);
 
-		SelectionVector owned_sel;
-		auto sel = FlatVector::IncrementalSelectionVector(source_count, owned_sel);
+		auto sel = FlatVector::IncrementalSelectionVector();
 		VectorOperations::Copy(flattened, target, *sel, source_count, source_offset, target_offset);
 		break;
 	}
@@ -54207,9 +54190,8 @@ static idx_t NestedSelectOperation(Vector &left, Vector &right, const SelectionV
 	// a selection vector in a single pass. But to implement progressive comparisons,
 	// we have to make multiple passes, so we need to keep track of the original input positions
 	// and then scatter the output selections when we are done.
-	SelectionVector owned_sel;
 	if (!sel) {
-		sel = FlatVector::IncrementalSelectionVector(count, owned_sel);
+		sel = FlatVector::IncrementalSelectionVector();
 	}
 
 	// Make buffered selections for progressive comparisons
@@ -54959,9 +54941,8 @@ idx_t ExpressionExecutor::DefaultSelect(const Expression &expr, ExpressionState
 	VectorData idata;
 	intermediate.Orrify(count, idata);
 
-	SelectionVector owned_sel;
 	if (!sel) {
-		sel = FlatVector::IncrementalSelectionVector(count, owned_sel);
+		sel = FlatVector::IncrementalSelectionVector();
 	}
 	if (!idata.validity.AllValid()) {
 		return DefaultSelectSwitch<false>(idata, sel, count, true_sel, false_sel);
@@ -81601,7 +81582,7 @@ static bool TemplatedOptimumList(Vector &left, idx_t lidx, idx_t lcount, Vector
 	ridx = rvdata.sel->get_index(ridx);
 
 	lcount = ListVector::GetListSize(left);
-	rcount = ListVector::GetListSize(left);
+	rcount = ListVector::GetListSize(right);
 
 	// DISTINCT semantics are in effect for nested types
 	auto lnull = !lvdata.validity.RowIsValid(lidx);
@@ -100213,8 +100194,7 @@ static void ConcatWSFunction(DataChunk &args, ExpressionState &state, Vector &re
 			return;
 		}
 		// no null values
-		SelectionVector owned_sel;
-		auto sel = FlatVector::IncrementalSelectionVector(args.size(), owned_sel);
+		auto sel = FlatVector::IncrementalSelectionVector();
 		TemplatedConcatWS(args, (string_t *)vdata.data, *vdata.sel, *sel, args.size(), result);
 		return;
 	}
@@ -180951,8 +180931,7 @@ void BaseStatistics::Verify(Vector &vector, const SelectionVector &sel, idx_t co
 }
 
 void BaseStatistics::Verify(Vector &vector, idx_t count) const {
-	SelectionVector owned_sel;
-	auto sel = FlatVector::IncrementalSelectionVector(count, owned_sel);
+	auto sel = FlatVector::IncrementalSelectionVector();
 	Verify(vector, *sel, count);
 }
 
@@ -184079,7 +184058,7 @@ void ListColumnData::Append(BaseStatistics &stats_p, ColumnAppendState &state, V
 
 	VectorData vdata;
 	vdata.validity = list_validity;
-	vdata.sel = FlatVector::IncrementalSelectionVector(count, vdata.owned_sel);
+	vdata.sel = FlatVector::IncrementalSelectionVector();
 	vdata.data = (data_ptr_t)append_offsets.get();
 
 	// append the list offsets

package/src/duckdb.hpp

@@ -11,8 +11,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #pragma once
 #define DUCKDB_AMALGAMATION 1
 #define DUCKDB_AMALGAMATION_EXTENDED 1
-#define DUCKDB_SOURCE_ID "4e5f39098"
-#define DUCKDB_VERSION "v0.3.5-dev750"
+#define DUCKDB_SOURCE_ID "d4fb733d0"
+#define DUCKDB_VERSION "v0.3.5-dev762"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -3874,7 +3874,6 @@ struct FlatVector {
 		D_ASSERT(vector.GetVectorType() == VectorType::FLAT_VECTOR);
 		return !vector.validity.RowIsValid(idx);
 	}
-	DUCKDB_API static const SelectionVector *IncrementalSelectionVector(idx_t count, SelectionVector &owned_sel);
 	DUCKDB_API static const SelectionVector *IncrementalSelectionVector();
 };
 
@@ -4896,9 +4895,8 @@ 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::IncrementalSelectionVector(count, owned_sel);
+			sel = FlatVector::IncrementalSelectionVector();
 		}
 		if (left.GetVectorType() == VectorType::CONSTANT_VECTOR &&
 		    right.GetVectorType() == VectorType::CONSTANT_VECTOR) {
@@ -5097,9 +5095,8 @@ 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::IncrementalSelectionVector(count, owned_sel);
+			sel = FlatVector::IncrementalSelectionVector();
 		}
 		VectorData adata, bdata, cdata;
 		a.Orrify(count, adata);