mirror/dble
1
0
Fork 0
mirror of https://github.com/actiontech/dble.git synced 2026-01-05 20:30:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3588 from actiontech/1983/3.22.07

Browse Source 
[inner-1983] fix: in rwSplit, load data failure (cherry pick)
This commit is contained in:
wenyh
2023-01-11 11:07:14 +08:00
committed by GitHub
parent 19642b407f 3ed29749e2
commit e0d85eea6b
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/actiontech/dble/services/mysqlsharding/LoadDataProtoHandlerImpl.java
View File

@@ -51,7 +51,8 @@ public class LoadDataProtoHandlerImpl implements ProtoHandler {
return mySQLProtoHandler;
}
private boolean isEndOfDataFile(byte[] data) {
public static boolean isEndOfDataFile(byte[] data) {
// Load Data's empty package
return (data.length == 4 && data[0] == 0 && data[1] == 0 && data[2] == 0);
}
}

8
src/main/java/com/actiontech/dble/services/rwsplit/RWSplitService.java
View File

@@ -26,6 +26,7 @@ import com.actiontech.dble.server.variables.MysqlVariable;
import com.actiontech.dble.server.variables.VariableType;
import com.actiontech.dble.services.BusinessService;
import com.actiontech.dble.services.mysqlauthenticate.MySQLChangeUserService;
import com.actiontech.dble.services.mysqlsharding.LoadDataProtoHandlerImpl;
import com.actiontech.dble.services.rwsplit.handle.PreparedStatementHolder;
import com.actiontech.dble.singleton.TraceManager;
import com.actiontech.dble.singleton.TsQueriesCounter;
@@ -115,7 +116,12 @@ public class RWSplitService extends BusinessService<SingleDbGroupUserConfig> {
protected boolean beforeHandlingTask(@NotNull ServiceTask task) {
TraceManager.sessionStart(this, "rwSplit-server-start");
if (task.getType() == ServiceTaskType.NORMAL) {
final int packetType = ((NormalServiceTask) task).getPacketType();
NormalServiceTask task0 = ((NormalServiceTask) task);
// Filter Load Data's empty package
if (this.isInLoadData() && LoadDataProtoHandlerImpl.isEndOfDataFile(task0.getOrgData()))
return true;
final int packetType = task0.getPacketType();
if (packetType == MySQLPacket.COM_STMT_PREPARE || packetType == MySQLPacket.COM_STMT_EXECUTE || packetType == MySQLPacket.COM_QUERY) {
StatisticListener.getInstance().record(session, r -> r.onFrontendSqlStart());
}