feat(core): release disk space faster on table drop

ideoma · ideoma · commit 7cd6f0bdc16b · 2025-12-18T12:43:07.000Z
diff --git a/core/src/main/java/io/questdb/cairo/CairoEngine.java b/core/src/main/java/io/questdb/cairo/CairoEngine.java
@@ -1194,6 +1194,8 @@ public TableToken lockTableName(CharSequence tableName, String dirName, int tabl
 
     public boolean notifyDropped(TableToken tableToken) {
         if (tableNameRegistry.dropTable(tableToken)) {
+            readerPool.notifyDropped(tableToken);
+            walWriterPool.notifyDropped(tableToken);
             final MatViewRefreshTask matViewRefreshTask = tlMatViewRefreshTask.get();
             matViewRefreshTask.clear();
             matViewRefreshTask.baseTableToken = tableToken;
diff --git a/core/src/main/java/io/questdb/cairo/pool/AbstractMultiTenantPool.java b/core/src/main/java/io/questdb/cairo/pool/AbstractMultiTenantPool.java
@@ -159,6 +159,21 @@ public boolean lock(TableToken tableToken) {
         return true;
     }
 
+    public void notifyDropped(TableToken token) {
+        Entry<T> e = entries.get(token.getDirName());
+        long thread = Thread.currentThread().getId();
+        while (e != null) {
+            for (int i = 0; i < ENTRY_SIZE; i++) {
+                if (Unsafe.cas(e.allocations, i, UNALLOCATED, thread)) {
+                    // check if deadline violation still holds
+                    closeTenant(thread, e, i, PoolListener.EV_EXPIRE, PoolConstants.CR_IDLE);
+                    Unsafe.arrayPutOrdered(e.allocations, i, UNALLOCATED);
+                }
+            }
+            e = e.next;
+        }
+    }
+
     public void removeThreadLocalPoolSupervisor() {
         this.threadLocalPoolSupervisor.remove();
     }
diff --git a/core/src/main/java/io/questdb/cairo/pool/PoolConstants.java b/core/src/main/java/io/questdb/cairo/pool/PoolConstants.java
@@ -26,25 +26,21 @@
 
 public final class PoolConstants {
     public static final int CR_DISTRESSED = 5;
+    public static final int CR_DROPPED = 6;
     public static final int CR_IDLE = 3;
     public static final int CR_NAME_LOCK = 2;
     public static final int CR_POOL_CLOSE = 1;
     public static final int CR_REOPEN = 4;
 
     public static String closeReasonText(int reason) {
-        switch (reason) {
-            case CR_POOL_CLOSE:
-                return "POOL_CLOSED";
-            case CR_NAME_LOCK:
-                return "LOCKED";
-            case CR_IDLE:
-                return "IDLE";
-            case CR_REOPEN:
-                return "REOPEN";
-            case CR_DISTRESSED:
-                return "DISTRESSED";
-            default:
-                return "UNKNOWN";
-        }
+        return switch (reason) {
+            case CR_POOL_CLOSE -> "POOL_CLOSED";
+            case CR_NAME_LOCK -> "LOCKED";
+            case CR_IDLE -> "IDLE";
+            case CR_REOPEN -> "REOPEN";
+            case CR_DISTRESSED -> "DISTRESSED";
+            case CR_DROPPED -> "DROPPED";
+            default -> "UNKNOWN";
+        };
     }
 }
