create the exception, thrown whenever we try to increase the temp dir…

…ectory size beyond the max
duckdb · Mytherin · Apr 17, 2024 · Mar 1, 2024 · Mar 1, 2024 · Mar 1, 2024
commit 1e441a68212c9fcefce95d2b63d8622e6e9985a5
diff --git a/src/main/config.cpp b/src/main/config.cpp
@@ -94,6 +94,7 @@ static ConfigurationOption internal_options[] = {DUCKDB_GLOBAL(AccessModeSetting
                                                  DUCKDB_LOCAL(IntegerDivisionSetting),
                                                  DUCKDB_LOCAL(MaximumExpressionDepthSetting),
                                                  DUCKDB_GLOBAL(MaximumMemorySetting),
+                                                 DUCKDB_GLOBAL(MaximumTempDirectorySize),
                                                  DUCKDB_GLOBAL(OldImplicitCasting),
                                                  DUCKDB_GLOBAL_ALIAS("memory_limit", MaximumMemorySetting),
                                                  DUCKDB_GLOBAL_ALIAS("null_order", DefaultNullOrderSetting),
@@ -261,9 +262,9 @@ void DBConfig::SetDefaultMaxMemory() {
 
 void DBConfig::SetDefaultMaxSwapSpace() {
 	auto memory_limit = options.maximum_memory;
-	if (!TryMultiplyOperator::Operation(memory_limit, 2, options.maximum_memory)) {
+	if (!TryMultiplyOperator::Operation(memory_limit, static_cast<idx_t>(2), options.maximum_swap_space)) {
 		// Can't default to 2x memory: fall back to 5GB instead
-		options.maximum_memory = ParseMemoryLimit("5GB");
+		options.maximum_swap_space = ParseMemoryLimit("5GB");
 	}
 }
 

diff --git a/src/main/settings/settings.cpp b/src/main/settings/settings.cpp
@@ -953,9 +953,6 @@ Value MaximumMemorySetting::GetSetting(ClientContext &context) {
 //===--------------------------------------------------------------------===//
 void MaximumTempDirectorySize::SetGlobal(DatabaseInstance *db, DBConfig &config, const Value &input) {
 	config.options.maximum_swap_space = DBConfig::ParseMemoryLimit(input.ToString());
-	if (db) {
-		BufferManager::GetBufferManager(*db).SetLimit(config.options.maximum_swap_space);
-	}
 }
 
 void MaximumTempDirectorySize::ResetGlobal(DatabaseInstance *db, DBConfig &config) {

diff --git a/src/storage/temporary_file_manager.cpp b/src/storage/temporary_file_manager.cpp
@@ -259,7 +259,6 @@ TemporaryFileManager::TemporaryFileManager(DatabaseInstance &db, const string &t
 
 TemporaryFileManager::~TemporaryFileManager() {
 	files.clear();
-	D_ASSERT(size_on_disk.load() == 0);
 }
 
 TemporaryFileManager::TemporaryManagerLock::TemporaryManagerLock(mutex &mutex) : lock(mutex) {
@@ -308,7 +307,21 @@ idx_t TemporaryFileManager::GetTotalUsedSpaceInBytes() {
 }
 
 void TemporaryFileManager::IncreaseSizeOnDisk(idx_t bytes) {
+	auto &config = DBConfig::GetConfig(db);
+	auto max_swap_space = config.options.maximum_swap_space;
+
+	auto current_size_on_disk = size_on_disk.load();
 	size_on_disk += bytes;
+	if (size_on_disk.load() > max_swap_space) {
+		auto used = StringUtil::BytesToHumanReadableString(current_size_on_disk);
+		auto max = StringUtil::BytesToHumanReadableString(max_swap_space);
+		auto data_size = StringUtil::BytesToHumanReadableString(bytes);
+		throw OutOfMemoryException(R"(failed to offload data block of size %s (%s/%s used).
+This limit was set by the 'max_temp_directory_size' setting.
+This defaults to twice the size of 'max_memory'.
+You can adjust this setting, by using (for example) PRAGMA max_temp_directory_size='10GiB')",
+		                           data_size, used, max);
+	}
 }
 
 void TemporaryFileManager::DecreaseSizeOnDisk(idx_t bytes) {