duckdb 0.4.1-dev2358.0 → 0.4.1-dev2371.0

package/lib/duckdb.js

@@ -92,6 +92,7 @@ QueryResult.prototype[Symbol.asyncIterator] = async function*() {
 
 
 /**
+ * Run a SQL statement and trigger a callback when done
  * @arg sql
  * @param {...*} params
  * @param callback
@@ -103,6 +104,7 @@ Connection.prototype.run = function (sql) {
 }
 
 /**
+ * Run a SQL query and triggers the callback once for all result rows
  * @arg sql
  * @param {...*} params
  * @param callback
@@ -114,6 +116,7 @@ Connection.prototype.all = function (sql) {
 }
 
 /**
+ * Runs a SQL query and triggers the callback for each result row
  * @arg sql
  * @param {...*} params
  * @param callback
@@ -260,6 +263,7 @@ Connection.prototype.register = function (name, return_type, fun) {
 }
 
 /**
+ * Prepare a SQL query for execution
  * @method
  * @arg sql
  * @param {...*} params
@@ -268,6 +272,7 @@ Connection.prototype.register = function (name, return_type, fun) {
  */
 Connection.prototype.prepare;
 /**
+ * Execute a SQL query
  * @method
  * @arg sql
  * @param {...*} params
@@ -305,16 +310,28 @@ var default_connection = function (o) {
 
 
 /**
+ * Closes database instance
  * @method
  * @param callback
  * @return {void}
  */
-Database.prototype.close;
+Database.prototype.close = function() {
+    this.default_connection = null
+    this.close_internal.apply(this, arguments);
+};
 
 /**
+ * Internal method. Do not use, call Connection#close instead
+ * @method
+ * @param callback
+ * @return {void}
+ */
+Database.prototype.close_internal;
+
+/**
+ * Triggers callback when all scheduled database tasks have completed.
  * @method
  * @param callback
- * TODO: what does this do?
  * @return {void}
  */
 Database.prototype.wait;
@@ -336,6 +353,7 @@ Database.prototype.serialize;
 Database.prototype.parallelize;
 
 /**
+ * Create a new database connection
  * @method
  * @arg path the database to connect to, either a file path, or `:memory:`
  * @return {Connection}
@@ -343,7 +361,7 @@ Database.prototype.parallelize;
 Database.prototype.connect;
 
 /**
- * TODO: what does this do?
+ * Supposedly interrupt queries, but currently does not do anything.
  * @method
  * @param callback
  * @return {void}
@@ -351,6 +369,7 @@ Database.prototype.connect;
 Database.prototype.interrupt;
 
 /**
+ * Prepare a SQL query for execution
  * @arg sql
  * @return {Statement}
  */
@@ -359,6 +378,7 @@ Database.prototype.prepare = function () {
 }
 
 /**
+ * Convenience method for Connection#run using a built-in default connection
  * @arg sql
  * @param {...*} params
  * @param callback
@@ -370,6 +390,7 @@ Database.prototype.run = function () {
 }
 
 /**
+ * Convenience method for Connection#each using a built-in default connection
  * @arg sql
  * @param {...*} params
  * @param callback
@@ -381,6 +402,7 @@ Database.prototype.each = function () {
 }
 
 /**
+ * Convenience method for Connection#apply using a built-in default connection
  * @arg sql
  * @param {...*} params
  * @param callback
@@ -392,6 +414,7 @@ Database.prototype.all = function () {
 }
 
 /**
+ * Convenience method for Connection#exec using a built-in default connection
  * @arg sql
  * @param {...*} params
  * @param callback
@@ -403,9 +426,7 @@ Database.prototype.exec = function () {
 }
 
 /**
- * Register a User Defined Function
- *
- * Convenience method for Connection#register
+ * Convenience method for Connection#register using a built-in default connection
  * @arg name
  * @arg return_type
  * @arg fun
@@ -417,9 +438,7 @@ Database.prototype.register = function () {
 }
 
 /**
- * Unregister a User Defined Function
- *
- * Convenience method for Connection#unregister
+ * Convenience method for Connection#unregister using a built-in default connection
  * @arg name
  * @return {this}
  */

package/package.json

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

package/src/connection.cpp

@@ -31,8 +31,29 @@ struct ConnectTask : public Task {
 
 	void DoWork() override {
 		auto &connection = Get<Connection>();
+		if (!connection.database_ref || !connection.database_ref->database) {
+			return;
+		}
 		connection.connection = duckdb::make_unique<duckdb::Connection>(*connection.database_ref->database);
+		success = true;
+	}
+	void Callback() override {
+		auto &connection = Get<Connection>();
+		Napi::Env env = connection.Env();
+
+		std::vector<napi_value> args;
+		if (!success) {
+			args.push_back(Utils::CreateError(env, "Invalid database object"));
+		} else {
+			args.push_back(env.Null());
+		}
+
+		Napi::HandleScope scope(env);
+
+		callback.Value().MakeCallback(connection.Value(), args);
 	}
+
+	bool success = false;
 };
 
 Connection::Connection(const Napi::CallbackInfo &info) : Napi::ObjectWrap<Connection>(info) {

package/src/database.cpp

@@ -11,7 +11,7 @@ Napi::Object Database::Init(Napi::Env env, Napi::Object exports) {
 
 	Napi::Function t = DefineClass(
 	    env, "Database",
-	    {InstanceMethod("close", &Database::Close), InstanceMethod("wait", &Database::Wait),
+	    {InstanceMethod("close_internal", &Database::Close), InstanceMethod("wait", &Database::Wait),
 	     InstanceMethod("serialize", &Database::Serialize), InstanceMethod("parallelize", &Database::Parallelize),
 	     InstanceMethod("connect", &Database::Connect), InstanceMethod("interrupt", &Database::Interrupt)});
 

package/src/duckdb.cpp

@@ -141850,7 +141850,7 @@ private:
 
 	bool full_plan_found;
 	bool must_update_full_plan;
-	unordered_set<JoinNode *> join_nodes_in_full_plan;
+	unordered_set<std::string> join_nodes_in_full_plan;
 
 	//! Extract the bindings referred to by an Expression
 	bool ExtractBindings(Expression &expression, unordered_set<idx_t> &bindings);
@@ -142161,6 +142161,8 @@ double CardinalityEstimator::EstimateCardinalityWithSet(JoinRelationSet *new_set
 		}
 	}
 	double denom = 1;
+	// TODO: It's possible cross-products were added and are not present in the filters in the relation_2_tdom
+	//       structures. When that's the case, multiply the denom structures that have no intersection
 	for (auto &match : subgraphs) {
 		// It's possible that in production, one of the D_ASSERTS above will fail and not all subgraphs
 		// were connected. When this happens, just use the largest denominator of all the subgraphs.
@@ -145960,7 +145962,7 @@ void JoinOrderOptimizer::UpdateJoinNodesInFullPlan(JoinNode *node) {
 		join_nodes_in_full_plan.clear();
 	}
 	if (node->set->count < relations.size()) {
-		join_nodes_in_full_plan.insert(node);
+		join_nodes_in_full_plan.insert(node->set->ToString());
 	}
 	UpdateJoinNodesInFullPlan(node->left);
 	UpdateJoinNodesInFullPlan(node->right);
@@ -145984,8 +145986,8 @@ JoinNode *JoinOrderOptimizer::EmitPair(JoinRelationSet *left, JoinRelationSet *r
 		if (entry != plans.end()) {
 			cardinality_estimator.VerifySymmetry(result, entry->second.get());
 		}
-
-		if (full_plan_found && join_nodes_in_full_plan.count(new_plan.get()) > 0) {
+		if (full_plan_found &&
+		    join_nodes_in_full_plan.find(new_plan->set->ToString()) != join_nodes_in_full_plan.end()) {
 			must_update_full_plan = true;
 		}
 		if (new_set->count == relations.size()) {

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 "3e96547f7"
-#define DUCKDB_VERSION "v0.4.1-dev2358"
+#define DUCKDB_SOURCE_ID "3825e0ee7"
+#define DUCKDB_VERSION "v0.4.1-dev2371"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //