Merge pull request #942 from zhicwu/cli-client

Fix JDBC metadata issues

Author: zhicwu

.github/workflows/build.yml

@@ -85,6 +85,10 @@ jobs:
           distribution: 'temurin'
           java-version: 8
           cache: 'maven'
+      # or take below workaround as mentioned at https://github.com/actions/virtual-environments/issues/1499#issuecomment-689467080
+      # -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120
+      - name: Check
+        run: mvn --batch-mode --update-snapshots -Drelease -DskipTests install
       - name: Build
         run: |
           mvn --batch-mode --update-snapshots -Drelease -DclickhouseVersion=${{ matrix.clickhouse }} -Dprotocol=${{ matrix.protocol }} verify

clickhouse-benchmark/pom.xml

@@ -20,7 +20,7 @@
         <clickhouse4j-driver.version>1.4.4</clickhouse4j-driver.version>
         <native-driver.version>2.6.5</native-driver.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <jmh.version>1.34</jmh.version>
+        <jmh.version>1.35</jmh.version>
         <shade.name>benchmarks</shade.name>
     </properties>
 

clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseRowBinaryProcessor.java

@@ -547,8 +547,7 @@ protected List<ClickHouseColumn> readColumns() throws IOException {
                 .getOption(ClickHouseClientOption.RENAME_RESPONSE_COLUMN);
         List<ClickHouseColumn> columns = new ArrayList<>(size);
         for (int i = 0; i < size; i++) {
-            // a bit risky here - what if ClickHouse support user type?
-            columns.add(ClickHouseColumn.of(m.rename(names[i]), input.readAsciiString()));
+            columns.add(ClickHouseColumn.of(m.rename(names[i]), input.readUnicodeString()));
         }
 
         return columns;

clickhouse-client/src/main/java/com/clickhouse/client/data/ClickHouseSimpleResponse.java

@@ -52,7 +52,7 @@ public static ClickHouseResponse of(ClickHouseConfig config, List<ClickHouseColu
     public static ClickHouseResponse of(ClickHouseConfig config, List<ClickHouseColumn> columns, Object[][] values,
             ClickHouseResponseSummary summary) {
         if (columns == null || columns.isEmpty()) {
-            return EMPTY;
+            return ClickHouseResponse.EMPTY;
         }
 
         int size = columns.size();

clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/ClickHouseDatabaseMetaData.java

@@ -22,6 +22,8 @@
 import com.clickhouse.client.ClickHouseParameterizedQuery;
 import com.clickhouse.client.ClickHouseUtils;
 import com.clickhouse.client.ClickHouseValues;
+import com.clickhouse.client.config.ClickHouseClientOption;
+import com.clickhouse.client.config.ClickHouseRenameMethod;
 import com.clickhouse.client.data.ClickHouseRecordTransformer;
 import com.clickhouse.client.data.ClickHouseSimpleResponse;
 import com.clickhouse.client.logging.Logger;
@@ -66,7 +68,9 @@ protected ResultSet query(String sql, ClickHouseRecordTransformer func, boolean
             ClickHouseStatement stmt = connection.createStatement();
             return new ClickHouseResultSet("", "", stmt,
                     // load everything into memory
-                    ClickHouseSimpleResponse.of(stmt.getRequest().query(sql).execute().get(), func));
+                    ClickHouseSimpleResponse.of(stmt.getRequest()
+                            .option(ClickHouseClientOption.RENAME_RESPONSE_COLUMN, ClickHouseRenameMethod.NONE)
+                            .query(sql).execute().get(), func));
         } catch (InterruptedException e) {
             Thread.currentThread().interrupt();
             throw SqlExceptionUtils.forCancellation(e);
@@ -1255,19 +1259,23 @@ public ResultSet getClientInfoProperties() throws SQLException {
     public ResultSet getFunctions(String catalog, String schemaPattern, String functionNamePattern)
             throws SQLException {
         Map<String, String> params = new HashMap<>();
-        params.put("filter", ClickHouseChecker.isNullOrEmpty(schemaPattern)
-                || "system".contains(schemaPattern.toLowerCase(Locale.ROOT)) ? "1" : "0");
+        boolean systemSchema = ClickHouseChecker.isNullOrEmpty(schemaPattern);
+        if (!systemSchema) {
+            String schemaPatternLower = schemaPattern.toLowerCase(Locale.ROOT);
+            systemSchema = "system".contains(schemaPatternLower) || "information_schema".contains(schemaPatternLower);
+        }
+        params.put("filter", systemSchema ? "1" : "0");
         params.put("pattern", ClickHouseChecker.isNullOrEmpty(functionNamePattern) ? "'%'"
                 : ClickHouseValues.convertToQuotedString(functionNamePattern));
 
         String sql = ClickHouseParameterizedQuery.apply(
                 "select * from (select null as FUNCTION_CAT, 'system' as FUNCTION_SCHEM, name as FUNCTION_NAME,\n"
                         + "concat('case-', case_insensitive ? 'in' : '', 'sensitive function', is_aggregate ? ' for aggregation' : '') as REMARKS,"
-                        + "1 as FUNCTION_TYPE, name as SPECIFIC_NAME from system.functions\n"
-                        + "where alias_to = '' and name like :pattern order by name union all\n"
+                        + "1 as FUNCTION_TYPE, name as SPECIFIC_NAME from system.functions where name like :pattern union all\n"
                         + "select null as FUNCTION_CAT, 'system' as FUNCTION_SCHEM, name as FUNCTION_NAME,\n"
                         + "'case-sensitive table function' as REMARKS, 2 as FUNCTION_TYPE, name as SPECIFIC_NAME from system.table_functions\n"
-                        + "order by name) where :filter",
+                        + "where name not in (select name from system.functions) and name like :pattern) where :filter\n"
+                        + "order by FUNCTION_CAT, FUNCTION_SCHEM, FUNCTION_NAME",
                 params);
         return query(sql);
     }

clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseConnectionImpl.java

@@ -40,6 +40,7 @@
 import com.clickhouse.client.ClickHouseValues;
 import com.clickhouse.client.ClickHouseVersion;
 import com.clickhouse.client.config.ClickHouseClientOption;
+import com.clickhouse.client.config.ClickHouseRenameMethod;
 import com.clickhouse.client.http.config.ClickHouseHttpOption;
 import com.clickhouse.client.logging.Logger;
 import com.clickhouse.client.logging.LoggerFactory;
@@ -65,7 +66,8 @@ public class ClickHouseConnectionImpl extends JdbcWrapper implements ClickHouseC
 
     protected static ClickHouseRecord getServerInfo(ClickHouseNode node, ClickHouseRequest<?> request,
             boolean createDbIfNotExist) throws SQLException {
-        ClickHouseRequest<?> newReq = request.copy();
+        ClickHouseRequest<?> newReq = request.copy().option(ClickHouseClientOption.RENAME_RESPONSE_COLUMN,
+                ClickHouseRenameMethod.NONE);
         if (!createDbIfNotExist) { // in case the database does not exist
             newReq.option(ClickHouseClientOption.DATABASE, "");
         }
@@ -189,6 +191,7 @@ protected List<ClickHouseColumn> getTableColumns(String dbName, String tableName
         builder.append('`').append(ClickHouseUtils.escape(tableName, '`')).append('`').append(" WHERE 0");
         List<ClickHouseColumn> list;
         try (ClickHouseResponse resp = clientRequest.copy().format(ClickHouseFormat.RowBinaryWithNamesAndTypes)
+                .option(ClickHouseClientOption.RENAME_RESPONSE_COLUMN, ClickHouseRenameMethod.NONE)
                 .query(builder.toString()).execute().get()) {
             list = resp.getColumns();
         } catch (InterruptedException e) {

clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/internal/ClickHouseStatementImpl.java

@@ -23,6 +23,7 @@
 import com.clickhouse.client.ClickHouseResponse;
 import com.clickhouse.client.ClickHouseResponseSummary;
 import com.clickhouse.client.ClickHouseSerializer;
+import com.clickhouse.client.ClickHouseUtils;
 import com.clickhouse.client.ClickHouseValue;
 import com.clickhouse.client.config.ClickHouseClientOption;
 import com.clickhouse.client.config.ClickHouseConfigChangeListener;
@@ -123,18 +124,20 @@ protected ClickHouseResponse executeStatement(String stmt,
             }
             if (tables != null && !tables.isEmpty()) {
                 List<ClickHouseExternalTable> list = new ArrayList<>(tables.size());
+                char quote = '`';
                 for (ClickHouseExternalTable t : tables) {
                     if (t.isTempTable()) {
                         if (!request.getSessionId().isPresent()) {
                             request.session(UUID.randomUUID().toString());
                         }
-                        request.query("drop temporary table if exists `" + t.getName() + "`").execute().get();
-                        request.query("create temporary table `" + t.getName() + "`(" + t.getStructure() + ")")
-                                .execute().get();
-                        request.write()
-                                .table(t.getName())
+                        String tableName = new StringBuilder().append(quote)
+                                .append(ClickHouseUtils.escape(t.getName(), quote)).append(quote).toString();
+                        request.query("drop temporary table if exists ".concat(tableName)).executeAndWait();
+                        request.query("create temporary table " + tableName + "(" + t.getStructure() + ")")
+                                .executeAndWait();
+                        request.write().table(tableName)
                                 // .format(t.getFormat() != null ? t.getFormat() : ClickHouseFormat.RowBinary)
-                                .data(t.getContent()).sendAndWait();
+                                .data(t.getContent()).send().get();
                     } else {
                         list.add(t);
                     }