update java 11 src

ClickHouse · Apr 24, 2024 · 5d48f52 · 5d48f52
1 parent 6ce419c
commit 5d48f52
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 9 deletions.
diff --git a/...tp-client/src/main/java11/com/clickhouse/client/http/ClickHouseHttpConnectionFactory.java b/...tp-client/src/main/java11/com/clickhouse/client/http/ClickHouseHttpConnectionFactory.java
@@ -2,6 +2,10 @@
 
 import java.io.IOException;
 import java.util.concurrent.ExecutorService;
+import java.util.Collections;
+import java.io.Serializable;
+import java.util.Map;
+
 
 import com.clickhouse.client.ClickHouseNode;
 import com.clickhouse.client.ClickHouseRequest;
@@ -14,7 +18,13 @@ public final class ClickHouseHttpConnectionFactory {
     private static final Logger log = LoggerFactory.getLogger(ClickHouseHttpConnectionFactory.class);
 
     public static ClickHouseHttpConnection createConnection(ClickHouseNode server, ClickHouseRequest<?> request,
-            ExecutorService executor) throws IOException {
+                                                            ExecutorService executor) throws IOException
+    {
+        return createConnection(server, request, executor, Collections.emptyMap());
+    }
+
+    public static ClickHouseHttpConnection createConnection(ClickHouseNode server, ClickHouseRequest<?> request,
+            ExecutorService executor, Map<String, Serializable> additionalRequestParams) throws IOException {
         HttpConnectionProvider provider = request.getConfig().getOption(ClickHouseHttpOption.CONNECTION_PROVIDER,
                 HttpConnectionProvider.class);
         if (provider == HttpConnectionProvider.APACHE_HTTP_CLIENT) {
@@ -24,10 +34,10 @@ public static ClickHouseHttpConnection createConnection(ClickHouseNode server, C
                 log.warn("Error when creating %s, fall back to HTTP_URL_CONNECTION", provider, t);
             }
         } else if (provider == HttpConnectionProvider.HTTP_CLIENT) {
-            return new HttpClientConnectionImpl(server, request, executor);
+            return new HttpClientConnectionImpl(server, request, executor, additionalRequestParams);
         }
 
-        return new HttpUrlConnectionImpl(server, request, executor);
+        return new HttpUrlConnectionImpl(server, request, executor, additionalRequestParams);
     }
 
     private ClickHouseHttpConnectionFactory() {

diff --git a/...ouse-http-client/src/main/java11/com/clickhouse/client/http/HttpClientConnectionImpl.java b/...ouse-http-client/src/main/java11/com/clickhouse/client/http/HttpClientConnectionImpl.java
@@ -52,6 +52,8 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.io.Serializable;
+import java.util.Map;
 
 import javax.net.ssl.SSLContext;
 
@@ -173,9 +175,9 @@ private HttpRequest newRequest(String url) {
                 .timeout(Duration.ofMillis(config.getSocketTimeout())).build();
     }
 
-    protected HttpClientConnectionImpl(ClickHouseNode server, ClickHouseRequest<?> request, ExecutorService executor)
-            throws IOException {
-        super(server, request);
+    protected HttpClientConnectionImpl(ClickHouseNode server, ClickHouseRequest<?> request, ExecutorService executor,
+                                       Map<String, Serializable> additionalParams) throws IOException {
+        super(server, request, additionalParams);
 
         HttpClient.Builder builder = HttpClient.newBuilder().version(Version.HTTP_1_1)
                 .connectTimeout(Duration.ofMillis(config.getConnectionTimeout())).followRedirects(Redirect.NORMAL);

diff --git a/clickhouse-jdbc/src/main/javacc/ClickHouseSqlParser.jj b/clickhouse-jdbc/src/main/javacc/ClickHouseSqlParser.jj
@@ -143,8 +143,6 @@ public class ClickHouseSqlParser {
             for (int i = anyArgsListStart; i < stmtLength; i++) {
                 char ch = token_source.builder.charAt(i);
                 if (ch == '"' && isQuoted ) {
-                    roles.add(roleBuff.toString());
-                    roleBuff.setLength(0);
                     isQuoted = false;
                 }  else if (ch == '"') {
                     isQuoted = true;

diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/AccessManagementTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/AccessManagementTest.java
@@ -69,7 +69,7 @@ private static Object[][] setRolesArgsForTestSetRole() {
                         HttpConnectionProvider.APACHE_HTTP_CLIENT.name()},
                 {new String[]{"ROL1", "\"ROL2,☺\""}, "set role  \"ROL2,☺\", ROL1", new String[]{"ROL2,☺", "ROL1"},
                         HttpConnectionProvider.APACHE_HTTP_CLIENT.name()},
-                {new String[]{"ROL1", "ROL2"}, "set role  ROL2 ,   ROL1,  ", new String[]{"ROL", "ROL1"},
+                {new String[]{"ROL1", "ROL2"}, "set role  ROL2 ,   ROL1  ", new String[]{"ROL2", "ROL1"},
                         HttpConnectionProvider.APACHE_HTTP_CLIENT.name()},
         };
     }