Merge branch 'main' into jdbc_prepared_stmt_metadata

Author: chernser

client-v2/src/main/java/com/clickhouse/client/api/data_formats/RowBinaryFormatWriter.java

@@ -29,6 +29,8 @@ public class RowBinaryFormatWriter {
 
     private final Object[] row;
 
+    private final boolean defaultSupport;
+
     public RowBinaryFormatWriter(OutputStream out, TableSchema tableSchema, ClickHouseFormat format) {
         if (format != ClickHouseFormat.RowBinary && format != ClickHouseFormat.RowBinaryWithDefaults) {
             throw new IllegalArgumentException("Only RowBinary and RowBinaryWithDefaults are supported");
@@ -37,6 +39,7 @@ public RowBinaryFormatWriter(OutputStream out, TableSchema tableSchema, ClickHou
         this.out = out;
         this.tableSchema = tableSchema;
         this.row = new Object[tableSchema.getColumns().size()];
+        this.defaultSupport = format == ClickHouseFormat.RowBinaryWithDefaults;
     }
 
     public void setValue(String column, Object value) {
@@ -48,12 +51,11 @@ public void setValue(int colIndex, Object value) {
     }
 
     public void commitRow() throws IOException {
-
         List<ClickHouseColumn> columnList = tableSchema.getColumns();
         for (int i = 0; i < row.length; i++) {
             ClickHouseColumn column = columnList.get(i);
 
-            if (RowBinaryFormatSerializer.writeValuePreamble(out, true, column, row[i])) {
+            if (RowBinaryFormatSerializer.writeValuePreamble(out, defaultSupport, column, row[i])) {
                 SerializerUtils.serializeData(out, row[i], column);
             }
         }

client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/BinaryStreamReader.java

@@ -205,9 +205,12 @@ public <T> T readValue(ClickHouseColumn column, Class<?> typeHint) throws IOExce
                     return (T) readGeoPolygon();
                 case MultiPolygon:
                     return (T) readGeoMultiPolygon();
+                case MultiLineString:
+                    return (T) readGeoPolygon();
                 case Ring:
                     return (T) readGeoRing();
-
+                case LineString:
+                    return (T) readGeoRing();
                 case JSON: // experimental https://clickhouse.com/docs/en/sql-reference/data-types/newjson
                     if (jsonAsString) {
                         return (T) readString(input);

client-v2/src/main/java/com/clickhouse/client/api/data_formats/internal/SerializerUtils.java

@@ -80,10 +80,12 @@ public static void serializeData(OutputStream stream, Object value, ClickHouseCo
                 serializeTupleData(stream, value, GEO_POINT_TUPLE);
                 break;
             case Ring:
+            case LineString:
                 value = value instanceof ClickHouseGeoRingValue ? ((ClickHouseGeoRingValue)value).getValue() : value;
                 serializeArrayData(stream, value, GEO_RING_ARRAY);
                 break;
             case Polygon:
+            case MultiLineString:
                 value = value instanceof ClickHouseGeoPolygonValue ? ((ClickHouseGeoPolygonValue)value).getValue() : value;
                 serializeArrayData(stream, value, GEO_POLYGON_ARRAY);
                 break;

client-v2/src/main/java/com/clickhouse/client/api/internal/ClickHouseLZ4InputStream.java

@@ -129,7 +129,7 @@ private int refill() throws IOException {
 
         if (buffer.capacity() < uncompressedSize) {
             buffer = ByteBuffer.allocate(uncompressedSize);
-            LOG.warn("Buffer size is too small, reallocate buffer with size: " + uncompressedSize);
+            LOG.debug("Buffer size is too small, reallocate buffer with size: {}", uncompressedSize);
         }
         decompressor.decompress(ByteBuffer.wrap(block), offset,  buffer, 0, uncompressedSize);
         buffer.position(0);

client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java

@@ -380,7 +380,7 @@ public Exception readError(ClassicHttpResponse httpResponse) {
 
     public ClassicHttpResponse executeRequest(ClickHouseNode server, Map<String, Object> requestConfig, LZ4Factory lz4Factory,
                                              IOCallback<OutputStream> writeCallback) throws IOException {
-        if (timeToPoolVent.get() < System.currentTimeMillis()) {
+        if (poolControl != null && timeToPoolVent.get() < System.currentTimeMillis()) {
             timeToPoolVent.set(System.currentTimeMillis() + POOL_VENT_TIMEOUT);
             poolControl.closeExpired();
         }

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

@@ -1,6 +1,7 @@
 package com.clickhouse.client;
 
 import com.clickhouse.client.api.Client;
+import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.client.api.ClientException;
 import com.clickhouse.client.api.enums.Protocol;
 import com.clickhouse.client.api.query.GenericRecord;
@@ -108,6 +109,13 @@ public void testPing() {
         }
     }
 
+    @Test
+    public void testPingUnpooled() {
+        try (Client client = newClient().enableConnectionPool(false).build()) {
+            Assert.assertTrue(client.ping());
+        }
+    }
+
     @Test
     public void testPingFailure() {
         try (Client client = new Client.Builder()