duckdb 0.5.2-dev1940.0 → 0.5.2-dev1945.0

package/package.json

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

package/src/duckdb.cpp

@@ -81806,10 +81806,10 @@ public:
 		if (!current_collection) {
 			return;
 		}
-		if (!written_to_disk || current_collection->GetTotalRows() < LocalStorage::MERGE_THRESHOLD) {
+		if (!written_to_disk && current_collection->GetTotalRows() < LocalStorage::MERGE_THRESHOLD) {
 			return;
 		}
-		writer->FlushToDisk(*current_collection);
+		writer->FlushToDisk(*current_collection, true);
 	}
 
 	void CreateNewCollection(TableCatalogEntry *table, const vector<LogicalType> &insert_types) {
@@ -81858,7 +81858,6 @@ SinkResultType PhysicalBatchInsert::Sink(ExecutionContext &context, GlobalSinkSt
 		TransactionData tdata(0, 0);
 		lstate.current_collection->FinalizeAppend(tdata, lstate.current_append_state);
 		lstate.FlushToDisk();
-
 		gstate.AddCollection(context.client, lstate.current_index, move(lstate.current_collection), lstate.writer,
 		                     &lstate.written_to_disk);
 		lstate.CreateNewCollection(table, insert_types);
@@ -212337,11 +212336,10 @@ OptimisticDataWriter::OptimisticDataWriter(DataTable *table, OptimisticDataWrite
 OptimisticDataWriter::~OptimisticDataWriter() {
 }
 
-void OptimisticDataWriter::CheckFlushToDisk(RowGroupCollection &row_groups) {
-	// we finished writing a complete row group
-	// check if we should pre-emptively write it to disk
+bool OptimisticDataWriter::PrepareWrite() {
+	// check if we should pre-emptively write the table to disk
 	if (table->info->IsTemporary() || StorageManager::GetStorageManager(table->db).InMemory()) {
-		return;
+		return false;
 	}
 	// we should! write the second-to-last row group to disk
 	// allocate the partial block-manager if none is allocated yet
@@ -212349,6 +212347,14 @@ void OptimisticDataWriter::CheckFlushToDisk(RowGroupCollection &row_groups) {
 		auto &block_manager = table->info->table_io_manager->GetBlockManagerForRowData();
 		partial_manager = make_unique<PartialBlockManager>(block_manager);
 	}
+	return true;
+}
+
+void OptimisticDataWriter::CheckFlushToDisk(RowGroupCollection &row_groups) {
+	// we finished writing a complete row group
+	if (!PrepareWrite()) {
+		return;
+	}
 	// flush second-to-last row group
 	auto row_group = row_groups.GetRowGroup(-2);
 	FlushToDisk(row_group);
@@ -212371,10 +212377,15 @@ void OptimisticDataWriter::FlushToDisk(RowGroup *row_group) {
 	}
 }
 
-void OptimisticDataWriter::FlushToDisk(RowGroupCollection &row_groups) {
+void OptimisticDataWriter::FlushToDisk(RowGroupCollection &row_groups, bool force) {
 	if (!partial_manager) {
-		// no partial manager - nothing to flush
-		return;
+		if (!force) {
+			// no partial manager - nothing to flush
+			return;
+		}
+		if (!PrepareWrite()) {
+			return;
+		}
 	}
 	// flush the last row group
 	FlushToDisk(row_groups.GetRowGroup(-1));

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 "321b5fb2a1"
-#define DUCKDB_VERSION "v0.5.2-dev1940"
+#define DUCKDB_SOURCE_ID "be1bd1704f"
+#define DUCKDB_VERSION "v0.5.2-dev1945"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -26539,12 +26539,16 @@ public:
 	//! Flushes a specific row group to disk
 	void FlushToDisk(RowGroup *row_group);
 	//! Flushes the final row group to disk (if any)
-	void FlushToDisk(RowGroupCollection &row_groups);
+	void FlushToDisk(RowGroupCollection &row_groups, bool force = false);
 	//! Final flush: flush the partial block manager to disk
 	void FinalFlush();
 
 	void Rollback();
 
+private:
+	//! Prepare a write to disk
+	bool PrepareWrite();
+
 private:
 	//! The table
 	DataTable *table;