duckdb 0.5.2-dev55.0 → 0.5.2-dev62.0

package/package.json

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

package/src/duckdb.cpp

@@ -34073,7 +34073,7 @@ static void ComputeStringEntrySizes(UnifiedVectorFormat &vdata, idx_t entry_size
 	auto strings = (string_t *)vdata.data;
 	for (idx_t i = 0; i < ser_count; i++) {
 		auto idx = sel.get_index(i);
-		auto str_idx = vdata.sel->get_index(idx) + offset;
+		auto str_idx = vdata.sel->get_index(idx + offset);
 		if (vdata.validity.RowIsValid(str_idx)) {
 			entry_sizes[i] += sizeof(uint32_t) + strings[str_idx].GetSize();
 		}
@@ -34104,7 +34104,7 @@ static void ComputeListEntrySizes(Vector &v, UnifiedVectorFormat &vdata, idx_t e
 	idx_t list_entry_sizes[STANDARD_VECTOR_SIZE];
 	for (idx_t i = 0; i < ser_count; i++) {
 		auto idx = sel.get_index(i);
-		auto source_idx = vdata.sel->get_index(idx) + offset;
+		auto source_idx = vdata.sel->get_index(idx + offset);
 		if (vdata.validity.RowIsValid(source_idx)) {
 			auto list_entry = list_data[source_idx];
 
@@ -34182,7 +34182,7 @@ static void TemplatedHeapScatter(UnifiedVectorFormat &vdata, const SelectionVect
 	if (!validitymask_locations) {
 		for (idx_t i = 0; i < count; i++) {
 			auto idx = sel.get_index(i);
-			auto source_idx = vdata.sel->get_index(idx) + offset;
+			auto source_idx = vdata.sel->get_index(idx + offset);
 
 			auto target = (T *)key_locations[i];
 			Store<T>(source[source_idx], (data_ptr_t)target);
@@ -34195,7 +34195,7 @@ static void TemplatedHeapScatter(UnifiedVectorFormat &vdata, const SelectionVect
 		const auto bit = ~(1UL << idx_in_entry);
 		for (idx_t i = 0; i < count; i++) {
 			auto idx = sel.get_index(i);
-			auto source_idx = vdata.sel->get_index(idx) + offset;
+			auto source_idx = vdata.sel->get_index(idx + offset);
 
 			auto target = (T *)key_locations[i];
 			Store<T>(source[source_idx], (data_ptr_t)target);
@@ -34218,7 +34218,7 @@ static void HeapScatterStringVector(Vector &v, idx_t vcount, const SelectionVect
 	if (!validitymask_locations) {
 		for (idx_t i = 0; i < ser_count; i++) {
 			auto idx = sel.get_index(i);
-			auto source_idx = vdata.sel->get_index(idx) + offset;
+			auto source_idx = vdata.sel->get_index(idx + offset);
 			if (vdata.validity.RowIsValid(source_idx)) {
 				auto &string_entry = strings[source_idx];
 				// store string size
@@ -34236,7 +34236,7 @@ static void HeapScatterStringVector(Vector &v, idx_t vcount, const SelectionVect
 		const auto bit = ~(1UL << idx_in_entry);
 		for (idx_t i = 0; i < ser_count; i++) {
 			auto idx = sel.get_index(i);
-			auto source_idx = vdata.sel->get_index(idx) + offset;
+			auto source_idx = vdata.sel->get_index(idx + offset);
 			if (vdata.validity.RowIsValid(source_idx)) {
 				auto &string_entry = strings[source_idx];
 				// store string size
@@ -34314,7 +34314,7 @@ static void HeapScatterListVector(Vector &v, idx_t vcount, const SelectionVector
 
 	for (idx_t i = 0; i < ser_count; i++) {
 		auto idx = sel.get_index(i);
-		auto source_idx = vdata.sel->get_index(idx) + offset;
+		auto source_idx = vdata.sel->get_index(idx + offset);
 		if (!vdata.validity.RowIsValid(source_idx)) {
 			if (validitymask_locations) {
 				// set the row validitymask for this column to invalid
@@ -178885,6 +178885,10 @@ unique_ptr<LogicalOperator> Binder::CreatePlan(BoundSetOperationNode &node) {
 
 
 
+
+
+
+
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -178936,10 +178940,6 @@ private:
 } // namespace duckdb
 
 
-
-
-
-
 namespace duckdb {
 
 static unique_ptr<Expression> PlanUncorrelatedSubquery(Binder &binder, BoundSubqueryExpression &expr,
@@ -179191,7 +179191,7 @@ static unique_ptr<Expression> PlanCorrelatedSubquery(Binder &binder, BoundSubque
 		auto delim_join = CreateDuplicateEliminatedJoin(correlated_columns, JoinType::MARK, move(root), perform_delim);
 		delim_join->mark_index = mark_index;
 		// RHS
-		FlattenDependentJoins flatten(binder, correlated_columns, perform_delim);
+		FlattenDependentJoins flatten(binder, correlated_columns, perform_delim, true);
 		flatten.DetectCorrelatedExpressions(plan.get());
 		auto dependent_join = flatten.PushDownDependentJoin(move(plan));
 
@@ -179218,7 +179218,7 @@ static unique_ptr<Expression> PlanCorrelatedSubquery(Binder &binder, BoundSubque
 		auto delim_join = CreateDuplicateEliminatedJoin(correlated_columns, JoinType::MARK, move(root), perform_delim);
 		delim_join->mark_index = mark_index;
 		// RHS
-		FlattenDependentJoins flatten(binder, correlated_columns, true);
+		FlattenDependentJoins flatten(binder, correlated_columns, true, true);
 		flatten.DetectCorrelatedExpressions(plan.get());
 		auto dependent_join = flatten.PushDownDependentJoin(move(plan));
 

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 "d6d924d76"
-#define DUCKDB_VERSION "v0.5.2-dev55"
+#define DUCKDB_SOURCE_ID "48dd0a401"
+#define DUCKDB_VERSION "v0.5.2-dev62"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //