[bug ClickHouse#1389] Resolve processing Nested column type in combination with AggregateFunction

mdonkers · zhicwu · commit fa6d1002b79b · 2023-08-28T18:26:39.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,7 @@
 
 ### Bug Fixes
 * Java client threw confusing error when query is invalid.
+* JDBC Driver correctly processes `AggregateFunction(Nested(...))` columns
 
 ## 0.4.6, 2023-05-02
 ### New Features
diff --git a/clickhouse-data/src/main/java/com/clickhouse/data/ClickHouseUtils.java b/clickhouse-data/src/main/java/com/clickhouse/data/ClickHouseUtils.java
@@ -440,7 +440,7 @@ public static boolean isSeparator(char ch) {
 
     /**
      * Escape quotes in given string.
-     * 
+     *
      * @param str   string
      * @param quote quote to escape
      * @return escaped string
@@ -466,7 +466,7 @@ public static String escape(String str, char quote) {
 
     /**
      * Unescape quoted string.
-     * 
+     *
      * @param str quoted string
      * @return unescaped string
      */
@@ -1460,7 +1460,7 @@ public static int readValueArray(String args, int startIndex, int len, Consumer<
     }
 
     public static int readParameters(String args, int startIndex, int len, List<String> params) {
-        char closeBracket = ')'; // startIndex points to the openning bracket
+        char closeBracket = ')'; // startIndex points to the opening bracket
         Deque<Character> stack = new ArrayDeque<>();
         StringBuilder builder = new StringBuilder();
 
@@ -1489,7 +1489,7 @@ public static int readParameters(String args, int startIndex, int len, List<Stri
 
         for (int i = startIndex; i < len; i++) {
             char ch = args.charAt(i);
-            if (Character.isWhitespace(ch)) {
+            if (Character.isWhitespace(ch) && stack.isEmpty()) {
                 continue;
             } else if (isQuote(ch)) {
                 builder.append(ch);
diff --git a/clickhouse-data/src/test/java/com/clickhouse/data/ClickHouseColumnTest.java b/clickhouse-data/src/test/java/com/clickhouse/data/ClickHouseColumnTest.java
@@ -206,7 +206,7 @@ public void testAggregationFunction() {
         Assert.assertTrue(column.isAggregateFunction());
         Assert.assertEquals(column.getDataType(), ClickHouseDataType.AggregateFunction);
         Assert.assertEquals(column.getAggregateFunction(), ClickHouseAggregateFunction.quantiles);
-        Assert.assertEquals(column.getFunction(), "quantiles(0.5,0.9)");
+        Assert.assertEquals(column.getFunction(), "quantiles(0.5, 0.9)");
         Assert.assertEquals(column.getNestedColumns(),
                 Collections.singletonList(ClickHouseColumn.of("", "Nullable(UInt64)")));
         Assert.assertFalse(column.isFixedLength(), "Should not have fixed length in byte");
diff --git a/clickhouse-data/src/test/java/com/clickhouse/data/ClickHouseUtilsTest.java b/clickhouse-data/src/test/java/com/clickhouse/data/ClickHouseUtilsTest.java
@@ -459,7 +459,7 @@ public void testReadParameters() {
         List<String> params = new LinkedList<>();
         Assert.assertEquals(ClickHouseUtils.readParameters(args, args.indexOf('('), args.length(), params),
                 args.lastIndexOf(')') + 1);
-        Assert.assertEquals(params, Arrays.asList("quantiles(0.5,'c \\'''([1],2) d',0.9)", "UInt64"));
+        Assert.assertEquals(params, Arrays.asList("quantiles(0.5, 'c \\'''([1],2) d',0.9)", "UInt64"));
 
         params.clear();
         args = "   ('a'/* a*/, 1-- test\n, b)";
@@ -470,6 +470,12 @@ public void testReadParameters() {
         args = " a, b c";
         Assert.assertEquals(ClickHouseUtils.readParameters(args, 0, args.length(), params), args.length());
         Assert.assertEquals(params, Arrays.asList("a", "bc"));
+
+        params.clear();
+        args = "column1 SimpleAggregateFunction(anyLast, Nested(a string, b string))";
+        Assert.assertEquals(ClickHouseUtils.readParameters(args, args.indexOf('('), args.length(), params),
+                args.lastIndexOf(')') + 1);
+        Assert.assertEquals(params, Arrays.asList("anyLast", "Nested(a string, b string)"));
     }
 
     @Test(groups = { "unit" })
diff --git a/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseResultSetTest.java b/clickhouse-jdbc/src/test/java/com/clickhouse/jdbc/ClickHouseResultSetTest.java
@@ -295,6 +295,26 @@ public void testTuple() throws SQLException {
         }
     }
 
+    @Test(groups = "integration")
+    public void testNested() throws SQLException {
+        try (ClickHouseConnection conn = newConnection(new Properties());
+                Statement stmt = conn.createStatement()) {
+
+            stmt.execute("set flatten_nested=0; "
+                    + "drop table if exists test_simple_aggregate_nested; "
+                    + "create table test_simple_aggregate_nested(id Int8, n0 SimpleAggregateFunction(anyLast, Nested(a String,b String))) ENGINE = AggregatingMergeTree() ORDER BY (id); "
+                    + "insert into test_simple_aggregate_nested values(1, [tuple('foo1', 'bar1'), tuple('foo11', 'bar11')]), (2, [tuple('foo2', 'bar2'), tuple('foo22', 'bar22')])");
+            ResultSet rs = stmt
+                    .executeQuery(
+                            "select * from test_simple_aggregate_nested");
+            Assert.assertTrue(rs.next());
+            Assert.assertEquals(rs.getInt(1), 1);
+            Map<?, ?> v = rs.getObject(2, Map.class);
+            Assert.assertEquals(v.size(), 2);
+            Assert.assertEquals(v.get("a"), new String[]{"foo1", "foo11"});
+        }
+    }
+
     @Test(dataProvider = "nullableTypes", groups = "integration")
     public void testNullableValues(ClickHouseDataType type, Object value, BiFunction<ResultSet, Integer, Object> func)
             throws SQLException {
