duckdb 0.3.5-dev602.0 → 0.3.5-dev609.0

package/package.json

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

package/src/duckdb.cpp

@@ -4681,6 +4681,7 @@ CatalogEntry *CatalogSet::CreateEntryInternal(ClientContext &context, unique_ptr
 	auto entry_index = current_entry++;
 	auto catalog_entry = entry.get();
 
+	entry->set = this;
 	entry->timestamp = 0;
 
 	PutMapping(context, name, entry_index);
@@ -5376,6 +5377,9 @@ void DependencyManager::AddObject(ClientContext &context, CatalogEntry *object,
 	for (auto &dependency : dependencies) {
 		idx_t entry_index;
 		CatalogEntry *catalog_entry;
+		if (!dependency->set) {
+			throw InternalException("Dependency has no set");
+		}
 		if (!dependency->set->GetEntryInternal(context, dependency->name, entry_index, catalog_entry)) {
 			throw InternalException("Dependency has already been deleted?");
 		}
@@ -175454,8 +175458,20 @@ void FixedSizeScanPartial(ColumnSegment &segment, ColumnScanState &state, idx_t
 
 template <class T>
 void FixedSizeScan(ColumnSegment &segment, ColumnScanState &state, idx_t scan_count, Vector &result) {
-	// FIXME: we should be able to do a zero-copy here
-	FixedSizeScanPartial<T>(segment, state, scan_count, result, 0);
+	auto &scan_state = (FixedSizeScanState &)*state.scan_state;
+	auto start = segment.GetRelativeIndex(state.row_index);
+
+	auto data = scan_state.handle->node->buffer + segment.GetBlockOffset();
+	auto source_data = data + start * sizeof(T);
+
+	result.SetVectorType(VectorType::FLAT_VECTOR);
+	if (std::is_same<T, list_entry_t>()) {
+		// list columns are modified in-place during the scans to correct the offsets
+		// so we can't do a zero-copy there
+		memcpy(FlatVector::GetData(result), source_data, scan_count * sizeof(T));
+	} else {
+		FlatVector::SetData(result, source_data);
+	}
 }
 
 //===--------------------------------------------------------------------===//
@@ -182865,6 +182881,7 @@ idx_t ListColumnData::ScanCount(ColumnScanState &state, Vector &result, idx_t co
 	D_ASSERT(!updates);
 
 	idx_t scan_count = ScanVector(state, result, count);
+	D_ASSERT(scan_count > 0);
 	validity.ScanCount(state.child_states[0], result, count);
 
 	auto data = FlatVector::GetData<list_entry_t>(result);

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 "ee6a6986d"
-#define DUCKDB_VERSION "v0.3.5-dev602"
+#define DUCKDB_SOURCE_ID "256c1992f"
+#define DUCKDB_VERSION "v0.3.5-dev609"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //