Revert "修复测试类报错 (#4516 )"

This reverts commit d899981354.
修复测试类报错 (#4516 )
2026-11-04 00:30:15 +08:00 · 2022-12-06 16:41:17 +08:00 · 2022-12-06 16:17:01 +08:00 · 2022-06-13 09:39:29 +08:00 · 2022-06-13 09:31:46 +08:00 · 2022-06-10 13:36:39 +08:00
46 changed files with 146 additions and 71 deletions
--- a/admin/admin-ui/pom.xml
+++ b/admin/admin-ui/pom.xml
@@ -3,7 +3,7 @@
  <parent>
    <artifactId>canal.admin</artifactId>
    <groupId>com.alibaba.otter</groupId>
-    <version>1.1.6</version>
+    <version>1.1.7-SNAPSHOT</version>
  </parent>
  <modelVersion>4.0.0</modelVersion>

--- a/admin/admin-web/pom.xml
+++ b/admin/admin-web/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.admin</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <artifactId>canal.admin-web</artifactId>
--- a/admin/pom.xml
+++ b/admin/pom.xml
@@ -3,7 +3,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.alibaba.otter</groupId>
    <artifactId>canal.admin</artifactId>
-    <version>1.1.6</version>
+    <version>1.1.7-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>canal admin module for otter ${project.version}</name>
    <modules>
--- a/client-adapter/common/pom.xml
+++ b/client-adapter/common/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client-adapter/es6x/pom.xml
+++ b/client-adapter/es6x/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client-adapter/es7x/pom.xml
+++ b/client-adapter/es7x/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client-adapter/escore/pom.xml
+++ b/client-adapter/escore/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client-adapter/hbase/pom.xml
+++ b/client-adapter/hbase/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client-adapter/kudu/pom.xml
+++ b/client-adapter/kudu/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client-adapter/launcher/pom.xml
+++ b/client-adapter/launcher/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client-adapter/logger/pom.xml
+++ b/client-adapter/logger/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client-adapter/phoenix/pom.xml
+++ b/client-adapter/phoenix/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client-adapter/pom.xml
+++ b/client-adapter/pom.xml
@@ -4,12 +4,12 @@
    <parent>
        <groupId>com.alibaba.otter</groupId>
        <artifactId>canal</artifactId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <groupId>com.alibaba.otter</groupId>
    <artifactId>canal.client-adapter</artifactId>
-    <version>1.1.6</version>
+    <version>1.1.7-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>canal client adapter module for otter ${project.version}</name>

--- a/client-adapter/rdb/pom.xml
+++ b/client-adapter/rdb/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client-adapter/tablestore/pom.xml
+++ b/client-adapter/tablestore/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.client-adapter</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>canal.common</artifactId>
--- a/common/src/main/java/com/alibaba/otter/canal/common/utils/JsonUtils.java
+++ b/common/src/main/java/com/alibaba/otter/canal/common/utils/JsonUtils.java
@@ -1,17 +1,13 @@
 package com.alibaba.otter.canal.common.utils;

 import java.lang.reflect.Type;
-import java.net.Inet4Address;
-import java.net.Inet6Address;
 import java.net.InetAddress;
 import java.util.Arrays;
 import java.util.List;

-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONFactory;
-import com.alibaba.fastjson2.TypeReference;
+import com.alibaba.fastjson2.*;
+import com.alibaba.fastjson2.filter.Filter;
 import com.alibaba.fastjson2.filter.PropertyFilter;
-import com.alibaba.fastjson2.JSONWriter;
 import com.alibaba.fastjson2.writer.ObjectWriter;


@@ -21,22 +17,18 @@ import com.alibaba.fastjson2.writer.ObjectWriter;
 * @author jianghang
 */
 public class JsonUtils {
-
-    static {
-        JSON.register(InetAddress.class, InetAddressWriter.instance);
-        JSON.register(Inet4Address.class, InetAddressWriter.instance);
-        JSON.register(Inet6Address.class, InetAddressWriter.instance);
-
-        JSONFactory.getDefaultObjectReaderProvider().addAutoTypeAccept("com.alibaba.otter.");
-        JSONFactory.getDefaultObjectReaderProvider().addAutoTypeAccept("com.taobao.tddl.dbsync.");
-    }
+    static final Filter AUTO_TYPE_FILTER = JSONReader.autoTypeFilter(
+            "com.alibaba.otter.",
+            "com.taobao.tddl.dbsync."
+    );

    public static <T> T unmarshalFromByte(byte[] bytes, Class<T> targetClass) {
-        return (T) JSON.parseObject(bytes, targetClass);// 默认为UTF-8
+        return (T) JSON.parseObject(bytes, targetClass, AUTO_TYPE_FILTER);// 默认为UTF-8
    }

    public static <T> T unmarshalFromByte(byte[] bytes, TypeReference<T> type) {
-        return (T) JSON.parseObject(bytes, type.getType());
+
+        return (T) JSON.parseObject(bytes, type.getType(), AUTO_TYPE_FILTER);
    }

    public static byte[] marshalToByte(Object obj) {
@@ -48,11 +40,11 @@ public class JsonUtils {
    }

    public static <T> T unmarshalFromString(String json, Class<T> targetClass) {
-        return (T) JSON.parseObject(json, targetClass);// 默认为UTF-8
+        return (T) JSON.parseObject(json, targetClass, AUTO_TYPE_FILTER);// 默认为UTF-8
    }

    public static <T> T unmarshalFromString(String json, TypeReference<T> type) {
-        return (T) JSON.parseObject(json, type);// 默认为UTF-8
+        return (T) JSON.parseObject(json, type.getType(), AUTO_TYPE_FILTER);// 默认为UTF-8
    }

    public static String marshalToString(Object obj) {
@@ -71,7 +63,7 @@ public class JsonUtils {

        return JSON.toJSONString(obj, new PropertyFilter() {
            @Override
-            public boolean process(Object object, String name, Object value) {
+            public boolean apply(Object object, String name, Object value) {
                return !propertyFliters.contains(name);
            }
        });
--- a/common/src/test/java/com/alibaba/otter/canal/common/JsonUtilsTest.java
+++ b/common/src/test/java/com/alibaba/otter/canal/common/JsonUtilsTest.java
@@ -0,0 +1,21 @@
+package com.alibaba.otter.canal.common;
+
+import com.alibaba.otter.canal.common.utils.JsonUtils;
+import org.junit.Test;
+
+import java.net.InetAddress;
+
+import static org.junit.Assert.assertEquals;
+
+public class JsonUtilsTest {
+    @Test
+    public void marshalToString() throws Exception {
+        InetAddress address = InetAddress.getByName("localhost");
+
+        String json = JsonUtils.marshalToString(address);
+        assertEquals("\"localhost\"", json);
+
+        InetAddress address1 = JsonUtils.unmarshalFromString(json, InetAddress.class);
+        assertEquals(address, address1);
+    }
+}
--- a/connector/core/pom.xml
+++ b/connector/core/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.connector</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <groupId>com.alibaba.otter</groupId>
--- a/connector/kafka-connector/pom.xml
+++ b/connector/kafka-connector/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.connector</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/connector/pom.xml
+++ b/connector/pom.xml
@@ -4,13 +4,13 @@
    <parent>
        <groupId>com.alibaba.otter</groupId>
        <artifactId>canal</artifactId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <groupId>com.alibaba.otter</groupId>
    <artifactId>canal.connector</artifactId>
-    <version>1.1.6</version>
+    <version>1.1.7-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>canal connector module for otter ${project.version}</name>

--- a/connector/pulsarmq-connector/pom.xml
+++ b/connector/pulsarmq-connector/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.connector</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/connector/rabbitmq-connector/pom.xml
+++ b/connector/rabbitmq-connector/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.connector</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/connector/rocketmq-connector/pom.xml
+++ b/connector/rocketmq-connector/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.connector</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/connector/tcp-connector/pom.xml
+++ b/connector/tcp-connector/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <artifactId>canal.connector</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/dbsync/pom.xml
+++ b/dbsync/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/deployer/pom.xml
+++ b/deployer/pom.xml
@@ -3,7 +3,7 @@
    <parent>
        <groupId>com.alibaba.otter</groupId>
        <artifactId>canal</artifactId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>
    <groupId>com.alibaba.otter</groupId>
--- a/driver/pom.xml
+++ b/driver/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/example/pom.xml
+++ b/example/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/filter/pom.xml
+++ b/filter/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/instance/core/pom.xml
+++ b/instance/core/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<artifactId>canal.instance.core</artifactId>
--- a/instance/manager/pom.xml
+++ b/instance/manager/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/instance/pom.xml
+++ b/instance/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/instance/spring/pom.xml
+++ b/instance/spring/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/meta/pom.xml
+++ b/meta/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/parse/pom.xml
+++ b/parse/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>canal.parse</artifactId>
--- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/DatabaseTableMeta.java
+++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/DatabaseTableMeta.java
@@ -14,6 +14,7 @@ import java.util.concurrent.locks.ReadWriteLock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 import java.util.regex.Pattern;

+import com.alibaba.otter.canal.parse.driver.mysql.packets.server.FieldPacket;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
@@ -190,17 +191,28 @@ public class DatabaseTableMeta implements TableMetaTSDB {
    private boolean dumpTableMeta(MysqlConnection connection, final CanalEventFilter filter) {
        try {
            ResultSetPacket packet = connection.query("show databases");
+            int columnSize = packet.getFieldDescriptors().size();
+            int columnIndex = 0;
+            for (; columnIndex < columnSize; columnIndex++) {
+                FieldPacket value = packet.getFieldDescriptors().get(columnIndex);
+                if (StringUtils.equalsIgnoreCase(value.getName(), "Database")) {
+                    break;
+                }
+            }
+
            List<String> schemas = new ArrayList<>();
-            schemas.addAll(packet.getFieldValues());
+            for (int line = 0; line < packet.getFieldValues().size() / columnSize; line++) {
+                String schema = packet.getFieldValues().get(line * columnSize + columnIndex);
+                schemas.add(schema);
+            }

            for (String schema : schemas) {
                // filter views
                packet = connection.query("show full tables from `" + schema + "` where Table_type = 'BASE TABLE'");
+                int tableNameColumnIndex = 0; // default index is 0
                List<String> tables = new ArrayList<>();
-                for (String table : packet.getFieldValues()) {
-                    if ("BASE TABLE".equalsIgnoreCase(table)) {
-                        continue;
-                    }
+                for (int line = 0; line < packet.getFieldValues().size() / columnSize; line++) {
+                    String table = packet.getFieldValues().get(line * columnSize + tableNameColumnIndex);
                    String fullName = schema + "." + table;
                    if (blackFilter == null || !blackFilter.filter(fullName)) {
                        if (filter == null || filter.filter(fullName)) {
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/DirectLogFetcherTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/DirectLogFetcherTest.java
@@ -13,6 +13,7 @@ import java.util.concurrent.TimeUnit;

 import org.apache.commons.lang.StringUtils;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -45,6 +46,7 @@ import com.taobao.tddl.dbsync.binlog.event.WriteRowsLogEvent;
 import com.taobao.tddl.dbsync.binlog.event.XidLogEvent;
 import com.taobao.tddl.dbsync.binlog.event.mariadb.AnnotateRowsEvent;

+@Ignore
 public class DirectLogFetcherTest {

    protected final Logger logger         = LoggerFactory.getLogger(this.getClass());
--- a/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/FastsqlSchemaTest.java
+++ b/parse/src/test/java/com/alibaba/otter/canal/parse/inbound/mysql/tsdb/FastsqlSchemaTest.java
@@ -137,4 +137,52 @@ public class FastsqlSchemaTest {
        SchemaObject table = repository.findTable("test");
        Assert.assertTrue(table != null);
    }
+
+    @Test
+    public void test_polardb_x() throws Throwable {
+        SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL);
+        repository.setDefaultSchema("test");
+
+        String sql1 = "CREATE TABLE `test1` (\n" + "  `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,\n"
+                      + "  `serialNo` varchar(64) CHARACTER SET utf8mb4 NOT NULL DEFAULT '',\n"
+                      + "  `user_id` int(11) DEFAULT NULL COMMENT '用户id',\n" + "  PRIMARY KEY (`id`)\n"
+                      + ") ENGINE = InnoDB  PARTITION BY KEY(`tenant_id`,`id`)\n" + "PARTITIONS 21 tablegroup = `tg_p_msg`";
+        repository.console(sql1);
+        SchemaObject table = repository.findTable("test1");
+        Assert.assertTrue(table != null);
+
+
+        String sql2 = "CREATE TABLE `test2` (\n" + "  `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,\n"
+                      + "  `serialNo` varchar(64) CHARACTER SET utf8mb4 NOT NULL DEFAULT '',\n"
+                      + "  `user_id` int(11) DEFAULT NULL COMMENT '用户id',\n" + "  PRIMARY KEY (`id`)\n"
+                      + ") ENGINE = InnoDB single";
+        repository.console(sql2);
+        table = repository.findTable("test2");
+        Assert.assertTrue(table != null);
+
+
+        String sql3 = "CREATE TABLE `test3` (\n" + "  `id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,\n"
+                      + "  `serialNo` varchar(64) CHARACTER SET utf8mb4 NOT NULL DEFAULT '',\n"
+                      + "  `user_id` int(11) DEFAULT NULL COMMENT '用户id',\n" + "  PRIMARY KEY (`id`)\n"
+                      + ") ENGINE = InnoDB locality = 'dn=polardbx-ng28-dn-1,polardbx-ng28-dn-2'";
+        repository.console(sql3);
+        table = repository.findTable("test3");
+        Assert.assertTrue(table != null);
+
+        String sql4 = "CREATE TABLE test4(\n" + " order_id int AUTO_INCREMENT primary key,\n"
+                      + " customer_id int,\n" + " country varchar(64),\n" + " city varchar(64),\n"
+                      + " order_time datetime not null)\n" + "PARTITION BY LIST COLUMNS(country,city)\n" + "(\n"
+                      + "  PARTITION p1 VALUES IN (('China','Shanghai')) LOCALITY = 'dn=polardbx-ng28-dn-2',\n"
+                      + "  PARTITION p2 VALUES IN (('China','Beijing')) LOCALITY = 'dn=polardbx-ng28-dn-2',\n"
+                      + "  PARTITION p3 VALUES IN (('China','Hangzhou')) ,\n"
+                      + "  PARTITION p4 VALUES IN (('China','Nanjing')) ,\n"
+                      + "  PARTITION p5 VALUES IN (('China','Guangzhou')) ,\n"
+                      + "  PARTITION p6 VALUES IN (('China','Shenzhen')) ,\n"
+                      + "  PARTITION p7 VALUES IN (('China','Wuhan')) ,\n"
+                      + "  PARTITION p8 VALUES IN (('America','New York'))\n"
+                      + ") LOCALITY = 'dn=polardbx-ng28-dn-0,polardbx-ng28-dn-1';";
+        repository.console(sql4);
+        table = repository.findTable("test4");
+        Assert.assertTrue(table != null);
+    }
 }
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
    <artifactId>canal</artifactId>
    <packaging>pom</packaging>
    <name>canal module for otter ${project.version}</name>
-    <version>1.1.6</version>
+    <version>1.1.7-SNAPSHOT</version>
    <url>https://github.com/alibaba/canal</url>
    <parent>
        <groupId>org.sonatype.oss</groupId>
@@ -222,7 +222,7 @@
            <dependency>
                <groupId>com.alibaba.fastjson2</groupId>
                <artifactId>fastjson2</artifactId>
-                <version>2.0.4</version>
+                <version>2.0.7</version>
            </dependency>
            <dependency>
                <groupId>com.google.guava</groupId>
@@ -262,7 +262,7 @@
            <dependency>
                <groupId>com.alibaba</groupId>
                <artifactId>druid</artifactId>
-                <version>1.2.10</version>
+                <version>1.2.11</version>
            </dependency>
            <dependency>
                <groupId>com.lmax</groupId>
--- a/prometheus/pom.xml
+++ b/prometheus/pom.xml
@@ -3,13 +3,13 @@
    <parent>
        <artifactId>canal</artifactId>
        <groupId>com.alibaba.otter</groupId>
-        <version>1.1.6</version>
+        <version>1.1.7-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <groupId>com.alibaba.otter</groupId>
    <artifactId>canal.prometheus</artifactId>
-    <version>1.1.6</version>
+    <version>1.1.7-SNAPSHOT</version>
    <name>canal prometheus module for otter ${project.version}</name>
    <dependencies>
        <dependency>
--- a/protocol/pom.xml
+++ b/protocol/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<artifactId>canal.server</artifactId>
--- a/sink/pom.xml
+++ b/sink/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
--- a/store/pom.xml
+++ b/store/pom.xml
@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.alibaba.otter</groupId>
 		<artifactId>canal</artifactId>
-		<version>1.1.6</version>
+		<version>1.1.7-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<groupId>com.alibaba.otter</groupId>
Author	SHA1	Message	Date
rewerma	f3bb0dd18d	Revert "修复测试类报错 (#4516 )" This reverts commit `d899981354`.	2022-12-06 16:41:17 +08:00
rewerma	d899981354	修复测试类报错 (#4516 ) * optimize YAML config loader (#4332) * fix bug BASE TABLE as table name (#4217) * fix issues#4328 (#4329) * docs: add nodejs canal client support (#4260) Co-authored-by: zhangxunwei <zhangxunwei@dxy.cn> * fix destination not encoded (#4279) * 修复Canal指定时间戳启动失效，总是从最新的点位开始同步问题 (#4348) * 支持用户自定义的CanalAlarmHandler * RowsLogEvent增加对TableMapLogEvent判空检查，防止NPE异常 * 修复Canal指定时间戳启动失效，总是从最新的点位开始同步问题, issue: #4347 Co-authored-by: 云时 <mingya.wmy@alibaba-inc.com> * fixed 4334 , support jdk8/jdk11 * fixed issue #4266 , typo * fixed issue #4243 , support auto register for cluster = null * fixed issue #4225 , support mysql version >= 8.0.26 heartbeat v2 * fixed issue #4308 , support query_log_event for maraiadb 10.10.1 * ignore compression event * support jdk11 * support druid 1.2.12 * fixed mariadb 10.x * sync canal-template.properties * update fastjson & druid version (#4406) * 修复升级2.0.4导致兼容的问题 * update druid & fastjson version * update fastjson version * update druid & fastjson version * meta.dat文件数据丢失 (#4397) * update fastjson & druid version (#4438) * 局部变量线程安全，优先使用StringBuilder替换StringBuffer (#4472) Co-authored-by: 夏亮 <xialiang@newerabc.com> * 1. CanalController stop 需要同时将 embededCanalServer.stop (#4477) 2. ServerRunningMonitor 线程池未正常回收，线程池管理与 start/stop保持一致 * vuln-fix: Use HTTPS instead of HTTP to resolve dependencies (#4437) This fixes a security vulnerability in this project where the `build.gradle` files were configuring Gradle to resolve dependencies over HTTP instead of HTTPS. Weakness: CWE-829: Inclusion of Functionality from Untrusted Control Sphere Severity: High CVSSS: 8.1 Detection: OpenRewrite Reported-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com> Signed-off-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com> Bug-tracker: https://github.com/JLLeitschuh/security-research/issues/9 Co-authored-by: Moderne <team@moderne.io> Co-authored-by: Moderne <team@moderne.io> * fix_ETL同步mysql关键字报错 (#4346) Co-authored-by: foleyang <foleyang@cogobuy.com> * optimize code * use compact BigDecimal * performance optimize , 1. cache string names 2. cache Charset * performance optimize ,cache integer/long valueof * 测试类报错 Co-authored-by: gongchangyou <gongchangyou@gmail.com> Co-authored-by: ChanaLii <316529035@qq.com> Co-authored-by: zhangxunwei <zhangxunweia@gmail.com> Co-authored-by: zhangxunwei <zhangxunwei@dxy.cn> Co-authored-by: tianpeidong <39491687+tianpeidong@users.noreply.github.com> Co-authored-by: dataccs <dataccs@163.com> Co-authored-by: 云时 <mingya.wmy@alibaba-inc.com> Co-authored-by: jianghang.loujh <jianghang.loujh@alibaba-inc.com> Co-authored-by: 温绍锦 <shaojin.wensj@alibaba-inc.com> Co-authored-by: noaso <noasoso@gmail.com> Co-authored-by: HumanPassenger <40585855+HumanPassenger@users.noreply.github.com> Co-authored-by: 夏亮 <xialiang@newerabc.com> Co-authored-by: 华仔 <591327356@qq.com> Co-authored-by: Jonathan Leitschuh <jonathan.leitschuh@gmail.com> Co-authored-by: Moderne <team@moderne.io> Co-authored-by: 杰锅不是锅 <1105568074@qq.com> Co-authored-by: foleyang <foleyang@cogobuy.com>	2022-12-06 16:17:01 +08:00
jianghang.loujh	a96db39420	add polardb-x parser test	2022-06-13 09:39:29 +08:00
温绍锦	bac1d543f1	update fastjson & druid version (#4224 ) * 修复升级2.0.4导致兼容的问题 * update druid & fastjson version	2022-06-13 09:31:46 +08:00
jianghang.loujh	753fad6639	fixed issue #4216 , support polardb-x show tables	2022-06-10 13:36:39 +08:00
jianghang.loujh	bc4dceea1a	fixed issue #4216 , support polardb-x show databases	2022-06-10 11:37:52 +08:00
温绍锦	7aaee7b439	修复升级2.0.4导致兼容的问题 (#4202 )	2022-05-30 10:29:38 +08:00
温绍锦	e19bf1ecff	Fastjson2 compatible fix (#4189 ) * update fastjson2 version, 2.0.2 -> 2.0.3 * update fastjson & druid version * bug fix for fastjson2 compatible	2022-05-25 10:22:26 +08:00
jianghang.loujh	a99dc0cbe8	fixed testcase	2022-05-24 11:18:40 +08:00
jianghang.loujh	7b8ff04d20	[maven-release-plugin] prepare for next development iteration	2022-05-24 10:26:12 +08:00