duckdb 0.6.2-dev942.0 → 0.6.2-dev960.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "duckdb",
   "main": "./lib/duckdb.js",
   "types": "./lib/duckdb.d.ts",
-  "version": "0.6.2-dev942.0",
+  "version": "0.6.2-dev960.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/duckdb/src/common/types/column_data_allocator.cpp

@@ -28,6 +28,20 @@ ColumnDataAllocator::ColumnDataAllocator(ClientContext &context, ColumnDataAlloc
 	}
 }
 
+ColumnDataAllocator::ColumnDataAllocator(ColumnDataAllocator &other) {
+	type = other.GetType();
+	switch (type) {
+	case ColumnDataAllocatorType::BUFFER_MANAGER_ALLOCATOR:
+		alloc.allocator = other.alloc.allocator;
+		break;
+	case ColumnDataAllocatorType::IN_MEMORY_ALLOCATOR:
+		alloc.buffer_manager = other.alloc.buffer_manager;
+		break;
+	default:
+		throw InternalException("Unrecognized column data allocator type");
+	}
+}
+
 BufferHandle ColumnDataAllocator::Pin(uint32_t block_id) {
 	D_ASSERT(type == ColumnDataAllocatorType::BUFFER_MANAGER_ALLOCATOR);
 	shared_ptr<BlockHandle> handle;

package/src/duckdb/src/common/types/column_data_collection.cpp

@@ -915,6 +915,9 @@ void ColumnDataCollection::Print() const {
 void ColumnDataCollection::Reset() {
 	count = 0;
 	segments.clear();
+
+	// Refreshes the ColumnDataAllocator to prevent holding on to allocated data unnecessarily
+	allocator = make_shared<ColumnDataAllocator>(*allocator);
 }
 
 bool ColumnDataCollection::ResultEquals(const ColumnDataCollection &left, const ColumnDataCollection &right,

package/src/duckdb/src/function/table/version/pragma_version.cpp

@@ -1,8 +1,8 @@
 #ifndef DUCKDB_VERSION
-#define DUCKDB_VERSION "0.6.2-dev942"
+#define DUCKDB_VERSION "0.6.2-dev960"
 #endif
 #ifndef DUCKDB_SOURCE_ID
-#define DUCKDB_SOURCE_ID "2dcdc24556"
+#define DUCKDB_SOURCE_ID "84b9e770f3"
 #endif
 #include "duckdb/function/table/system_functions.hpp"
 #include "duckdb/main/database.hpp"

package/src/duckdb/src/include/duckdb/common/types/column_data_allocator.hpp

@@ -31,6 +31,7 @@ public:
 	ColumnDataAllocator(Allocator &allocator);
 	ColumnDataAllocator(BufferManager &buffer_manager);
 	ColumnDataAllocator(ClientContext &context, ColumnDataAllocatorType allocator_type);
+	ColumnDataAllocator(ColumnDataAllocator &allocator);
 
 	//! Returns an allocator object to allocate with. This returns the allocator in IN_MEMORY_ALLOCATOR, and a buffer
 	//! allocator in case of BUFFER_MANAGER_ALLOCATOR.

package/src/duckdb/third_party/httplib/httplib.hpp

@@ -104,8 +104,10 @@
 #define CPPHTTPLIB_RECV_FLAGS 0
 #endif
 
-#ifndef CPPHTTPLIB_SEND_FLAGS
+#ifndef MSG_NOSIGNAL
 #define CPPHTTPLIB_SEND_FLAGS 0
+#else
+#define CPPHTTPLIB_SEND_FLAGS MSG_NOSIGNAL
 #endif
 
 #ifndef CPPHTTPLIB_LISTEN_BACKLOG