Merge pull request #2392 from WhaleCloud-platform/#2390

#2390 load data local过程中出现错误，应用直接报Lost connection to MySQL server dur…
MyCATApache · Jan 2, 2020 · f929f96 · f929f96
2 parents 97c7a15 + 7fac07e
commit f929f96
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/src/main/java/io/mycat/backend/mysql/nio/handler/MultiNodeQueryHandler.java b/src/main/java/io/mycat/backend/mysql/nio/handler/MultiNodeQueryHandler.java
@@ -175,6 +175,10 @@ protected void reset(int initCount) {
 		this.execCount = 0;
 		this.netInBytes = 0;
 		this.netOutBytes = 0;
+
+		if (rrs.isLoadData()) {
+			packetId = session.getSource().getLoadDataInfileHandler().getLastPackId();
+		}
 	}
 
 	public NonBlockingSession getSession() {
@@ -345,15 +349,11 @@ public void okResponse(byte[] data, BackendConnection conn) {
 
 				lock.lock();
 				try {
+					ok.packetId = ++packetId;// OK_PACKET
 					if (rrs.isLoadData()) {
-						byte lastPackId = source.getLoadDataInfileHandler()
-								.getLastPackId();
-						ok.packetId = ++lastPackId;// OK_PACKET
 						ok.message = ("Records: " + affectedRows + "  Deleted: 0  Skipped: 0  Warnings: 0")
 								.getBytes();// 此处信息只是为了控制台给人看的
 						source.getLoadDataInfileHandler().clear();
-					} else {
-						ok.packetId = ++packetId;// OK_PACKET
 					}
 
 					ok.affectedRows = affectedRows;

diff --git a/src/main/java/io/mycat/backend/mysql/nio/handler/SingleNodeHandler.java b/src/main/java/io/mycat/backend/mysql/nio/handler/SingleNodeHandler.java
@@ -176,7 +176,12 @@ public void execute() throws Exception {
 		startTime=System.currentTimeMillis();
 		ServerConnection sc = session.getSource();
 		this.isRunning = true;
-		this.packetId = 0;
+		if (rrs.isLoadData()) {
+			this.packetId = session.getSource().getLoadDataInfileHandler().getLastPackId();
+		} else {
+			this.packetId = 0;
+		}
+
 		final BackendConnection conn = session.getTarget(node);
 		LOGGER.debug("rrs.getRunOnSlave() " + rrs.getRunOnSlaveDebugInfo());
 		node.setRunOnSlave(rrs.getRunOnSlave());	// 实现 master/slave注解
@@ -327,8 +332,8 @@ public void okResponse(byte[] data, BackendConnection conn) {
 			ok.read(data);
             boolean isCanClose2Client =(!rrs.isCallStatement()) ||(rrs.isCallStatement() &&!rrs.getProcedure().isResultSimpleValue());
 			if (rrs.isLoadData()) {				
-				byte lastPackId = source.getLoadDataInfileHandler().getLastPackId();
-				ok.packetId = ++lastPackId;// OK_PACKET
+				// byte lastPackId = source.getLoadDataInfileHandler().getLastPackId();
+				ok.packetId = ++packetId;// OK_PACKET
 				source.getLoadDataInfileHandler().clear();
 
 			} else if (isCanClose2Client) {