[SQL] Better handling of DROP TABLE (only used in SLT tests)

mihaibudiu · mihaibudiu · commit d50665296a72 · 2026-03-08T02:42:11.000Z
Signed-off-by: Mihai Budiu &lt;mbudiu@feldera.com&gt;
diff --git a/sql-to-dbsp-compiler/SQL-compiler/src/main/java/org/dbsp/sqlCompiler/compiler/frontend/CalciteToDBSPCompiler.java b/sql-to-dbsp-compiler/SQL-compiler/src/main/java/org/dbsp/sqlCompiler/compiler/frontend/CalciteToDBSPCompiler.java
@@ -3205,6 +3205,19 @@ DBSPNode compileCreateType(CreateTypeStatement stat) {
         return null;
     }
 
+    @SuppressWarnings("UnusedReturnValue")
+    @Nullable
+    DBSPNode compileDropTable(DropTableStatement drop) {
+        ProgramIdentifier tableName = drop.tableName;
+        this.metadata.removeTable(tableName);
+        DBSPCircuit circuit = this.getCircuit();
+        IInputOperator input = circuit.getInput(tableName);
+        Objects.requireNonNull(input);
+        circuit.allOperators.remove(input.asOperator());
+        circuit.sourceOperators.remove(tableName);
+        return null;
+    }
+
     @Nullable
     DBSPNode compileCreateTable(CreateTableStatement create) {
         ProgramIdentifier tableName = create.relationName;
@@ -3395,6 +3408,9 @@ public DBSPNode compile(RelStatement statement) {
             if (create != null) {
                 // We create an input for the circuit.
                 return this.compileCreateTable(create);
+            } else {
+                DropTableStatement drop = statement.as(DropTableStatement.class);
+                this.compileDropTable(drop);
             }
             return null;
         } else if (statement.is(TableModifyStatement.class)) {
diff --git a/sql-to-dbsp-compiler/SQL-compiler/src/main/java/org/dbsp/sqlCompiler/compiler/frontend/calciteCompiler/Catalog.java b/sql-to-dbsp-compiler/SQL-compiler/src/main/java/org/dbsp/sqlCompiler/compiler/frontend/calciteCompiler/Catalog.java
@@ -100,6 +100,7 @@ protected Multimap<String, Function> getFunctionMultimap() {
 
     public void dropTable(ProgramIdentifier tableName) {
         this.tableMap.remove(tableName.name());
+        this.definition.remove(tableName.name());
     }
 
     public boolean addType(ProgramIdentifier name, IErrorReporter reporter, RelStatement statement) {

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,7 @@ protected Multimap<String, Function> getFunctionMultimap() {`
`100`	`100`
`101`	`101`	`public void dropTable(ProgramIdentifier tableName) {`
`102`	`102`	`this.tableMap.remove(tableName.name());`
	`103`	`+ this.definition.remove(tableName.name());`
`103`	`104`	`}`
`104`	`105`
`105`	`106`	`public boolean addType(ProgramIdentifier name, IErrorReporter reporter, RelStatement statement) {`