duckdb 0.3.3-dev1495.0 → 0.3.3-dev1504.0

package/package.json

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

package/src/duckdb.cpp

@@ -59862,6 +59862,7 @@ struct IEJoinUnion {
 	IEJoinUnion(ClientContext &context, const PhysicalIEJoin &op, SortedTable &t1, const idx_t b1, SortedTable &t2,
 	            const idx_t b2);
 
+	idx_t SearchL1(idx_t pos);
 	bool NextRow();
 
 	//! Inverted loop
@@ -59890,6 +59891,7 @@ struct IEJoinUnion {
 	//! Iteration state
 	idx_t n;
 	idx_t i;
+	idx_t j;
 	unique_ptr<SBIterator> op1;
 	unique_ptr<SBIterator> off1;
 	unique_ptr<SBIterator> op2;
@@ -60077,9 +60079,57 @@ IEJoinUnion::IEJoinUnion(ClientContext &context, const PhysicalIEJoin &op, Sorte
 	op2 = make_unique<SBIterator>(l2->global_sort_state, cmp2);
 	off2 = make_unique<SBIterator>(l2->global_sort_state, cmp2);
 	i = 0;
+	j = 0;
 	(void)NextRow();
 }
 
+idx_t IEJoinUnion::SearchL1(idx_t pos) {
+	// Perform an exponential search in the appropriate direction
+	op1->SetIndex(pos);
+
+	idx_t step = 1;
+	auto hi = pos;
+	auto lo = pos;
+	if (!op1->cmp) {
+		// Scan left for loose inequality
+		lo -= MinValue(step, lo);
+		step *= 2;
+		off1->SetIndex(lo);
+		while (lo > 0 && op1->Compare(*off1)) {
+			hi = lo;
+			lo -= MinValue(step, lo);
+			step *= 2;
+			off1->SetIndex(lo);
+		}
+	} else {
+		// Scan right for strict inequality
+		hi += MinValue(step, n - hi);
+		step *= 2;
+		off1->SetIndex(hi);
+		while (hi < n && !op1->Compare(*off1)) {
+			lo = hi;
+			hi += MinValue(step, n - hi);
+			step *= 2;
+			off1->SetIndex(hi);
+		}
+	}
+
+	// Binary search the target area
+	while (lo < hi) {
+		const auto mid = lo + (hi - lo) / 2;
+		off1->SetIndex(mid);
+		if (op1->Compare(*off1)) {
+			hi = mid;
+		} else {
+			lo = mid + 1;
+		}
+	}
+
+	off1->SetIndex(lo);
+
+	return lo;
+}
+
 bool IEJoinUnion::NextRow() {
 	for (; i < n; ++i) {
 		// 12. pos ← P[i]
@@ -60096,22 +60146,20 @@ bool IEJoinUnion::NextRow() {
 				break;
 			}
 			const auto p2 = p[off2->GetIndex()];
-			bit_mask.SetValid(p2);
-			bloom_filter.SetValid(p2 / BLOOM_CHUNK_BITS);
+			if (li[p2] < 0) {
+				// Only mark rhs matches.
+				bit_mask.SetValid(p2);
+				bloom_filter.SetValid(p2 / BLOOM_CHUNK_BITS);
+			}
 		}
 
 		// 9.  if (op1 ∈ {≤,≥} and op2 ∈ {≤,≥}) eqOff = 0
 		// 10. else eqOff = 1
 		// No, because there could be more than one equal value.
-		// Scan the neighborhood instead
-		op1->SetIndex(pos);
-		off1->SetIndex(pos);
-		for (; off1->GetIndex() > 0 && op1->Compare(*off1); --(*off1)) {
-			continue;
-		}
-		for (; off1->GetIndex() < n && !op1->Compare(*off1); ++(*off1)) {
-			continue;
-		}
+		// Find the leftmost off1 where L1[pos] op1 L1[off1..n]
+		// These are the rows that satisfy the op1 condition
+		// and that is where we should start scanning B from
+		j = SearchL1(pos);
 
 		return true;
 	}
@@ -60167,7 +60215,6 @@ idx_t IEJoinUnion::JoinComplexBlocks(SelectionVector &lsel, SelectionVector &rse
 		// 13. for (j ← pos+eqOff to n) do
 		for (;;) {
 			// 14. if B[j] = 1 then
-			auto j = off1->GetIndex();
 
 			//	Use the Bloom filter to find candidate blocks
 			while (j < n) {
@@ -60184,10 +60231,10 @@ idx_t IEJoinUnion::JoinComplexBlocks(SelectionVector &lsel, SelectionVector &rse
 			if (j >= n) {
 				break;
 			}
-			off1->SetIndex(j + 1);
 
 			// Filter out tuples with the same sign (they come from the same table)
 			const auto rrid = li[j];
+			++j;
 
 			// 15. add tuples w.r.t. (L1[j], L1[i]) to join result
 			if (lrid > 0 && rrid < 0) {

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 "b6901375c"
-#define DUCKDB_VERSION "v0.3.3-dev1495"
+#define DUCKDB_SOURCE_ID "31db2bada"
+#define DUCKDB_VERSION "v0.3.3-dev1504"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //