diff --git a/deployer/src/main/resources/example/instance.properties b/deployer/src/main/resources/example/instance.properties index c41affe0..f838b27f 100644 --- a/deployer/src/main/resources/example/instance.properties +++ b/deployer/src/main/resources/example/instance.properties @@ -52,7 +52,8 @@ canal.mq.topic=example #canal.mq.dynamicTopic=mytest1.user,mytest2\\..*,.*\\..* canal.mq.partition=0 # hash partition config +#canal.mq.enableDynamicQueuePartition=false #canal.mq.partitionsNum=3 -#canal.mq.partitionHash=test.table:id^name,.*\\..* #canal.mq.dynamicTopicPartitionNum=test.*:4,mycanal:6 +#canal.mq.partitionHash=test.table:id^name,.*\\..* ################################################# diff --git a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/TableMetaCache.java b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/TableMetaCache.java index 24615f9e..587d749c 100644 --- a/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/TableMetaCache.java +++ b/parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/TableMetaCache.java @@ -31,12 +31,12 @@ import com.google.common.cache.LoadingCache; */ public class TableMetaCache { - public static final String COLUMN_NAME = "COLUMN_NAME"; - public static final String COLUMN_TYPE = "COLUMN_TYPE"; - public static final String IS_NULLABLE = "IS_NULLABLE"; - public static final String COLUMN_KEY = "COLUMN_KEY"; - public static final String COLUMN_DEFAULT = "COLUMN_DEFAULT"; - public static final String EXTRA = "EXTRA"; + public static final String COLUMN_NAME = "Field"; + public static final String COLUMN_TYPE = "Type"; + public static final String IS_NULLABLE = "Null"; + public static final String COLUMN_KEY = "Key"; + public static final String COLUMN_DEFAULT = "Default"; + public static final String EXTRA = "Extra"; private MysqlConnection connection; private boolean isOnRDS = false; private boolean isOnPolarX = false; @@ -125,7 +125,7 @@ public class TableMetaCache { Map nameMaps = new HashMap<>(6, 1f); int index = 0; for (FieldPacket fieldPacket : packet.getFieldDescriptors()) { - nameMaps.put(fieldPacket.getOriginalName(), index++); + nameMaps.put(fieldPacket.getName(), index++); } int size = packet.getFieldDescriptors().size();