Verify tests do not allocate resources early and do not leave them behind

client/trino-cli/src/test/java/io/trino/cli/TestInsecureQueryRunner.java

@@ -57,6 +57,7 @@ public void teardown()
             throws Exception
     {
         server.close();
+        server = null;
     }
 
     @Test

client/trino-cli/src/test/java/io/trino/cli/TestQueryRunner.java

@@ -67,6 +67,7 @@ public void teardown()
             throws IOException
     {
         server.close();
+        server = null;
     }
 
     @Test

client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcConnection.java

@@ -116,6 +116,7 @@ public void tearDown()
         closeAll(
                 server,
                 executor::shutdownNow);
+        server = null;
     }
 
     @Test

client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcPreparedStatement.java

@@ -107,6 +107,7 @@ public void tearDown()
             throws Exception
     {
         server.close();
+        server = null;
     }
 
     @Test

client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcResultSet.java

@@ -49,6 +49,7 @@ public void tearDownServer()
             throws Exception
     {
         server.close();
+        server = null;
     }
 
     @Override

client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcStatement.java

@@ -75,6 +75,7 @@ public void tearDown()
         closeAll(
                 server,
                 executor::shutdownNow);
+        server = null;
     }
 
     @Test(timeOut = 60_000)

client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcVendorCompatibility.java

@@ -14,10 +14,10 @@
 package io.trino.jdbc;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.io.Closer;
 import io.airlift.log.Logger;
 import io.airlift.log.Logging;
 import io.trino.server.testing.TestingTrinoServer;
+import io.trino.util.AutoCloseableCloser;
 import oracle.jdbc.OracleType;
 import org.testcontainers.containers.OracleContainer;
 import org.testcontainers.containers.PostgreSQLContainer;
@@ -88,16 +88,34 @@ public void setupServer()
         Logging.initialize();
         log = Logger.get(TestJdbcVendorCompatibility.class);
         server = TestingTrinoServer.create();
