support and test Map Type

housepower · Sep 13, 2021 · 7b33e61 · 7b33e61
1 parent 431c133
commit 7b33e61
Show file tree

Hide file tree

Showing 2 changed files with 79 additions and 28 deletions.
diff --git a/...khouse-native-jdbc/src/main/java/com/github/housepower/data/type/complex/DataTypeMap.java b/...khouse-native-jdbc/src/main/java/com/github/housepower/data/type/complex/DataTypeMap.java
@@ -119,15 +119,13 @@ public Object deserializeText(SQLLexer lexer) throws SQLException {
                 lexer.character();
                 break;
             }
-            if (lexer.isCharacter(':')) {
-                key = getNestedTypes()[0].deserializeText(lexer);
-            }
-
+            key = getNestedTypes()[0].deserializeText(lexer);
+            Validate.isTrue(lexer.character() == ':');
+            value = getNestedTypes()[1].deserializeText(lexer);
             if (lexer.isCharacter(',')) {
-                value = getNestedTypes()[1].deserializeText(lexer);
-                result.put(key, value);
                 lexer.character();
             }
+            result.put(key, value);
         }
 
         return result;

diff --git a/clickhouse-native-jdbc/src/test/java/com/github/housepower/jdbc/BatchInsertITest.java b/clickhouse-native-jdbc/src/test/java/com/github/housepower/jdbc/BatchInsertITest.java
@@ -22,6 +22,7 @@
 import java.sql.Date;
 import java.sql.ResultSet;
 import java.sql.Timestamp;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
@@ -207,31 +208,83 @@ public void successfullyBatchInsertDateTime() throws Exception {
 
     @Test
     public void successfullyBatchInsertMap() throws Exception {
-        withStatement(statement -> {
-
-            statement.execute("SET allow_experimental_map_type = 1");
-            statement.execute("DROP TABLE IF EXISTS test");
-            statement.execute("CREATE TABLE test(tags Map(String, String))ENGINE=Log");
+        String[] valueTypes = new String[]{"UInt32", "String", "Tuple(Int32, String)", "Array(UInt16)"};
+        for (int j = 0; j < valueTypes.length; j++) {
+            final int m = j;
+            String eachType = valueTypes[j];
+            withStatement(statement -> {
+                statement.execute("SET allow_experimental_map_type = 1");
+                statement.execute("DROP TABLE IF EXISTS test");
+                statement.execute("CREATE TABLE test(tags Map(String, " + eachType + "))ENGINE=Log");
+
+                withPreparedStatement(statement.getConnection(), "INSERT INTO test VALUES(?)", pstmt -> {
+                    for (int i = 1; i <= 10; i++) {
+                        Map<String, Object> map = new HashMap<>();
+                        Object value = null;
+                        switch (m) {
+                            case 0: {
+                                value = (long) i;
+                                break;
+                            }
+                            case 1: {
+                                value = "value" + i;
+                                break;
+                            }
+                            case 2: {
+                                value = pstmt.getConnection().createStruct("Tuple", new Object[]{(Integer) i, "value" + i});
+                                break;
+                            }
+                            case 3: {
+                                List<Integer> list = new ArrayList<Integer>();
+                                for (int n = i; n > 0; n--) {
+                                    list.add(n);
+                                }
+                                value = pstmt.getConnection().createArrayOf("Integer", list.toArray());
+                                break;
+                            }
+                            default: {
+                                break;
+                            }
+                        }
+                        map.put("key" + i, value);
+                        pstmt.setObject(1, map);
+                        pstmt.addBatch();
+                    }
+                    assertBatchInsertResult(pstmt.executeBatch(), 10);
+                });
 
-            withPreparedStatement(statement.getConnection(), "INSERT INTO test VALUES(?)", pstmt -> {
-                for (int i = 0; i < 10; i++) {
-                    Map<String, String> map = new HashMap<>();
-                    map.put("key", "value");
-                    pstmt.setObject(1, map);
-                    pstmt.addBatch();
+                ResultSet rs = statement.executeQuery("SELECT tags FROM test");
+                while (rs.next()) {
+                    Map<Object, Object> kv = (Map<Object, Object>) rs.getObject(1);
+                    for (Entry<Object, Object> each : kv.entrySet()) {
+                        int v = 0;
+                        switch (m) {
+                            case 0: {
+                                v = ((Long) each.getValue()).intValue();
+                                break;
+                            }
+                            case 1: {
+                                String vStr = (String) each.getValue();
+                                v = Integer.parseInt(vStr.substring(5));
+                                break;
+                            }
+                            case 2: {
+                                v = (Integer) (((ClickHouseStruct) each.getValue()).getAttributes()[0]);
+                                break;
+                            }
+                            case 3: {
+                                v = (Integer) (((ClickHouseArray) each.getValue()).getArray()[0]);
+                                break;
+                            }
+                            default: {
+                                break;
+                            }
+                        }
+                        assertEquals(each.getKey(), "key" + v);
+                    }
                 }
-                assertBatchInsertResult(pstmt.executeBatch(), 10);
             });
-
-            ResultSet rs = statement.executeQuery("SELECT tags FROM test");
-            while (rs.next()) {
-                Map<Object, Object> kv = (Map<Object, Object>) rs.getObject(1);
-                for (Entry<Object, Object> each : kv.entrySet()) {
-                   assertEquals("key", each.getKey());
-                   assertEquals("value", each.getValue());
-                }
-            }
-        });
+        }
 
     }
 }