duckdb 0.5.2-dev756.0 → 0.5.2-dev764.0

package/package.json

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

package/src/duckdb.cpp

@@ -58333,6 +58333,7 @@ ART::ART(const vector<column_t> &column_ids, TableIOManager &table_io_manager,
 	} else {
 		tree = nullptr;
 	}
+	serialized_data_pointer = BlockPointer(block_id, block_offset);
 	for (idx_t i = 0; i < types.size(); i++) {
 		switch (types[i]) {
 		case PhysicalType::BOOL:
@@ -59218,9 +59219,11 @@ void ART::VerifyExistence(DataChunk &chunk, VerifyExistenceType verify_type, str
 BlockPointer ART::Serialize(duckdb::MetaBlockWriter &writer) {
 	lock_guard<mutex> l(lock);
 	if (tree) {
-		return tree->Serialize(*this, writer);
+		serialized_data_pointer = tree->Serialize(*this, writer);
+	} else {
+		serialized_data_pointer = {(block_id_t)DConstants::INVALID_INDEX, (uint32_t)DConstants::INVALID_INDEX};
 	}
-	return {(block_id_t)DConstants::INVALID_INDEX, (uint32_t)DConstants::INVALID_INDEX};
+	return serialized_data_pointer;
 }
 
 //===--------------------------------------------------------------------===//
@@ -194604,7 +194607,6 @@ public:
 
 	virtual MetaBlockWriter &GetMetaBlockWriter() = 0;
 	virtual unique_ptr<TableDataWriter> GetTableDataWriter(TableCatalogEntry &table) = 0;
-	virtual BlockPointer WriteIndexData(IndexCatalogEntry &index_catalog) = 0;
 
 protected:
 	virtual void WriteSchema(SchemaCatalogEntry &schema);
@@ -194666,7 +194668,6 @@ public:
 
 	virtual MetaBlockWriter &GetMetaBlockWriter() override;
 	virtual unique_ptr<TableDataWriter> GetTableDataWriter(TableCatalogEntry &table) override;
-	virtual BlockPointer WriteIndexData(IndexCatalogEntry &index_catalog) override;
 
 	BlockManager &GetBlockManager();
 
@@ -195170,10 +195171,6 @@ BlockManager &SingleFileCheckpointWriter::GetBlockManager() {
 	return *storage_manager.block_manager;
 }
 
-BlockPointer SingleFileCheckpointWriter::WriteIndexData(IndexCatalogEntry &index_catalog) {
-	return index_catalog.index->Serialize(*table_metadata_writer);
-}
-
 MetaBlockWriter &SingleFileCheckpointWriter::GetMetaBlockWriter() {
 	return *metadata_writer;
 }
@@ -195459,9 +195456,9 @@ void CheckpointReader::ReadSequence(ClientContext &context, MetaBlockReader &rea
 // Indexes
 //===--------------------------------------------------------------------===//
 void CheckpointWriter::WriteIndex(IndexCatalogEntry &index_catalog) {
-	// Write the index data and metadata
-	// Serialize the necessary meta data for index catalog construction.
-	auto root_offset = WriteIndexData(index_catalog);
+	// The index data should already have been written as part of WriteTableData.
+	// Here, we need only serialize the pointer to that data.
+	auto root_offset = index_catalog.index->GetSerializedDataPointer();
 	auto &metadata_writer = GetMetaBlockWriter();
 	index_catalog.Serialize(metadata_writer);
 	// Serialize the Block id and offset of root node

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 "1e7f9641b"
-#define DUCKDB_VERSION "v0.5.2-dev756"
+#define DUCKDB_SOURCE_ID "308569431"
+#define DUCKDB_VERSION "v0.5.2-dev764"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -20613,12 +20613,20 @@ public:
 	//! Serializes the index and returns the pair of block_id offset positions
 	virtual BlockPointer Serialize(duckdb::MetaBlockWriter &writer);
 
+	//! Returns block/offset of where index was most recently serialized.
+	BlockPointer GetSerializedDataPointer() const {
+		return serialized_data_pointer;
+	}
+
 protected:
 	void ExecuteExpressions(DataChunk &input, DataChunk &result);
 
 	//! Lock used for updating the index
 	mutex lock;
 
+	//! Pointer to most recently checkpointed index data.
+	BlockPointer serialized_data_pointer;
+
 private:
 	//! Bound expressions used by the index
 	vector<unique_ptr<Expression>> bound_expressions;