Merge pull request #2128 from Am-phi/fix/#2127

[client-v2] Fix support in ClickHouseBinaryFormatReader for SimpleAggregateValue

Author: chernser

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

@@ -222,8 +222,11 @@ protected void setSchema(TableSchema schema) {
 
         for (int i = 0; i < columns.length; i++) {
             ClickHouseColumn column = columns[i];
-
-            switch (column.getDataType()) {
+            ClickHouseDataType columnDataType = column.getDataType();
+            if (columnDataType.equals(ClickHouseDataType.SimpleAggregateFunction)){
+                columnDataType = column.getNestedColumns().get(0).getDataType();
+            }
+            switch (columnDataType) {
                 case Int8:
                 case Int16:
                 case UInt8:
@@ -378,7 +381,11 @@ public BigDecimal getBigDecimal(String colName) {
     public Instant getInstant(String colName) {
         int colIndex = schema.nameToIndex(colName);
         ClickHouseColumn column = schema.getColumns().get(colIndex);
-        switch (column.getDataType()) {
+        ClickHouseDataType columnDataType = column.getDataType();
+        if (columnDataType.equals(ClickHouseDataType.SimpleAggregateFunction)){
+            columnDataType = column.getNestedColumns().get(0).getDataType();
+        }
+        switch (columnDataType) {
             case Date:
             case Date32:
                 LocalDate data = readValue(colName);
@@ -402,7 +409,11 @@ public Instant getInstant(String colName) {
     public ZonedDateTime getZonedDateTime(String colName) {
         int colIndex = schema.nameToIndex(colName);
         ClickHouseColumn column = schema.getColumns().get(colIndex);
-        switch (column.getDataType()) {
+        ClickHouseDataType columnDataType = column.getDataType();
+        if (columnDataType.equals(ClickHouseDataType.SimpleAggregateFunction)){
+            columnDataType = column.getNestedColumns().get(0).getDataType();
+        }
+        switch (columnDataType) {
             case DateTime:
             case DateTime64:
             case Date:

client-v2/src/test/java/com/clickhouse/client/query/QueryTests.java

@@ -1985,6 +1985,31 @@ public void testReadingSimpleAggregateFunction() throws Exception {
         }
     }
 
+    @Test(groups = {"integration"})
+    public void testReadingSimpleAggregateFunction2() throws Exception {
+        final String tableName = "simple_aggregate_function_test_table";
+        client.execute("DROP TABLE IF EXISTS " + tableName).get();
+        client.execute("CREATE TABLE `" + tableName + "` " +
+                "(idx UInt8, lowest_value SimpleAggregateFunction(min, UInt8), count SimpleAggregateFunction(sum, Int64), date SimpleAggregateFunction(anyLast, DateTime32)) " +
+                "ENGINE Memory;").get();
+
+
+        try (InsertResponse response = client.insert(tableName, new ByteArrayInputStream("1\t2\t3\t2024-12-22T12:00:00".getBytes(StandardCharsets.UTF_8)), ClickHouseFormat.TSV).get(30, TimeUnit.SECONDS)) {
+            Assert.assertEquals(response.getWrittenRows(), 1);
+        }
+
+        try (QueryResponse queryResponse = client.query("SELECT * FROM " + tableName + " LIMIT 1").get(30, TimeUnit.SECONDS)) {
+
+            ClickHouseBinaryFormatReader reader = client.newBinaryFormatReader(queryResponse);
+            Assert.assertNotNull(reader.next());
+            Assert.assertEquals(reader.getByte("idx"), Byte.valueOf("1"));
+            Assert.assertEquals((Short) reader.getShort("lowest_value"), Short.parseShort("2"));
+            Assert.assertEquals((Long) reader.getLong("count"), Long.parseLong("3"));
+            Assert.assertEquals(reader.getLocalDateTime("date"), LocalDateTime.of(2024,12,22,12,00,00));
+            Assert.assertFalse(reader.hasNext());
+        }
+    }
+
     @Test(groups = {"integration"})
     public void testReadingEnumsAsStrings() throws Exception {
         final String tableName = "enums_as_strings_test_table";