fixed semi sync format & refactor

dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/LogDecoder.java

@@ -104,12 +104,14 @@ public final class LogDecoder {
                     try {
                         /* Decoding binary-log to event */
                         event = decode(buffer, header, context);
-                        if(event!=null){
+                        if (event != null) {
                             event.setSemival(buffer.semival);
                         }
                     } catch (IOException e) {
-                        if (logger.isWarnEnabled()) logger.warn("Decoding " + LogEvent.getTypeName(header.getType())
+                        if (logger.isWarnEnabled()) {
-                                                                + " failed from: " + context.getLogPosition(), e);
+                            logger.warn("Decoding " + LogEvent.getTypeName(header.getType()) + " failed from: "
+                                        + context.getLogPosition(), e);
+                        }
                         throw e;
                     } finally {
                         buffer.limit(limit); /* Restore limit */

dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/LogEvent.java

@@ -361,7 +361,12 @@ public abstract class LogEvent {
     protected final LogHeader  header;
     
     /**
-     * mysql半同步semi标识 0不需要semi ack 给mysql, 1需要semi ack给mysql
+     * mysql半同步semi标识
+     * 
+     * <pre>
+     * 0不需要semi ack 给mysql
+     * 1需要semi ack给mysql
+     * </pre>
      */
     protected int              semival;
     

dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/event/mariadb/MariaGtidLogEvent.java

@@ -16,26 +16,22 @@ public class MariaGtidLogEvent extends IgnorableLogEvent {
     private long gtid;
 
     /**
+     * <pre>
      * mariadb gtidlog event format
+     *     uint<8> GTID sequence
+     *     uint<4> Replication Domain ID
+     *     uint<1> Flags
      * 
-    uint<8> GTID sequence
+     * 	if flag & FL_GROUP_COMMIT_ID
-    uint<4> Replication Domain ID
+     * 	    uint<8> commit_id
-    uint<1> Flags
+     * 	else
-
+     * 	    uint<6> 0
-	if flag & FL_GROUP_COMMIT_ID
+     * </pre>
-	
-	    uint<8> commit_id
-	
-	else
-	
-	    uint<6> 0
-
-	 * 
      */
 
     public MariaGtidLogEvent(LogHeader header, LogBuffer buffer, FormatDescriptionLogEvent descriptionEvent){
         super(header, buffer, descriptionEvent);
-        gtid=buffer.getUlong64().longValue();
+        gtid = buffer.getUlong64().longValue();
         // do nothing , just ignore log event
     }
 
@@ -43,5 +39,4 @@ public class MariaGtidLogEvent extends IgnorableLogEvent {
         return gtid;
     }
 
-    
 }

driver/src/main/java/com/alibaba/otter/canal/parse/driver/mysql/packets/client/SemiAckCommandPacket.java

@@ -10,13 +10,12 @@ import com.alibaba.otter.canal.parse.driver.mysql.utils.ByteHelper;
 
 /**
  * semi ack command
- * @author amos_chen
  * 
+ * @author amos_chen
  */
 public class SemiAckCommandPacket extends CommandPacket {
 
     public long   binlogPosition;
-	
     public String binlogFileName;
 
     public SemiAckCommandPacket(){
@@ -25,8 +24,6 @@ public class SemiAckCommandPacket extends CommandPacket {
 
     @Override
     public void fromBytes(byte[] data) throws IOException {
-		// TODO Auto-generated method stub
-
     }
 
     /**
@@ -43,13 +40,13 @@ public class SemiAckCommandPacket extends CommandPacket {
      */
     public byte[] toBytes() throws IOException {
         ByteArrayOutputStream out = new ByteArrayOutputStream();
-		//0 write semi mark
+        // 0 write semi mark
         out.write(0xef);
-		//1 write 8 bytes for position
+        // 1 write 8 bytes for position
         ByteHelper.write8ByteUnsignedIntLittleEndian(binlogPosition, out);
 
-		//2 write binlog filename
+        // 2 write binlog filename
-		if(StringUtils.isNotEmpty(binlogFileName)){
+        if (StringUtils.isNotEmpty(binlogFileName)) {
             out.write(binlogFileName.getBytes());
         }
         return out.toByteArray();

parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/MysqlConnection.java

@@ -25,7 +25,6 @@ import com.alibaba.otter.canal.parse.support.AuthenticationInfo;
 import com.taobao.tddl.dbsync.binlog.LogContext;
 import com.taobao.tddl.dbsync.binlog.LogDecoder;
 import com.taobao.tddl.dbsync.binlog.LogEvent;
-import com.taobao.tddl.dbsync.binlog.event.RotateLogEvent;
 
 public class MysqlConnection implements ErosaConnection {
 
@@ -37,8 +36,6 @@ public class MysqlConnection implements ErosaConnection {
     private BinlogFormat        binlogFormat;
     private BinlogImage         binlogImage;
 
-    private String binlogfilename;
-    
     // tsdb releated
     private AuthenticationInfo  authInfo;
     protected int               connTimeout = 5 * 1000;                                      // 5秒
@@ -146,17 +143,12 @@ public class MysqlConnection implements ErosaConnection {
                 throw new CanalParseException("parse failed");
             }
 
-            //binlog日志文件发生变化
-            if(event.getHeader().getType()==LogEvent.ROTATE_EVENT){
-            	binlogfilename=((RotateLogEvent)event).getFilename();
-            }
-
             if (!func.sink(event)) {
                 break;
-            }else{
-            	if(event.getSemival()==1){
-            		sendSemiAck(binlogfilename, binlogPosition);
             }
+
+            if (event.getSemival() == 1) {
+                sendSemiAck(context.getLogPosition().getFileName(), binlogPosition);
             }
         }
     }

parse/src/main/java/com/alibaba/otter/canal/parse/inbound/mysql/dbsync/DirectLogFetcher.java

@@ -37,7 +37,7 @@ public class DirectLogFetcher extends LogFetcher {
 
     private SocketChannel         channel;
 
-    private boolean issemi=false;
+    private boolean               issemi            = false;
 
     // private BufferedInputStream input;
 
@@ -55,9 +55,9 @@ public class DirectLogFetcher extends LogFetcher {
 
     public void start(SocketChannel channel) throws IOException {
         this.channel = channel;
-        String dbsemi= System.getProperty("db.semi");
+        String dbsemi = System.getProperty("db.semi");
-        if("1".equals(dbsemi)){
+        if ("1".equals(dbsemi)) {
-        	issemi=true;
+            issemi = true;
         }
         // 和mysql driver一样，提供buffer机制，提升读取binlog速度
         // this.input = new
@@ -112,12 +112,12 @@ public class DirectLogFetcher extends LogFetcher {
                 }
             }
 
-            //if mysql is in semi mode
+            // if mysql is in semi mode
-            if(issemi){
+            if (issemi) {
-	            //parse semi mark
+                // parse semi mark
-	            int semimark=getUint8(NET_HEADER_SIZE+1);
+                int semimark = getUint8(NET_HEADER_SIZE + 1);
-	            int semival=getUint8(NET_HEADER_SIZE+2);
+                int semival = getUint8(NET_HEADER_SIZE + 2);
-	            this.semival=semival;
+                this.semival = semival;
             }
 
             // The first packet is a multi-packet, concatenate the packets.
@@ -136,9 +136,9 @@ public class DirectLogFetcher extends LogFetcher {
             }
 
             // Preparing buffer variables to decoding.
-            if(issemi){
+            if (issemi) {
                 origin = NET_HEADER_SIZE + 3;
-            }else{
+            } else {
                 origin = NET_HEADER_SIZE + 1;
             }
             position = origin;