made client autoclosable to free resources

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/Client.java

@@ -41,6 +41,7 @@
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
@@ -95,7 +96,7 @@
  * <p>Client is thread-safe. It uses exclusive set of object to perform an operation.</p>
  *
  */
-public class Client {
+public class Client implements AutoCloseable {
 
     private Set<String> endpoints;
     private Map<String, String> configuration;
@@ -130,6 +131,24 @@ public String getDefaultDatabase() {
         return this.configuration.get("database");
     }
 
+
+    /**
+     * Frees the resources associated with the client.
+     * <ul>
+     *     <li>Shuts down the shared operation executor by calling {@code shutdownNow()}</li>
+     * </ul>
+     */
+    @Override
+    public void close() {
+        try {
+            if (!sharedOperationExecutor.isShutdown()) {
+                this.sharedOperationExecutor.shutdownNow();
+            }
+        } catch (Exception e) {
+            LOG.error("Failed to close shared operation executor", e);
+        }
+    }
+
     public static class Builder {
         private Set<String> endpoints;
 

client-v2/src/test/java/com/clickhouse/client/ClientTests.java

@@ -37,6 +37,8 @@ public void testAddSecureEndpoint(Client client) {
                 return;
             }
             Assert.fail(e.getMessage());
+        } finally {
+            client.close();
         }
     }
 
@@ -87,6 +89,8 @@ public void testRawSettings() {
         } catch (Exception e) {
             e.printStackTrace();
             Assert.fail(e.getMessage());
+        } finally {
+            client.close();
         }
     }
 }

client-v2/src/test/java/com/clickhouse/client/insert/InsertTests.java

@@ -11,11 +11,11 @@
 import com.clickhouse.client.api.enums.Protocol;
 import com.clickhouse.client.api.insert.InsertResponse;
 import com.clickhouse.client.api.insert.InsertSettings;
-import com.clickhouse.client.api.metadata.TableSchema;
 import com.clickhouse.client.api.metrics.ClientMetrics;
 import com.clickhouse.client.api.metrics.OperationMetrics;
 import com.clickhouse.client.api.metrics.ServerMetrics;
 import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
@@ -32,7 +32,7 @@ public class InsertTests extends BaseIntegrationTest {
     private Client client;
     private InsertSettings settings;
 
-    @BeforeMethod(groups = { "integration" }, enabled = true)
+    @BeforeMethod(groups = { "integration" })
     public void setUp() throws IOException {
         ClickHouseNode node = getServer(ClickHouseProtocol.HTTP);
         client = new Client.Builder()
@@ -45,6 +45,11 @@ public void setUp() throws IOException {
                 .setQueryId(String.valueOf(UUID.randomUUID()));
     }
 
+    @AfterMethod(groups = { "integration" })
+    public void tearDown() {
+        client.close();
+    }
+
     private void createTable(String tableQuery) throws ClickHouseException {
         try (ClickHouseClient client = ClickHouseClient.builder().config(new ClickHouseConfig())
                         .nodeSelector(ClickHouseNodeSelector.of(ClickHouseProtocol.HTTP))

client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java

@@ -32,6 +32,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
@@ -83,6 +84,11 @@ public void setUp() {
         System.out.println("Real port: " + node.getPort());
     }
 
+    @AfterMethod(groups = {"integration"})
+    public void tearDown() {
+        client.close();
+    }
+
     private static void delayForProfiler(long millis) {
         try {
             Thread.sleep(millis);