vendor: Update vendored sources to duckdb/duckdb@fb5dba5

Fix issue with `ExternalFileCache` when data is evicted (duckdb/duckdb#17567)

Author: krlmlr

src/duckdb/extension/parquet/include/thrift_tools.hpp

@@ -119,6 +119,7 @@ struct ReadAheadBuffer {
 				throw std::runtime_error("Prefetch registered requested for bytes outside file");
 			}
 			read_head.buffer_handle = file_handle.Read(read_head.buffer_ptr, read_head.size, read_head.location);
+			D_ASSERT(read_head.buffer_handle.IsValid());
 			read_head.data_isset = true;
 		}
 	}
@@ -141,8 +142,10 @@ class ThriftFileTransport : public duckdb_apache::thrift::transport::TVirtualTra
 			if (!prefetch_buffer->data_isset) {
 				prefetch_buffer->buffer_handle =
 				    file_handle.Read(prefetch_buffer->buffer_ptr, prefetch_buffer->size, prefetch_buffer->location);
+				D_ASSERT(prefetch_buffer->buffer_handle.IsValid());
 				prefetch_buffer->data_isset = true;
 			}
+			D_ASSERT(prefetch_buffer->buffer_handle.IsValid());
 			memcpy(buf, prefetch_buffer->buffer_ptr + location - prefetch_buffer->location, len);
 		} else if (prefetch_mode && len < PREFETCH_FALLBACK_BUFFERSIZE && len > 0) {
 			Prefetch(location, MinValue<uint64_t>(PREFETCH_FALLBACK_BUFFERSIZE, file_handle.GetFileSize() - location));

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

@@ -1,5 +1,5 @@
 #ifndef DUCKDB_PATCH_VERSION
-#define DUCKDB_PATCH_VERSION "0-dev3669"
+#define DUCKDB_PATCH_VERSION "0-dev3672"
 #endif
 #ifndef DUCKDB_MINOR_VERSION
 #define DUCKDB_MINOR_VERSION 3
@@ -8,10 +8,10 @@
 #define DUCKDB_MAJOR_VERSION 1
 #endif
 #ifndef DUCKDB_VERSION
-#define DUCKDB_VERSION "v1.3.0-dev3669"
+#define DUCKDB_VERSION "v1.3.0-dev3672"
 #endif
 #ifndef DUCKDB_SOURCE_ID
-#define DUCKDB_SOURCE_ID "4e57d13663"
+#define DUCKDB_SOURCE_ID "fb5dba52ab"
 #endif
 #include "duckdb/function/table/system_functions.hpp"
 #include "duckdb/main/database.hpp"

src/duckdb/src/storage/caching_file_system.cpp

@@ -236,7 +236,7 @@ BufferHandle CachingFileHandle::TryReadFromCache(data_ptr_t &buffer, idx_t nr_by
 	if (it != ranges.begin()) {
 		--it;
 	}
-	for (it = ranges.begin(); it != ranges.end();) {
+	while (it != ranges.end()) {
 		if (it->second->location >= this_end) {
 			// We're past the requested location
 			break;
@@ -285,12 +285,16 @@ BufferHandle CachingFileHandle::TryInsertFileRange(BufferHandle &pin, data_ptr_t
 	auto &ranges = cached_file.Ranges(guard);
 
 	// Start at lower_bound (first range with location not less than location of newly created range)
-	for (auto it = ranges.lower_bound(location); it != ranges.end();) {
+	auto it = ranges.lower_bound(location);
+	if (it != ranges.begin()) {
+		--it;
+	}
+	while (it != ranges.end()) {
 		if (it->second->GetOverlap(*new_file_range) == CachedFileRangeOverlap::FULL) {
 			// Another thread has read a range that fully contains the requested range in the meantime
-			pin = TryReadFromFileRange(guard, *it->second, buffer, nr_bytes, location);
-			if (pin.IsValid()) {
-				return std::move(pin);
+			auto other_pin = TryReadFromFileRange(guard, *it->second, buffer, nr_bytes, location);
+			if (other_pin.IsValid()) {
+				return other_pin;
 			}
 			it = ranges.erase(it);
 			continue;
@@ -314,8 +318,10 @@ BufferHandle CachingFileHandle::TryInsertFileRange(BufferHandle &pin, data_ptr_t
 		if (break_loop) {
 			break;
 		}
+
 		++it;
 	}
+	D_ASSERT(pin.IsValid());
 
 	// Finally, insert newly created buffer into the map
 	new_file_range->AddCheckSum();

src/duckdb/src/storage/external_file_cache.cpp

@@ -50,6 +50,9 @@ void ExternalFileCache::CachedFileRange::VerifyCheckSum() {
 		return;
 	}
 	auto buffer_handle = block_handle->block_manager.buffer_manager.Pin(block_handle);
+	if (!buffer_handle.IsValid()) {
+		return;
+	}
 	D_ASSERT(checksum == Checksum(buffer_handle.Ptr(), nr_bytes));
 #endif
 }
@@ -61,7 +64,7 @@ void ExternalFileCache::CachedFile::Verify(const unique_ptr<StorageLockKey> &gua
 #ifdef DEBUG
 	for (const auto &range1 : ranges) {
 		for (const auto &range2 : ranges) {
-			if (range1 == range2) {
+			if (range1.first == range2.first) {
 				continue;
 			}
 			D_ASSERT(range1.second->GetOverlap(*range2.second) != CachedFileRangeOverlap::FULL);