Merge pull request #1074 from zhicwu/develop

zhicwu · web-flow · commit 5d61506a423a · 2022-09-09T17:09:26.000+08:00
Offload ID generation to ClickHouseRequestManager
diff --git a/clickhouse-cli-client/src/main/java/com/clickhouse/client/cli/ClickHouseCommandLine.java b/clickhouse-cli-client/src/main/java/com/clickhouse/client/cli/ClickHouseCommandLine.java
@@ -20,7 +20,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.UUID;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
@@ -209,7 +208,7 @@ static Process startProcess(ClickHouseRequest<?> request) {
             if (!tableFile.isAvailable() || !tableFile.getFile().getAbsolutePath().startsWith(hostDir)) {
                 // creating a hard link is faster but it's not platform-independent
                 File f = ClickHouseInputStream.save(
-                        Paths.get(hostDir, "chc_".concat(UUID.randomUUID().toString())).toFile(),
+                        Paths.get(hostDir, "chc_".concat(request.getManager().createUniqueId())).toFile(),
                         table.getContent(), config.getWriteBufferSize(), config.getSocketTimeout(), true);
                 filePath = containerDir.concat(f.getName());
             } else {
@@ -275,13 +274,13 @@ static Process startProcess(ClickHouseRequest<?> request) {
                     String fileName = f.getName();
                     int len = fileName.length();
                     int index = fileName.indexOf('.', 1);
-                    String uuid = UUID.randomUUID().toString();
+                    String uuid = request.getManager().createUniqueId();
                     if (index > 0 && index + 1 < len) {
                         fileName = new StringBuilder(len + uuid.length() + 1).append(fileName.substring(0, index))
                                 .append('_').append(uuid).append(fileName.substring(index)).toString();
                     } else {
                         fileName = new StringBuilder(len + uuid.length() + 1).append(fileName).append('_')
-                                .append(UUID.randomUUID().toString()).toString();
+                                .append(request.getManager().createUniqueId()).toString();
                     }
                     Path newPath = Paths.get(hostDir, fileName);
                     try {
diff --git a/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseRequestManager.java b/clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseRequestManager.java
@@ -30,20 +30,34 @@ public static ClickHouseRequestManager getInstance() {
     }
 
     /**
-     * Creates a new query ID.
+     * Creates a new query ID. By default, it simply forwards the call to
+     * {@link #createUniqueId()}.
      *
-     * @return non-null query ID
+     * @return non-null unique query ID
      */
     public String createQueryId() {
-        return UUID.randomUUID().toString();
+        return createUniqueId();
     }
 
     /**
-     * Creates a new session ID.
+     * Creates a new session ID. By default, it simply forwards the call to
+     * {@link #createUniqueId()}.
      *
-     * @return non-null session ID
+     * @return non-null unique session ID
      */
     public String createSessionId() {
+        return createUniqueId();
+    }
+
+    /**
+     * Creates a global, URL-safe unique ID. By default it uses
+     * {@link UUID#randomUUID()} for least dependency, but you can override this
+     * method to use any other alternatives like TimeUUID, snowflake and maybe
+     * NanoID.
+     *
+     * @return non-empty global unique ID
+     */
+    public String createUniqueId() {
         return UUID.randomUUID().toString();
     }
 
diff --git a/clickhouse-grpc-client/src/main/java/com/clickhouse/client/grpc/ClickHouseGrpcClient.java b/clickhouse-grpc-client/src/main/java/com/clickhouse/client/grpc/ClickHouseGrpcClient.java
@@ -7,7 +7,6 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
-import java.util.UUID;
 import java.util.Map.Entry;
 import java.util.concurrent.CompletionException;
 import java.util.concurrent.TimeUnit;
@@ -130,7 +129,7 @@ protected static QueryInfo convert(ClickHouseRequest<?> request) {
             }
 
             if (ClickHouseChecker.isNullOrEmpty(builder.getSessionId())) {
-                builder.setSessionId(UUID.randomUUID().toString());
+                builder.setSessionId(request.getManager().createSessionId());
             }
 
             // builder.getSessionTimeout()
diff --git a/clickhouse-http-client/src/main/java/com/clickhouse/client/http/ClickHouseHttpConnection.java b/clickhouse-http-client/src/main/java/com/clickhouse/client/http/ClickHouseHttpConnection.java
@@ -22,6 +22,7 @@
 import com.clickhouse.client.ClickHouseNode;
 import com.clickhouse.client.ClickHouseOutputStream;
 import com.clickhouse.client.ClickHouseRequest;
+import com.clickhouse.client.ClickHouseRequestManager;
 import com.clickhouse.client.ClickHouseUtils;
 import com.clickhouse.client.config.ClickHouseClientOption;
 import com.clickhouse.client.config.ClickHouseOption;
@@ -214,6 +215,7 @@ protected static Map<String, String> createDefaultHeaders(ClickHouseConfig confi
     protected final ClickHouseOutputStream output;
     protected final String url;
     protected final Map<String, String> defaultHeaders;
+    protected final ClickHouseRequestManager rm;
 
     protected ClickHouseHttpConnection(ClickHouseNode server, ClickHouseRequest<?> request) {
         if (server == null || request == null) {
@@ -225,6 +227,7 @@ protected ClickHouseHttpConnection(ClickHouseNode server, ClickHouseRequest<?> r
         this.output = request.getOutputStream().orElse(null);
         this.url = buildUrl(server.getBaseUri(), request);
         this.defaultHeaders = Collections.unmodifiableMap(createDefaultHeaders(config, server));
+        this.rm = request.getManager();
     }
 
     protected void closeQuietly() {
diff --git a/clickhouse-http-client/src/main/java/com/clickhouse/client/http/HttpUrlConnectionImpl.java b/clickhouse-http-client/src/main/java/com/clickhouse/client/http/HttpUrlConnectionImpl.java
@@ -220,7 +220,7 @@ protected ClickHouseHttpResponse post(String sql, ClickHouseInputStream data, Li
         Charset ascii = StandardCharsets.US_ASCII;
         byte[] boundary = null;
         if (tables != null && !tables.isEmpty()) {
-            String uuid = UUID.randomUUID().toString();
+            String uuid = rm.createUniqueId();
             conn.setRequestProperty("content-type", "multipart/form-data; boundary=".concat(uuid));
             boundary = uuid.getBytes(ascii);
         } else {
diff --git a/clickhouse-http-client/src/main/java11/com/clickhouse/client/http/HttpClientConnectionImpl.java b/clickhouse-http-client/src/main/java11/com/clickhouse/client/http/HttpClientConnectionImpl.java
@@ -336,7 +336,7 @@ protected ClickHouseHttpResponse post(String sql, ClickHouseInputStream data, Li
                 .timeout(Duration.ofMillis(c.getSocketTimeout()));
         byte[] boundary = null;
         if (tables != null && !tables.isEmpty()) {
-            String uuid = UUID.randomUUID().toString();
+            String uuid = rm.createUniqueId();
             reqBuilder.setHeader("content-type", "multipart/form-data; boundary=" + uuid);
             boundary = uuid.getBytes(StandardCharsets.US_ASCII);
         } else {
diff --git a/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/JdbcTransaction.java b/clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/JdbcTransaction.java
@@ -5,7 +5,6 @@
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.UUID;
 
 import com.clickhouse.client.ClickHouseChecker;
 import com.clickhouse.client.ClickHouseException;
@@ -32,7 +31,7 @@ public class JdbcTransaction {
 
     public JdbcTransaction(ClickHouseTransaction tx) {
         this.tx = tx;
-        this.id = tx != null ? tx.getId().asTupleString() : UUID.randomUUID().toString();
+        this.id = tx != null ? tx.getId().asTupleString() : ClickHouseRequestManager.getInstance().createUniqueId();
         this.queries = new LinkedList<>();
         this.savepoints = new LinkedList<>();
     }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,6 @@`
`7`	`7`	`import java.util.Collections;`
`8`	`8`	`import java.util.List;`
`9`	`9`	`import java.util.Optional;`
`10`		`-import java.util.UUID;`
`11`	`10`	`import java.util.Map.Entry;`
`12`	`11`	`import java.util.concurrent.CompletionException;`
`13`	`12`	`import java.util.concurrent.TimeUnit;`
`@@ -130,7 +129,7 @@ protected static QueryInfo convert(ClickHouseRequest<?> request) {`
`130`	`129`	`}`
`131`	`130`
`132`	`131`	`if (ClickHouseChecker.isNullOrEmpty(builder.getSessionId())) {`
`133`		`- builder.setSessionId(UUID.randomUUID().toString());`
	`132`	`+ builder.setSessionId(request.getManager().createSessionId());`
`134`	`133`	`}`
`135`	`134`
`136`	`135`	`// builder.getSessionTimeout()`