Merge branch 'main' into feat_client_protobuf_example

Author: chernser

.github/workflows/nightly.yml

@@ -12,7 +12,7 @@ on:
 
 env:
   CHC_BRANCH: "main"
-  CHC_VERSION: "0.6.0"
+  CHC_VERSION: "0.6.2"
 
 jobs:
   nightly:
@@ -69,8 +69,8 @@ jobs:
           maven_args: -q --batch-mode
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          nexus_username: ${{ secrets.SONATYPE_USER }}
-          nexus_password: ${{ secrets.SONATYPE_PASSWD }}
+          nexus_username: ${{ secrets.SONATYPE_TOKEN_USER }}
+          nexus_password: ${{ secrets.SONATYPE_TOKEN }}
       - name: Release R2DBC 0.9.1 Snapshot
         uses: samuelmeuli/action-maven-publish@v1
         with:
@@ -79,5 +79,5 @@ jobs:
           maven_args: -q --batch-mode -Dr2dbc-spi.version=0.9.1.RELEASE
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          nexus_username: ${{ secrets.SONATYPE_USER }}
-          nexus_password: ${{ secrets.SONATYPE_PASSWD }}
+          nexus_username: ${{ secrets.SONATYPE_TOKEN_USER }}
+          nexus_password: ${{ secrets.SONATYPE_TOKEN }}

.github/workflows/release.yml

@@ -6,7 +6,7 @@ on:
       version:
         description: "Release version"
         required: true
-        default: "0.6.0-SNAPSHOT"
+        default: "0.6.2-SNAPSHOT"
 
 jobs:
   release:
@@ -57,8 +57,8 @@ jobs:
           maven_args: -q --batch-mode
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          nexus_username: ${{ secrets.SONATYPE_USER }}
-          nexus_password: ${{ secrets.SONATYPE_PASSWD }}
+          nexus_username: ${{ secrets.SONATYPE_TOKEN_USER }}
+          nexus_password: ${{ secrets.SONATYPE_TOKEN }}
       - name: Release R2DBC 0.9.1
         uses: samuelmeuli/action-maven-publish@v1
         with:
@@ -67,8 +67,8 @@ jobs:
           maven_args: -q --batch-mode -Dr2dbc-spi.version=0.9.1.RELEASE
           gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
           gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
-          nexus_username: ${{ secrets.SONATYPE_USER }}
-          nexus_password: ${{ secrets.SONATYPE_PASSWD }}
+          nexus_username: ${{ secrets.SONATYPE_TOKEN_USER }}
+          nexus_password: ${{ secrets.SONATYPE_TOKEN }}
       - name: Create Pre-release on Github
         uses: "zhicwu/action-automatic-releases@latest"
         with:

CHANGELOG.md

@@ -1,5 +1,15 @@
 ## Latest 
 
