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 issue #4308 , support query_log_event for maraiadb 10.10.1

Browse Source
This commit is contained in:
jianghang.loujh
2022-09-01 17:35:29 +08:00
parent 7585d9c98b
commit 92758b8c87
1 changed files with 33 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
dbsync/src/main/java/com/taobao/tddl/dbsync/binlog/event/QueryLogEvent.java
View File

@@ -603,6 +603,13 @@ public class QueryLogEvent extends LogEvent {
*/ */
public static final int Q_HRNOW = 128; public static final int Q_HRNOW = 128;
/**
* Support MariaDB 10.10.1
*/
public static final int Q_XID = 129;
public static final int Q_GTID_FLAGS3 = 130;
private final void unpackVariables(LogBuffer buffer, final int end) throws IOException { private final void unpackVariables(LogBuffer buffer, final int end) throws IOException {
int code = -1; int code = -1;
try { try {
@@ -613,7 +620,7 @@ public class QueryLogEvent extends LogEvent {
break; break;
case Q_SQL_MODE_CODE: case Q_SQL_MODE_CODE:
sql_mode = buffer.getLong64(); // QQ: Fix when sql_mode sql_mode = buffer.getLong64(); // QQ: Fix when sql_mode
// is ulonglong // is ulonglong
break; break;
case Q_CATALOG_NZ_CODE: case Q_CATALOG_NZ_CODE:
catalog = buffer.getString(); catalog = buffer.getString();
@@ -701,6 +708,23 @@ public class QueryLogEvent extends LogEvent {
// int when_sec_part = buffer.getUint24(); // int when_sec_part = buffer.getUint24();
buffer.forward(3); buffer.forward(3);
break; break;
case Q_XID:
// xid= uint8korr(pos);
buffer.forward(8);
case Q_GTID_FLAGS3:
// gtid_flags_extra= *pos++;
// if (gtid_flags_extra & (Gtid_log_event::FL_COMMIT_ALTER_E1 |
// Gtid_log_event::FL_ROLLBACK_ALTER_E1)) {
// sa_seq_no = uint8korr(pos);
// pos+= 8;
// }
int gtid_flags_extra = buffer.getUint8();
final int FL_COMMIT_ALTER_E1= 4;
final int FL_ROLLBACK_ALTER_E1= 8;
if ((gtid_flags_extra & (FL_COMMIT_ALTER_E1 | FL_ROLLBACK_ALTER_E1))> 0) {
buffer.forward(8);
}
default: default:
/* /*
* That's why you must write status vars in growing * That's why you must write status vars in growing
@@ -740,16 +764,22 @@ public class QueryLogEvent extends LogEvent {
return "Q_TABLE_MAP_FOR_UPDATE_CODE"; return "Q_TABLE_MAP_FOR_UPDATE_CODE";
case Q_MASTER_DATA_WRITTEN_CODE: case Q_MASTER_DATA_WRITTEN_CODE:
return "Q_MASTER_DATA_WRITTEN_CODE"; return "Q_MASTER_DATA_WRITTEN_CODE";
case Q_UPDATED_DB_NAMES: case Q_INVOKER:
return "Q_UPDATED_DB_NAMES"; return "case Q_INVOKER";
case Q_MICROSECONDS: case Q_MICROSECONDS:
return "Q_MICROSECONDS"; return "Q_MICROSECONDS";
case Q_UPDATED_DB_NAMES:
return "Q_UPDATED_DB_NAMES";
case Q_EXPLICIT_DEFAULTS_FOR_TIMESTAMP:
return "Q_EXPLICIT_DEFAULTS_FOR_TIMESTAMP";
case Q_DDL_LOGGED_WITH_XID: case Q_DDL_LOGGED_WITH_XID:
return "Q_DDL_LOGGED_WITH_XID"; return "Q_DDL_LOGGED_WITH_XID";
case Q_DEFAULT_COLLATION_FOR_UTF8MB4: case Q_DEFAULT_COLLATION_FOR_UTF8MB4:
return "Q_DEFAULT_COLLATION_FOR_UTF8MB4"; return "Q_DEFAULT_COLLATION_FOR_UTF8MB4";
case Q_SQL_REQUIRE_PRIMARY_KEY: case Q_SQL_REQUIRE_PRIMARY_KEY:
return "Q_SQL_REQUIRE_PRIMARY_KEY"; return "Q_SQL_REQUIRE_PRIMARY_KEY";
case Q_HRNOW:
return "Q_HRNOW";
} }
return "CODE#" + code; return "CODE#" + code;
} }