duckdb 0.7.2-dev1734.0 → 0.7.2-dev1867.0

package/src/duckdb/src/storage/buffer/buffer_pool.cpp

@@ -50,6 +50,10 @@ void BufferPool::AddToEvictionQueue(shared_ptr<BlockHandle> &handle) {
 	queue->q.enqueue(BufferEvictionNode(weak_ptr<BlockHandle>(handle), handle->eviction_timestamp));
 }
 
+void BufferPool::IncreaseUsedMemory(idx_t size) {
+	current_memory += size;
+}
+
 idx_t BufferPool::GetUsedMemory() {
 	return current_memory;
 }
@@ -60,12 +64,12 @@ idx_t BufferPool::GetMaxMemory() {
 BufferPool::EvictionResult BufferPool::EvictBlocks(idx_t extra_memory, idx_t memory_limit,
                                                    unique_ptr<FileBuffer> *buffer) {
 	BufferEvictionNode node;
-	TempBufferPoolReservation r(current_memory, extra_memory);
+	TempBufferPoolReservation r(*this, extra_memory);
 	while (current_memory > memory_limit) {
 		// get a block to unpin from the queue
 		if (!queue->q.try_dequeue(node)) {
 			// Failed to reserve. Adjust size of temp reservation to 0.
-			r.Resize(current_memory, 0);
+			r.Resize(0);
 			return {false, std::move(r)};
 		}
 		// get a reference to the underlying block pointer

package/src/duckdb/src/storage/buffer/buffer_pool_reservation.cpp

@@ -1,8 +1,12 @@
 #include "duckdb/storage/buffer/block_handle.hpp"
+#include "duckdb/storage/buffer/buffer_pool.hpp"
 
 namespace duckdb {
 
-BufferPoolReservation::BufferPoolReservation(BufferPoolReservation &&src) noexcept {
+BufferPoolReservation::BufferPoolReservation(BufferPool &pool) : pool(pool) {
+}
+
+BufferPoolReservation::BufferPoolReservation(BufferPoolReservation &&src) noexcept : pool(src.pool) {
 	size = src.size;
 	src.size = 0;
 }
@@ -17,10 +21,9 @@ BufferPoolReservation::~BufferPoolReservation() {
 	D_ASSERT(size == 0);
 }
 
-void BufferPoolReservation::Resize(atomic<idx_t> &counter, idx_t new_size) {
+void BufferPoolReservation::Resize(idx_t new_size) {
 	int64_t delta = (int64_t)new_size - size;
-	D_ASSERT(delta > 0 || (int64_t)counter >= -delta);
-	counter += delta;
+	pool.IncreaseUsedMemory(delta);
 	size = new_size;
 }