+## 0.6.2
+
+### New Features
+- Describe non-executed SELECT queries in prepared statements to provide metadata (https://github.com/ClickHouse/clickhouse-java/issues/1430)
+- Command execution in the client API (https://github.com/ClickHouse/clickhouse-java/pull/1693)
+- Added `com.clickhouse.client.ClickHouseResponseSummary#getQueryId()` (https://github.com/ClickHouse/clickhouse-java/issues/1636)
+- Added support for SSL for the Client V2
+- Added proxy support for Client V2 (https://github.com/ClickHouse/clickhouse-java/pull/1694)
+- Added more examples for Client V2 (https://github.com/ClickHouse/clickhouse-java/pull/1709)
+
 ## 0.6.1
 
 ### New Features

clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseNode.java

@@ -787,7 +787,10 @@ public static ClickHouseNode of(String uri, Map<?, ?> options) {
         String scheme = normalizedUri.getScheme();
         ClickHouseProtocol protocol = ClickHouseProtocol.fromUriScheme(scheme);
         int port = extract(scheme, normalizedUri.getPort(), protocol, params);
-
+        if ((options == null || options.get(ClickHouseClientOption.SSL.getKey()) == null)
+                && scheme.equalsIgnoreCase("https")) {
+            params.put(ClickHouseClientOption.SSL.getKey(), "true");
+        }
         ClickHouseCredentials credentials = extract(normalizedUri.getRawUserInfo(), params, null);
 
         return new ClickHouseNode(normalizedUri.getHost(), protocol, port, credentials, params, tags);

clickhouse-client/src/main/java/com/clickhouse/client/ClickHouseResponseSummary.java

@@ -20,7 +20,7 @@ public class ClickHouseResponseSummary implements Serializable {
     public static final class Progress implements Serializable {
         private static final long serialVersionUID = -1447066780591278108L;
 
-        static final Progress EMPTY = new Progress(0L, 0L, 0L, 0L, 0L, 0L, 0L);
+        static final Progress EMPTY = new Progress(0L, 0L, 0L, 0L, 0L, 0L, 0L, "");
 
         private final long read_rows;
         private final long read_bytes;
@@ -29,6 +29,7 @@ public static final class Progress implements Serializable {
         private final long written_bytes;
         private final long elapsed_time;
         private final long result_rows;
+        private final String query_id;
 
         /**
          * Default constructor.
@@ -39,16 +40,34 @@ public static final class Progress implements Serializable {
          * @param written_rows       Number of rows written
          * @param written_bytes      Volume of data written in bytes
          * @param elapsed_time       Query processing time in (ns)
+         * @param result_rows        Number of rows in the result
          */
         public Progress(long read_rows, long read_bytes, long total_rows_to_read, long written_rows,
-                long written_bytes, long elapsed_time, long result_rows) {
+                        long written_bytes, long elapsed_time, long result_rows) {
+            this(read_rows, read_bytes, total_rows_to_read, written_rows, written_bytes, elapsed_time, result_rows, "");
+        }
+        /**
+         * Default constructor.
+         *
+         * @param read_rows          Number of rows read
+         * @param read_bytes         Volume of data read in bytes
+         * @param total_rows_to_read Total number of rows to be read
+         * @param written_rows       Number of rows written
+         * @param written_bytes      Volume of data written in bytes
+         * @param elapsed_time       Query processing time in (ns)
+         * @param result_rows        Number of rows in the result
+         * @param query_id           Query ID
+         */
+        public Progress(long read_rows, long read_bytes, long total_rows_to_read, long written_rows,
+                long written_bytes, long elapsed_time, long result_rows, String query_id) {
             this.read_rows = read_rows;
             this.read_bytes = read_bytes;
             this.total_rows_to_read = total_rows_to_read;
             this.written_rows = written_rows;
             this.written_bytes = written_bytes;
             this.elapsed_time = elapsed_time;
             this.result_rows = result_rows;
+            this.query_id = query_id;
         }
 
         public long getReadRows() {
@@ -78,6 +97,10 @@ public long getElapsedTime() {
         public long getResultRows() {
             return result_rows;
         }
+
+        public String getQueryId() {
+            return query_id;
+        }
         public Progress add(Progress progress) {
             if (progress == null) {
                 return this;
@@ -86,7 +109,7 @@ public Progress add(Progress progress) {
             return new Progress(read_rows + progress.read_rows, read_bytes + progress.read_bytes,
                     total_rows_to_read + progress.total_rows_to_read, written_rows + progress.written_rows,
                     written_bytes + progress.written_bytes,elapsed_time + progress.elapsed_time,
-                    result_rows + progress.result_rows);
+                    result_rows + progress.result_rows, query_id + ", " + progress.query_id);
         }
 
         public boolean isEmpty() {
@@ -322,6 +345,10 @@ public long getResultRows() {
         return progress.get().getResultRows();
     }
 
+    public String getQueryId() {
+        return progress.get().getQueryId();
+    }
+
     public boolean isEmpty() {
         return progress.get().isEmpty() && stats.get().isEmpty();
     }

clickhouse-client/src/test/java/com/clickhouse/client/ClickHouseResponseSummaryTest.java

@@ -8,7 +8,7 @@
 
 public class ClickHouseResponseSummaryTest {
     @Test(groups = { "unit" })
-    public void testConsutrctor() {
+    public void testConstructor() {
         ClickHouseResponseSummary summary = new ClickHouseResponseSummary(null, null);
         Assert.assertNotNull(summary.getProgress());
         Assert.assertNotNull(summary.getStatistics());

clickhouse-data/src/main/java/com/clickhouse/data/ClickHouseColumn.java

@@ -589,7 +589,7 @@ private ClickHouseColumn(ClickHouseDataType dataType, String columnName, String
         this.originalTypeName = originalTypeName == null ? dataType.name() : originalTypeName;
         this.nullable = nullable;
         this.lowCardinality = lowCardinality;
-        this.hasDefault = originalTypeName != null && originalTypeName.toUpperCase().contains("DEFAULT");
+        this.hasDefault = false;
 
         if (parameters == null || parameters.isEmpty()) {
             this.parameters = Collections.emptyList();
@@ -734,6 +734,10 @@ public boolean hasDefault() {
         return hasDefault;
     }
 
+    public void setHasDefault(boolean hasDefault) {
+        this.hasDefault = hasDefault;
+    }
+
     public boolean isLowCardinality() {
         return !lowCardinalityDisabled && lowCardinality;
     }

clickhouse-http-client/src/main/java/com/clickhouse/client/http/ClickHouseHttpResponse.java

@@ -14,6 +14,7 @@
 import com.clickhouse.data.ClickHouseFormat;
 import com.clickhouse.data.ClickHouseInputStream;
 import com.clickhouse.data.ClickHouseUtils;
+import com.clickhouse.logging.Logger;
 
 public class ClickHouseHttpResponse {
     private static long getLongValue(Map<String, String> map, String key) {
@@ -70,7 +71,7 @@ public ClickHouseHttpResponse(ClickHouseHttpConnection connection, ClickHouseInp
                 new ClickHouseResponseSummary.Progress(getLongValue(map, "read_rows"), getLongValue(map, "read_bytes"),
                         getLongValue(map, "total_rows_to_read"), getLongValue(map, "written_rows"),
                         getLongValue(map, "written_bytes"), getLongValue(map, "elapsed_ns"),
-                getLongValue(map, "result_rows")),
+                        getLongValue(map, "result_rows"), this.queryId),
                 null);
 
         this.format = format != null ? format : connection.config.getFormat();

clickhouse-http-client/src/test/java/com/clickhouse/client/http/ClickHouseHttpClientTest.java

@@ -414,6 +414,21 @@ public void testPost() throws ClickHouseException {
         }
     }
 
+    @Test(groups = {"integration"})
+    public void testQueryId() throws ClickHouseException {
+        ClickHouseNode server = getServer(ClickHouseProtocol.HTTP);
+        String uuid = UUID.randomUUID().toString();
+
+        try (ClickHouseClient client = ClickHouseClient.builder().options(getClientOptions())
+                .defaultCredentials(ClickHouseCredentials.fromUserAndPassword("foo", "bar")).build()) {
+            try (ClickHouseResponse resp = newRequest(client, server).compressServerResponse(false)
+                    .format(ClickHouseFormat.RowBinaryWithNamesAndTypes)
+                    .query("select 1,2", uuid).executeAndWait()) {
+                Assert.assertEquals(resp.getSummary().getQueryId(), uuid);
+            }
+        }
+    }
+
     @Test(groups = {"integration"})
     public void testProxyConnection() throws ClickHouseException, IOException {
         ToxiproxyContainer toxiproxy = null;

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

@@ -109,7 +109,17 @@ default void setClob(int parameterIndex, Clob x) throws SQLException {
     @Override
     default ResultSetMetaData getMetaData() throws SQLException {
         ResultSet currentResult = getResultSet();
-        return currentResult != null ? currentResult.getMetaData() : null;
+        if (currentResult != null) {
+            return currentResult.getMetaData();
+        } else if (getLargeUpdateCount() != -1L) {
+            return null; // Update query
+        }
+
+        return describeQueryResult();
+    }
+
+    default ResultSetMetaData describeQueryResult() throws SQLException {
+        return null;
     }
 
     @Override