duckdb 0.2.10-dev429.0 → 0.2.10-dev437.0

package/package.json

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

package/src/duckdb.cpp

@@ -64753,6 +64753,19 @@ void CheckForPerfectJoinOpt(LogicalComparisonJoin &op, PerfectHashJoinStats &joi
 	return;
 }
 
+static void CanUseIndexJoin(TableScanBindData *tbl, Expression &expr, Index **result_index) {
+	tbl->table->storage->info->indexes.Scan([&](Index &index) {
+		if (index.unbound_expressions.size() != 1) {
+			return false;
+		}
+		if (expr.alias == index.unbound_expressions[0]->alias) {
+			*result_index = &index;
+			return true;
+		}
+		return false;
+	});
+}
+
 void TransformIndexJoin(ClientContext &context, LogicalComparisonJoin &op, Index **left_index, Index **right_index,
                         PhysicalOperator *left, PhysicalOperator *right) {
 	auto &transaction = Transaction::GetTransaction(context);
@@ -64764,26 +64777,14 @@ void TransformIndexJoin(ClientContext &context, LogicalComparisonJoin &op, Index
 			auto &tbl_scan = (PhysicalTableScan &)*left;
 			auto tbl = dynamic_cast<TableScanBindData *>(tbl_scan.bind_data.get());
 			if (CanPlanIndexJoin(transaction, tbl, tbl_scan)) {
-				tbl->table->storage->info->indexes.Scan([&](Index &index) {
-					if (index.unbound_expressions[0]->alias == op.conditions[0].left->alias) {
-						*left_index = &index;
-						return true;
-					}
-					return false;
-				});
+				CanUseIndexJoin(tbl, *op.conditions[0].left, left_index);
 			}
 		}
 		if (right->type == PhysicalOperatorType::TABLE_SCAN) {
 			auto &tbl_scan = (PhysicalTableScan &)*right;
 			auto tbl = dynamic_cast<TableScanBindData *>(tbl_scan.bind_data.get());
 			if (CanPlanIndexJoin(transaction, tbl, tbl_scan)) {
-				tbl->table->storage->info->indexes.Scan([&](Index &index) {
-					if (index.unbound_expressions[0]->alias == op.conditions[0].right->alias) {
-						*right_index = &index;
-						return true;
-					}
-					return false;
-				});
+				CanUseIndexJoin(tbl, *op.conditions[0].right, right_index);
 			}
 		}
 	}

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 "e99b230ee"
-#define DUCKDB_VERSION "0.2.10-dev429"
+#define DUCKDB_SOURCE_ID "ca1fe636e"
+#define DUCKDB_VERSION "0.2.10-dev437"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //