diff --git a/client-adapter/launcher/src/main/resources/logback.xml b/client-adapter/launcher/src/main/resources/logback.xml index 0eab3cde..93c35415 100644 --- a/client-adapter/launcher/src/main/resources/logback.xml +++ b/client-adapter/launcher/src/main/resources/logback.xml @@ -35,11 +35,11 @@ - ../logs/rocketmq_client/rocketmq_client.log + ../logs/adapter/rocketmq_client.log - ../logs/rocketmq_client/%d{yyyy-MM-dd}/rocketmq_client-%d{yyyy-MM-dd}-%i.log.gz + ../logs/adapter/%d{yyyy-MM-dd}/rocketmq_client-%d{yyyy-MM-dd}-%i.log.gz 512MB diff --git a/deployer/src/main/resources/logback.xml b/deployer/src/main/resources/logback.xml index dde526d5..682e80fa 100644 --- a/deployer/src/main/resources/logback.xml +++ b/deployer/src/main/resources/logback.xml @@ -62,11 +62,11 @@ - ../logs/rocketmq_client/rocketmq_client.log + ../logs/canal/rocketmq_client.log - ../logs/rocketmq_client/%d{yyyy-MM-dd}/rocketmq_client-%d{yyyy-MM-dd}-%i.log.gz + ../logs/canal/%d{yyyy-MM-dd}/rocketmq_client-%d{yyyy-MM-dd}-%i.log.gz 512MB @@ -114,4 +114,4 @@ - \ No newline at end of file + diff --git 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 index 9c892db9..313e4cfd 100644 --- 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 @@ -78,4 +78,30 @@ public class FastsqlSchemaTest { System.out.println(table.getStatement().toString()); Assert.assertTrue(table.findColumn("c1") != null); } + + @Test + public void test_primaryKey() throws Throwable { + SchemaRepository repository = new SchemaRepository(JdbcConstants.MYSQL); + { + String sql1 = "CREATE TABLE test ( id NOT NULL, name varchar(32) ) ENGINE=InnoDB; "; + String sql2 = " ALTER TABLE test add primary key(id);"; + repository.console(sql1); + String rs = repository.console(sql2); + System.out.println(rs); + repository.setDefaultSchema("test"); + SchemaObject table = repository.findTable("test"); + Assert.assertTrue(table.findColumn("id").isOnlyPrimaryKey()); + } + + { + String sql1 = "CREATE TABLE test ( id NOT NULL, name varchar(32) ) ENGINE=InnoDB; "; + String sql2 = "ALTER TABLE test MODIFY id bigint AUTO_INCREMENT PRIMARY KEY; "; + repository.console(sql1); + repository.console(sql2); + repository.setDefaultSchema("test"); + SchemaObject table = repository.findTable("test"); + Assert.assertTrue(table.findColumn("id").isOnlyPrimaryKey()); + Assert.assertTrue(table.findColumn("id").isAutoIncrement()); + } + } }