fixed logger

client-adapter/launcher/src/main/resources/logback.xml

@@ -35,11 +35,11 @@
 	</appender>
 
 	<appender name="RocketmqClientAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>../logs/rocketmq_client/rocketmq_client.log</file>
+		<file>../logs/adapter/rocketmq_client.log</file>
 		<rollingPolicy
 				class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<!-- rollover daily -->
-			<fileNamePattern>../logs/rocketmq_client/%d{yyyy-MM-dd}/rocketmq_client-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
+			<fileNamePattern>../logs/adapter/%d{yyyy-MM-dd}/rocketmq_client-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
 			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
 				<!-- or whenever the file size reaches 100MB -->
 				<maxFileSize>512MB</maxFileSize>

deployer/src/main/resources/logback.xml

@@ -62,11 +62,11 @@
 	</appender>
 
 	<appender name="RocketmqClientAppender" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>../logs/rocketmq_client/rocketmq_client.log</file>
+		<file>../logs/canal/rocketmq_client.log</file>
 		<rollingPolicy
 				class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<!-- rollover daily -->
-			<fileNamePattern>../logs/rocketmq_client/%d{yyyy-MM-dd}/rocketmq_client-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
+			<fileNamePattern>../logs/canal/%d{yyyy-MM-dd}/rocketmq_client-%d{yyyy-MM-dd}-%i.log.gz</fileNamePattern>
 			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
 				<!-- or whenever the file size reaches 100MB -->
 				<maxFileSize>512MB</maxFileSize>
@@ -114,4 +114,4 @@
 		<!-- <appender-ref ref="STDOUT"/>  -->
 		<appender-ref ref="CANAL-ROOT" />
 	</root>
-</configuration>
+</configuration>

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());
+        }
+    }
 }