duckdb 0.3.2-dev656.0 → 0.3.2-dev658.0

package/package.json

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

package/src/duckdb.cpp

@@ -65497,6 +65497,7 @@ unique_ptr<PhysicalOperator> PhysicalPlanGenerator::CreatePlan(LogicalChunkGet &
 
 
 
+
 namespace duckdb {
 
 static bool CanPlanIndexJoin(Transaction &transaction, TableScanBindData *bind_data, PhysicalTableScan &scan) {
@@ -65516,6 +65517,30 @@ static bool CanPlanIndexJoin(Transaction &transaction, TableScanBindData *bind_d
 	return true;
 }
 
+bool ExtractNumericValue(Value val, int64_t &result) {
+	if (!val.type().IsIntegral()) {
+		switch (val.type().InternalType()) {
+		case PhysicalType::INT16:
+			result = val.GetValueUnsafe<int16_t>();
+			break;
+		case PhysicalType::INT32:
+			result = val.GetValueUnsafe<int32_t>();
+			break;
+		case PhysicalType::INT64:
+			result = val.GetValueUnsafe<int64_t>();
+			break;
+		default:
+			return false;
+		}
+	} else {
+		if (!val.TryCastAs(LogicalType::BIGINT)) {
+			return false;
+		}
+		result = val.GetValue<int64_t>();
+	}
+	return true;
+}
+
 void CheckForPerfectJoinOpt(LogicalComparisonJoin &op, PerfectHashJoinStats &join_state) {
 	// we only do this optimization for inner joins
 	if (op.join_type != JoinType::INNER) {
@@ -65548,7 +65573,14 @@ void CheckForPerfectJoinOpt(LogicalComparisonJoin &op, PerfectHashJoinStats &joi
 	if (stats_build->min.is_null || stats_build->max.is_null) {
 		return;
 	}
-	auto build_range = stats_build->max - stats_build->min; // Join Keys Range
+	int64_t min_value, max_value;
+	if (!ExtractNumericValue(stats_build->min, min_value) || !ExtractNumericValue(stats_build->max, max_value)) {
+		return;
+	}
+	int64_t build_range;
+	if (!TrySubtractOperator::Operation(max_value, min_value, build_range)) {
+		return;
+	}
 
 	// Fill join_stats for invisible join
 	auto stats_probe = reinterpret_cast<NumericStatistics *>(op.join_stats[1].get()); // rhs stats
@@ -65560,26 +65592,7 @@ void CheckForPerfectJoinOpt(LogicalComparisonJoin &op, PerfectHashJoinStats &joi
 	join_state.build_min = stats_build->min;
 	join_state.build_max = stats_build->max;
 	join_state.estimated_cardinality = op.estimated_cardinality;
-	if (!build_range.type().IsIntegral()) {
-		switch (build_range.type().InternalType()) {
-		case PhysicalType::INT16:
-			join_state.build_range = build_range.value_.smallint;
-			break;
-		case PhysicalType::INT32:
-			join_state.build_range = build_range.value_.integer;
-			break;
-		case PhysicalType::INT64:
-			join_state.build_range = build_range.value_.bigint;
-			break;
-		case PhysicalType::INT128:
-			// we do not support hugeint for this optimization
-			return;
-		default:
-			throw InternalException("Invalid Physical Type for Decimals");
-		}
-	} else {
-		join_state.build_range = build_range.GetValue<idx_t>(); // cast integer types into idx_t
-	}
+	join_state.build_range = build_range;
 	if (join_state.build_range > MAX_BUILD_SIZE || stats_probe->max.is_null || stats_probe->min.is_null) {
 		return;
 	}

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 "52c01882a"
-#define DUCKDB_VERSION "0.3.2-dev656"
+#define DUCKDB_SOURCE_ID "0f8960ac3"
+#define DUCKDB_VERSION "0.3.2-dev658"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //