chenjl/canal
1
0
Fork 0
mirror of https://github.com/alibaba/canal.git synced 2026-11-04 00:30:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed semi sync format & refactor

Browse Source
This commit is contained in:
agapple
2017-12-27 16:53:09 +08:00
parent c6f4de9f88
commit 9595e6abbd
7 changed files with 81 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/LogDecoder.java
View File

@@ -108,8 +108,10 @@ public final class LogDecoder {
event.setSemival(buffer.semival); event.setSemival(buffer.semival);
} }
} catch (IOException e) { } 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; throw e;
} finally { } finally {
buffer.limit(limit); /* Restore limit */ buffer.limit(limit); /* Restore limit */

7
dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/LogEvent.java
View File

@@ -361,7 +361,12 @@ public abstract class LogEvent {
protected final LogHeader header; 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; protected int semival;

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

@@ -16,21 +16,17 @@ public class MariaGtidLogEvent extends IgnorableLogEvent {
private long gtid; private long gtid;
/** /**
* <pre>
* mariadb gtidlog event format * 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){ public MariaGtidLogEvent(LogHeader header, LogBuffer buffer, FormatDescriptionLogEvent descriptionEvent){
@@ -43,5 +39,4 @@ public class MariaGtidLogEvent extends IgnorableLogEvent {
return gtid; return gtid;
} }
} }

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

@@ -10,13 +10,12 @@ import com.alibaba.otter.canal.parse.driver.mysql.utils.ByteHelper;
/** /**
* semi ack command * semi ack command
* @author amos_chen
* *
* @author amos_chen
*/ */
public class SemiAckCommandPacket extends CommandPacket { public class SemiAckCommandPacket extends CommandPacket {
public long binlogPosition; public long binlogPosition;
public String binlogFileName; public String binlogFileName;
public SemiAckCommandPacket(){ public SemiAckCommandPacket(){
@@ -25,8 +24,6 @@ public class SemiAckCommandPacket extends CommandPacket {
@Override @Override
public void fromBytes(byte[] data) throws IOException { public void fromBytes(byte[] data) throws IOException {
// TODO Auto-generated method stub
} }
/** /**

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

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