fix(core): prevent authorization error immediately after table created via ILP

glasstiger · glasstiger · commit e6792e26fcb9 · 2025-10-30T23:00:58.000Z
diff --git a/core/src/main/java/io/questdb/cairo/CairoEngine.java b/core/src/main/java/io/questdb/cairo/CairoEngine.java
@@ -512,8 +512,7 @@ public void configureThreadLocalReaderPoolSupervisor(@NotNull ResourcePoolSuperv
             boolean inVolume
     ) {
         securityContext.authorizeMatViewCreate();
-        final TableToken matViewToken = createTableOrMatViewUnsecure(mem, blockFileWriter, path, ifNotExists, struct, keepLock, inVolume);
-        getDdlListener(matViewToken).onTableOrMatViewCreated(securityContext, matViewToken, TableUtils.TABLE_KIND_REGULAR_TABLE);
+        final TableToken matViewToken = createTableOrMatViewUnsecure(securityContext, mem, blockFileWriter, path, ifNotExists, struct, keepLock, inVolume, TableUtils.TABLE_KIND_REGULAR_TABLE);
         final MatViewDefinition matViewDefinition = struct.getMatViewDefinition();
         try {
             if (matViewGraph.addView(matViewDefinition)) {
@@ -569,9 +568,7 @@ public void configureThreadLocalReaderPoolSupervisor(@NotNull ResourcePoolSuperv
                     .put(']');
         }
         securityContext.authorizeTableCreate(tableKind);
-        final TableToken tableToken = createTableOrMatViewUnsecure(mem, null, path, ifNotExists, struct, keepLock, inVolume);
-        getDdlListener(tableToken).onTableOrMatViewCreated(securityContext, tableToken, tableKind);
-        return tableToken;
+        return createTableOrMatViewUnsecure(securityContext, mem, null, path, ifNotExists, struct, keepLock, inVolume, tableKind);
     }
 
     // The reader will ignore close() calls until attached back.
@@ -1659,13 +1656,15 @@ private void createTableOrMatViewUnsafe(MemoryMARW mem, @Nullable BlockFileWrite
     }
 
     private @NotNull TableToken createTableOrMatViewUnsecure(
+            SecurityContext securityContext,
             MemoryMARW mem,
             @Nullable BlockFileWriter blockFileWriter,
             Path path,
             boolean ifNotExists,
             TableStructure struct,
             boolean keepLock,
-            boolean inVolume
+            boolean inVolume,
+            int tableKind
     ) {
         assert !struct.isWalEnabled() || PartitionBy.isPartitioned(struct.getPartitionBy()) : "WAL is only supported for partitioned tables";
         final CharSequence tableName = struct.getTableName();
@@ -1713,6 +1712,7 @@ private void createTableOrMatViewUnsafe(MemoryMARW mem, @Nullable BlockFileWrite
                             locked = false;
                             LOG.info().$("unlocked [table=").$(tableToken).$("]").$();
                         }
+                        getDdlListener(tableToken).onTableOrMatViewCreated(securityContext, tableToken, tableKind);
                         tableNameRegistry.registerName(tableToken);
                     } catch (Throwable e) {
                         keepLock = false;
diff --git a/core/src/test/java/io/questdb/test/cutlass/http/line/LineHttpSenderTest.java b/core/src/test/java/io/questdb/test/cutlass/http/line/LineHttpSenderTest.java
@@ -29,8 +29,10 @@
 import io.questdb.ServerMain;
 import io.questdb.cairo.CairoEngine;
 import io.questdb.cairo.ColumnType;
+import io.questdb.cairo.DefaultDdlListener;
 import io.questdb.cairo.MicrosTimestampDriver;
 import io.questdb.cairo.NanosTimestampDriver;
+import io.questdb.cairo.SecurityContext;
 import io.questdb.cairo.TableToken;
 import io.questdb.cairo.sql.TableMetadata;
 import io.questdb.client.Sender;
@@ -62,6 +64,7 @@
 import java.lang.reflect.Array;
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import static io.questdb.PropertyKey.DEBUG_FORCE_RECV_FRAGMENTATION_CHUNK_SIZE;
 import static io.questdb.PropertyKey.LINE_HTTP_ENABLED;
@@ -874,6 +877,50 @@ public void testCreateTimestampColumnsWithDesignatedNanosV2() throws Exception {
                 "1.111\t2025-11-19T10:55:24.123456789Z\t2025-11-19T10:55:24.123456Z\t2025-11-19T10:55:24.123000Z\t2025-11-19T10:55:24.123456799Z\t2025-11-20T10:55:24.123456789Z");
     }
 
+    @Test
+    public void testDdlListenerOnTableCreated() throws Exception {
+        TestUtils.assertMemoryLeak(() -> {
+            try (final TestServerMain questdb = startWithEnvVariables()) {
+                final AtomicBoolean failed = new AtomicBoolean();
+                final CairoEngine engine = questdb.getEngine();
+                engine.setDdlListener(new DefaultDdlListener() {
+                    @Override
+                    public void onTableOrMatViewCreated(SecurityContext securityContext, TableToken tableToken, int tableKind) {
+                        try {
+                            // assert that this is the expected table name and id
+                            final int tableId = (int) engine.getTableIdGenerator().getCurrentId();
+                            Assert.assertEquals("tab", tableToken.getTableName());
+                            Assert.assertEquals(tableId, tableToken.getTableId());
+
+                            // assert that the table is not available to others for reading yet
+                            Assert.assertNull(engine.getTableTokenIfExists("tab"));
+
+                            // assert that others competing to create the same table, cannot lock the table name 
+                            Assert.assertNull(engine.lockTableName("tab", tableId, false, true));
+                        } catch (Throwable th) {
+                            th.printStackTrace(System.out);
+                            failed.set(true);
+                        }
+                    }
+                });
+
+                try (Sender sender = Sender.builder(Sender.Transport.HTTP)
+                        .address("localhost:" + questdb.getHttpServerPort())
+                        .build()
+                ) {
+                    sender.table("tab").longColumn("col", 1).atNow();
+                } catch (Throwable e) {
+                    e.printStackTrace(System.out);
+                    Assert.fail("Failed to ingest data, check log for exception");
+                }
+
+                if (failed.get()) {
+                    Assert.fail("Failed in DDL listener, check log for exception");
+                }
+            }
+        });
+    }
+
     @Test
     public void testEmptyArraysMultiDimensional() throws Exception {
         TestUtils.assertMemoryLeak(() -> {