-        referenceDrivers = ImmutableList.of(new PostgresqlReferenceDriver(), new OracleReferenceDriver());
+
+        // Capture resources as soon as they are allocated. Ensure all allocate resources are cleaned up even if e.g. the last one fails to start.
+        referenceDrivers = new ArrayList<>();
+        referenceDrivers.add(new PostgresqlReferenceDriver());
+        referenceDrivers.add(new OracleReferenceDriver());
     }
 
     @AfterClass(alwaysRun = true)
     public void tearDownServer()
             throws Exception
     {
-        try (Closer closer = Closer.create()) {
-            referenceDrivers.forEach(closer::register);
-            closer.register(server);
+        try (AutoCloseableCloser closer = AutoCloseableCloser.create()) {
+            if (referenceDrivers != null) {
+                referenceDrivers.forEach(closer::register);
+                referenceDrivers.clear();
+            }
+            if (server != null) {
+                closer.register(server);
+                server = null;
+            }
+            if (connection != null) {
+                closer.register(connection);
+                connection = null;
+            }
+            if (statement != null) {
+                closer.register(statement);
+                statement = null;
+            }
         }
     }
 
@@ -116,8 +134,14 @@ public void setUp()
     public void tearDown()
             throws Exception
     {
-        statement.close();
-        connection.close();
+        if (statement != null) {
+            statement.close();
+            statement = null;
+        }
+        if (connection != null) {
+            connection.close();
+            connection = null;
+        }
         for (ReferenceDriver driver : referenceDrivers) {
             try {
                 driver.tearDown();

client/trino-jdbc/src/test/java/io/trino/jdbc/TestJdbcWarnings.java

@@ -100,6 +100,7 @@ public void tearDownServer()
             throws Exception
     {
         server.close();
+        server = null;
     }
 
     @SuppressWarnings("JDBCResourceOpenedButNotSafelyClosed")
@@ -117,8 +118,11 @@ public void teardown()
             throws Exception
     {
         executor.shutdownNow();
+        executor = null;
         statement.close();
+        statement = null;
         connection.close();
+        connection = null;
     }
 
     @Test

client/trino-jdbc/src/test/java/io/trino/jdbc/TestProgressMonitor.java

@@ -65,6 +65,7 @@ public void teardown()
             throws IOException
     {
         server.close();
+        server = null;
     }
 
     private List<String> createResults()

client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDatabaseMetaData.java

@@ -166,6 +166,7 @@ public void tearDown()
             throws Exception
     {
         connection.close();
+        connection = null;
     }
 
     @Test

client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDriver.java

@@ -130,6 +130,7 @@ public void teardown()
         executorService.shutdownNow();
         executorService = null;
         server.close();
+        server = null;
     }
 
     @Test

client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDriverAuth.java

@@ -93,6 +93,7 @@ public void teardown()
             throws Exception
     {
         server.close();
+        server = null;
     }
 
     @Test

client/trino-jdbc/src/test/java/io/trino/jdbc/TestTrinoDriverImpersonateUser.java

@@ -79,6 +79,7 @@ public void teardown()
             throws Exception
     {
         server.close();
+        server = null;
     }
 
     @Test

core/trino-main/src/test/java/io/trino/cost/TestStatsCalculator.java

@@ -22,6 +22,8 @@
 import io.trino.sql.planner.assertions.PlanMatchPattern;
 import io.trino.sql.planner.plan.TableScanNode;
 import io.trino.testing.LocalQueryRunner;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import static io.trino.sql.planner.LogicalPlanner.Stage.OPTIMIZED_AND_VALIDATED;
@@ -32,11 +34,12 @@
 
 public class TestStatsCalculator
 {
-    private final LocalQueryRunner queryRunner;
+    private LocalQueryRunner queryRunner;
 
-    public TestStatsCalculator()
+    @BeforeClass
+    public void setUp()
     {
-        this.queryRunner = LocalQueryRunner.create(testSessionBuilder()
+        queryRunner = LocalQueryRunner.create(testSessionBuilder()
                 .setCatalog(TEST_CATALOG_NAME)
                 .setSchema("tiny")
                 .setSystemProperty("task_concurrency", "1") // these tests don't handle exchanges from local parallel
@@ -48,6 +51,13 @@ public TestStatsCalculator()
                 ImmutableMap.of());
     }
 
+    @AfterClass(alwaysRun = true)
+    public void tearDown()
+    {
+        queryRunner.close();
+        queryRunner = null;
+    }
+
     @Test
     public void testStatsCalculatorUsesLayout()
     {

core/trino-main/src/test/java/io/trino/execution/BaseDataDefinitionTaskTest.java

@@ -128,7 +128,14 @@ public void tearDown()
     {
         if (queryRunner != null) {
             queryRunner.close();
+            queryRunner = null;
         }
+        testSession = null;
+        metadata = null;
+        plannerContext = null;
+        materializedViewPropertyManager = null;
+        transactionManager = null;
+        queryStateMachine = null;
     }
 
     protected static QualifiedObjectName qualifiedObjectName(String objectName)

core/trino-main/src/test/java/io/trino/execution/TestCallTask.java

@@ -82,6 +82,7 @@ public void close()
     {
         if (queryRunner != null) {
             queryRunner.close();
+            queryRunner = null;
         }
         executor.shutdownNow();
         executor = null;

core/trino-main/src/test/java/io/trino/execution/TestCreateMaterializedViewTask.java

@@ -155,6 +155,15 @@ public void tearDown()
         if (queryRunner != null) {
             queryRunner.close();
         }
+        testSession = null;
+        metadata = null;
+        plannerContext = null;
+        transactionManager = null;
+        parser = null;
+        queryStateMachine = null;
+        analyzerFactory = null;
+        materializedViewPropertyManager = null;
+        queryRunner = null;
     }
 
     @Test

core/trino-main/src/test/java/io/trino/execution/TestCreateTableTask.java

@@ -142,6 +142,12 @@ public void tearDown()
         if (queryRunner != null) {
             queryRunner.close();
         }
+        queryRunner = null;
+        transactionManager = null;
+        tablePropertyManager = null;
+        columnPropertyManager = null;
+        metadata = null;
+        plannerContext = null;
     }
 
     @Test

core/trino-main/src/test/java/io/trino/execution/TestMemoryRevokingScheduler.java

@@ -71,10 +71,11 @@ public class TestMemoryRevokingScheduler
     private final SpillSpaceTracker spillSpaceTracker = new SpillSpaceTracker(DataSize.of(10, GIGABYTE));
     private final Map<QueryId, QueryContext> queryContexts = new HashMap<>();
 
+    private MemoryPool memoryPool;
+    private TaskExecutor taskExecutor;
     private ScheduledExecutorService executor;
     private ScheduledExecutorService scheduledExecutor;
     private SqlTaskExecutionFactory sqlTaskExecutionFactory;
-    private MemoryPool memoryPool;
 
     private Set<OperatorContext> allOperatorContexts;
 
@@ -83,7 +84,7 @@ public void setUp()
     {
         memoryPool = new MemoryPool(DataSize.ofBytes(10));
 
-        TaskExecutor taskExecutor = new TaskExecutor(8, 16, 3, 4, Ticker.systemTicker());
+        taskExecutor = new TaskExecutor(8, 16, 3, 4, Ticker.systemTicker());
         taskExecutor.start();
 
         // Must be single threaded
@@ -107,8 +108,12 @@ public void tearDown()
     {
         queryContexts.clear();
         memoryPool = null;
+        taskExecutor.stop();
+        taskExecutor = null;
         executor.shutdownNow();
         scheduledExecutor.shutdownNow();
+        sqlTaskExecutionFactory = null;
+        allOperatorContexts = null;
     }
 
     @Test

core/trino-main/src/test/java/io/trino/execution/TestPlannerWarnings.java

@@ -76,6 +76,7 @@ public void setUp()
     public void tearDown()
     {
         queryRunner.close();
+        queryRunner = null;
     }
 
     @Test

core/trino-main/src/test/java/io/trino/execution/TestResetSessionTask.java

@@ -28,6 +28,7 @@
 import io.trino.testing.LocalQueryRunner;
 import io.trino.transaction.TransactionManager;
 import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import java.net.URI;
@@ -48,14 +49,16 @@ public class TestResetSessionTask
 {
     private static final String CATALOG_NAME = "my_catalog";
     private ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
-    private final TransactionManager transactionManager;
-    private final AccessControl accessControl;
-    private final Metadata metadata;
-    private final SessionPropertyManager sessionPropertyManager;
+    private LocalQueryRunner queryRunner;
+    private TransactionManager transactionManager;
+    private AccessControl accessControl;
+    private Metadata metadata;
+    private SessionPropertyManager sessionPropertyManager;
 
-    public TestResetSessionTask()
+    @BeforeClass
+    public void setUp()
     {
-        LocalQueryRunner queryRunner = LocalQueryRunner.builder(TEST_SESSION)
+        queryRunner = LocalQueryRunner.builder(TEST_SESSION)
                 .withExtraSystemSessionProperties(ImmutableSet.of(() -> ImmutableList.of(
                         stringProperty(
                                 "foo",
@@ -86,6 +89,12 @@ public void tearDown()
     {
         executor.shutdownNow();
         executor = null;
+        queryRunner.close();
+        queryRunner = null;
+        transactionManager = null;
+        accessControl = null;
+        metadata = null;
+        sessionPropertyManager = null;
     }
 
     @Test

core/trino-main/src/test/java/io/trino/execution/TestSetPathTask.java

@@ -26,6 +26,7 @@
 import io.trino.sql.tree.SetPath;
 import io.trino.transaction.TransactionManager;
 import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
 import java.net.URI;
@@ -44,13 +45,14 @@
 
 public class TestSetPathTask
 {
-    private final TransactionManager transactionManager;
-    private final AccessControl accessControl;
-    private final Metadata metadata;
+    private TransactionManager transactionManager;
+    private AccessControl accessControl;
+    private Metadata metadata;
 
     private ExecutorService executor = newCachedThreadPool(daemonThreadsNamed(getClass().getSimpleName() + "-%s"));
 
-    public TestSetPathTask()
+    @BeforeClass
+    public void setUp()
     {
         transactionManager = createTestTransactionManager();
         accessControl = new AllowAllAccessControl();
@@ -65,6 +67,9 @@ public void tearDown()
     {
         executor.shutdownNow();
         executor = null;
+        transactionManager = null;
+        accessControl = null;
+        metadata = null;
     }
 
     @Test