duckdb 0.3.3-dev891.0 → 0.3.3-dev931.0

package/package.json

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

package/src/duckdb.cpp

@@ -53208,7 +53208,7 @@ private:
 };
 
 template <typename T, typename OP>
-struct OperationCompare : public std::binary_function<T, T, bool> {
+struct OperationCompare : public std::function<bool(T, T)> {
 	inline bool operator()(const T &lhs, const T &val) const {
 		return OP::template Operation(lhs, val);
 	}
@@ -104974,21 +104974,26 @@ public:
 
 	void AddConnection(ClientContext &context) {
 		lock_guard<mutex> lock(connections_lock);
-		connections.push_back(weak_ptr<ClientContext>(context.shared_from_this()));
+		connections.insert(make_pair(&context, weak_ptr<ClientContext>(context.shared_from_this())));
+	}
+
+	void RemoveConnection(ClientContext &context) {
+		lock_guard<mutex> lock(connections_lock);
+		connections.erase(&context);
 	}
 
 	vector<shared_ptr<ClientContext>> GetConnectionList() {
 		vector<shared_ptr<ClientContext>> result;
-		for (size_t i = 0; i < connections.size(); i++) {
-			auto connection = connections[i].lock();
+		for (auto &it : connections) {
+			auto connection = it.second.lock();
 			if (!connection) {
-				connections.erase(connections.begin() + i);
-				i--;
+				connections.erase(it.first);
 				continue;
 			} else {
 				result.push_back(move(connection));
 			}
 		}
+
 		return result;
 	}
 
@@ -104997,7 +105002,7 @@ public:
 
 public:
 	mutex connections_lock;
-	vector<weak_ptr<ClientContext>> connections;
+	unordered_map<ClientContext *, weak_ptr<ClientContext>> connections;
 };
 
 } // namespace duckdb
@@ -105016,6 +105021,10 @@ Connection::Connection(DatabaseInstance &database) : context(make_shared<ClientC
 Connection::Connection(DuckDB &database) : Connection(*database.instance) {
 }
 
+Connection::~Connection() {
+	ConnectionManager::Get(*context->db).RemoveConnection(*context);
+}
+
 string Connection::GetProfilingInformation(ProfilerPrintFormat format) {
 	auto &profiler = QueryProfiler::Get(*context);
 	if (format == ProfilerPrintFormat::JSON) {
@@ -120984,6 +120993,8 @@ private:
 	unique_ptr<LogicalOperator> PushdownSetOperation(unique_ptr<LogicalOperator> op);
 	//! Push down a LogicalGet op
 	unique_ptr<LogicalOperator> PushdownGet(unique_ptr<LogicalOperator> op);
+	//! Push down a LogicalLimit op
+	unique_ptr<LogicalOperator> PushdownLimit(unique_ptr<LogicalOperator> op);
 	// Pushdown an inner join
 	unique_ptr<LogicalOperator> PushdownInnerJoin(unique_ptr<LogicalOperator> op, unordered_set<idx_t> &left_bindings,
 	                                              unordered_set<idx_t> &right_bindings);
@@ -121049,6 +121060,8 @@ unique_ptr<LogicalOperator> FilterPushdown::Rewrite(unique_ptr<LogicalOperator>
 	}
 	case LogicalOperatorType::LOGICAL_GET:
 		return PushdownGet(move(op));
+	case LogicalOperatorType::LOGICAL_LIMIT:
+		return PushdownLimit(move(op));
 	default:
 		return FinishPushdown(move(op));
 	}
@@ -123979,6 +123992,25 @@ unique_ptr<LogicalOperator> FilterPushdown::PushdownLeftJoin(unique_ptr<LogicalO
 
 
 
+
+
+namespace duckdb {
+
+unique_ptr<LogicalOperator> FilterPushdown::PushdownLimit(unique_ptr<LogicalOperator> op) {
+	auto &limit = (LogicalLimit &)*op;
+
+	if (!limit.limit && limit.limit_val == 0) {
+		return make_unique<LogicalEmptyResult>(move(op));
+	}
+
+	return FinishPushdown(move(op));
+}
+
+} // namespace duckdb
+
+
+
+
 namespace duckdb {
 
 using Filter = FilterPushdown::Filter;

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 "96666e411"
-#define DUCKDB_VERSION "v0.3.3-dev891"
+#define DUCKDB_SOURCE_ID "55bfb5139"
+#define DUCKDB_VERSION "v0.3.3-dev931"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -16647,6 +16647,7 @@ class Connection {
 public:
 	DUCKDB_API explicit Connection(DuckDB &database);
 	DUCKDB_API explicit Connection(DatabaseInstance &database);
+	DUCKDB_API ~Connection();
 
 	shared_ptr<ClientContext> context;
 	warning_callback warning_cb;
@@ -16828,6 +16829,7 @@ private:
 };
 
 } // namespace duckdb
+
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //