ATK-1275 and spell error (#2049)

yanhuqing666 · LUAgam · yanhuqing666 · commit f7b1ca022d94 · 2020-08-18T17:14:05.000+08:00
* set AutoCommit add debug log (#2043) * perf: add debug log * perf: add debug log * perf: add isDebugEnabled * ATK-1275 and spell error Co-authored-by: LUA <guoaomen@actionsky.com>
diff --git a/src/main/java/com/actiontech/dble/backend/mysql/nio/handler/MultiNodeHandler.java b/src/main/java/com/actiontech/dble/backend/mysql/nio/handler/MultiNodeHandler.java
@@ -142,7 +142,7 @@ protected boolean canResponse() {
         return false;
     }
 
-    protected void tryErrorFinished(boolean allEnd) {
+    void tryErrorFinished(boolean allEnd) {
         if (allEnd && !session.closed()) {
             // clear session resources,release all
             if (LOGGER.isDebugEnabled()) {
@@ -155,7 +155,7 @@ protected void tryErrorFinished(boolean allEnd) {
         }
     }
 
-    protected void clearSessionResources() {
+    private void clearSessionResources() {
         if (session.getSource().isAutocommit()) {
             session.closeAndClearResources(error);
         } else {
diff --git a/src/main/java/com/actiontech/dble/backend/mysql/nio/handler/transaction/AbstractCommitNodesHandler.java b/src/main/java/com/actiontech/dble/backend/mysql/nio/handler/transaction/AbstractCommitNodesHandler.java
@@ -21,7 +21,7 @@
 public abstract class AbstractCommitNodesHandler extends MultiNodeHandler implements CommitNodesHandler {
     protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractCommitNodesHandler.class);
     protected Set<BackendConnection> closedConnSet;
-    protected ImplictCommitHandler implictCommitHandler = null;
+    protected ImplicitCommitHandler implicitCommitHandler = null;
 
     public AbstractCommitNodesHandler(NonBlockingSession session) {
         super(session);
@@ -92,7 +92,7 @@ protected boolean checkClosedConn(BackendConnection conn) {
     }
 
     @Override
-    public void setImplictCommitHandler(ImplictCommitHandler implictCommitHandler) {
-        this.implictCommitHandler = implictCommitHandler;
+    public void setImplicitCommitHandler(ImplicitCommitHandler implicitCommitHandler) {
+        this.implicitCommitHandler = implicitCommitHandler;
     }
 }
diff --git a/src/main/java/com/actiontech/dble/backend/mysql/nio/handler/transaction/CommitNodesHandler.java b/src/main/java/com/actiontech/dble/backend/mysql/nio/handler/transaction/CommitNodesHandler.java
@@ -7,6 +7,6 @@
 
 public interface CommitNodesHandler {
     void commit();
-    void setImplictCommitHandler(ImplictCommitHandler handler);
+    void setImplicitCommitHandler(ImplicitCommitHandler handler);
     void clearResources();
 }
diff --git a/src/main/java/com/actiontech/dble/backend/mysql/nio/handler/transaction/ImplicitCommitHandler.java b/src/main/java/com/actiontech/dble/backend/mysql/nio/handler/transaction/ImplicitCommitHandler.java
@@ -5,6 +5,6 @@
 
 package com.actiontech.dble.backend.mysql.nio.handler.transaction;
 
-public interface ImplictCommitHandler {
+public interface ImplicitCommitHandler {
     void next();
 }
diff --git a/src/main/java/com/actiontech/dble/backend/mysql/nio/handler/transaction/normal/NormalCommitNodesHandler.java b/src/main/java/com/actiontech/dble/backend/mysql/nio/handler/transaction/normal/NormalCommitNodesHandler.java
@@ -8,7 +8,7 @@
 import com.actiontech.dble.backend.BackendConnection;
 import com.actiontech.dble.backend.mysql.nio.MySQLConnection;
 import com.actiontech.dble.backend.mysql.nio.handler.transaction.AbstractCommitNodesHandler;
-import com.actiontech.dble.backend.mysql.nio.handler.transaction.ImplictCommitHandler;
+import com.actiontech.dble.backend.mysql.nio.handler.transaction.ImplicitCommitHandler;
 import com.actiontech.dble.net.mysql.ErrorPacket;
 import com.actiontech.dble.route.RouteResultsetNode;
 import com.actiontech.dble.server.NonBlockingSession;
@@ -19,7 +19,7 @@ public class NormalCommitNodesHandler extends AbstractCommitNodesHandler {
     @Override
     public void commit() {
         if (session.getTargetCount() <= 0) {
-            if (implictCommitHandler == null && sendData == null) {
+            if (implicitCommitHandler == null && sendData == null) {
                 sendData = session.getOkByteArray();
             }
             cleanAndFeedback();
@@ -45,7 +45,7 @@ public void commit() {
     @Override
     public void clearResources() {
         sendData = null;
-        implictCommitHandler = null;
+        implicitCommitHandler = null;
         if (closedConnSet != null) {
             closedConnSet.clear();
         }
@@ -64,7 +64,7 @@ protected boolean executeCommit(MySQLConnection mysqlCon, int position) {
     @Override
     public void okResponse(byte[] ok, BackendConnection conn) {
         if (decrementToZero(conn)) {
-            if (implictCommitHandler == null && sendData == null) {
+            if (implicitCommitHandler == null && sendData == null) {
                 sendData = session.getOkByteArray();
             }
             cleanAndFeedback();
@@ -117,7 +117,7 @@ public void connectionClose(final BackendConnection conn, final String reason) {
 
     private void cleanAndFeedback() {
         byte[] send = sendData;
-        ImplictCommitHandler handler = implictCommitHandler;
+        ImplicitCommitHandler handler = implicitCommitHandler;
         // clear all resources
         session.clearResources(false);
         if (session.closed()) {
diff --git a/src/main/java/com/actiontech/dble/backend/mysql/nio/handler/transaction/xa/XACommitNodesHandler.java b/src/main/java/com/actiontech/dble/backend/mysql/nio/handler/transaction/xa/XACommitNodesHandler.java
@@ -103,7 +103,7 @@ public void clearResources() {
         backgroundCommitTimes = 0;
         participantLogEntry = null;
         sendData = OkPacket.OK;
-        implictCommitHandler = null;
+        implicitCommitHandler = null;
         xaOldThreadIds.clear();
         if (closedConnSet != null) {
             closedConnSet.clear();
diff --git a/src/main/java/com/actiontech/dble/server/NonBlockingSession.java b/src/main/java/com/actiontech/dble/server/NonBlockingSession.java
@@ -15,7 +15,7 @@
 import com.actiontech.dble.backend.mysql.nio.handler.query.DMLResponseHandler;
 import com.actiontech.dble.backend.mysql.nio.handler.query.impl.OutputHandler;
 import com.actiontech.dble.backend.mysql.nio.handler.transaction.CommitNodesHandler;
-import com.actiontech.dble.backend.mysql.nio.handler.transaction.ImplictCommitHandler;
+import com.actiontech.dble.backend.mysql.nio.handler.transaction.ImplicitCommitHandler;
 import com.actiontech.dble.backend.mysql.nio.handler.transaction.RollbackNodesHandler;
 import com.actiontech.dble.backend.mysql.nio.handler.transaction.normal.NormalCommitNodesHandler;
 import com.actiontech.dble.backend.mysql.nio.handler.transaction.normal.NormalRollbackNodesHandler;
@@ -658,9 +658,9 @@ public void commit() {
         commitHandler.commit();
     }
 
-    public void implictCommit(ImplictCommitHandler handler) {
+    public void implictCommit(ImplicitCommitHandler handler) {
         resetCommitNodesHandler();
-        commitHandler.setImplictCommitHandler(handler);
+        commitHandler.setImplicitCommitHandler(handler);
         commit();
     }
 
diff --git a/src/main/java/com/actiontech/dble/server/ServerConnection.java b/src/main/java/com/actiontech/dble/server/ServerConnection.java
@@ -7,7 +7,7 @@
 
 import com.actiontech.dble.DbleServer;
 import com.actiontech.dble.backend.BackendConnection;
-import com.actiontech.dble.backend.mysql.nio.handler.transaction.ImplictCommitHandler;
+import com.actiontech.dble.backend.mysql.nio.handler.transaction.ImplicitCommitHandler;
 import com.actiontech.dble.backend.mysql.nio.handler.transaction.savepoint.SavePointHandler;
 import com.actiontech.dble.backend.mysql.xa.TxState;
 import com.actiontech.dble.config.ErrorCode;
@@ -390,11 +390,15 @@ public void beginInTx(String stmt) {
         }
     }
 
-    public void commit(String logReason) {
+    public void commit(String logReason, boolean isSetAutoCommit) {
         if (txInterrupted) {
             writeErrMessage(ErrorCode.ER_YES, txInterruptMsg);
         } else {
             TxnLogHelper.putTxnLog(this, logReason);
+            if (isSetAutoCommit) {
+                //this must not used by session.commit();
+                this.setAutocommit(true);
+            }
             session.commit();
         }
     }
@@ -422,7 +426,7 @@ public void rollback() {
     void lockTable(String sql) {
         // except xa transaction
         if ((!isAutocommit() || isTxStart()) && session.getSessionXaID() == null) {
-            session.implictCommit(new ImplictCommitHandler() {
+            session.implictCommit(new ImplicitCommitHandler() {
                 @Override
                 public void next() {
                     doLockTable(sql);
diff --git a/src/main/java/com/actiontech/dble/server/handler/CommitHandler.java b/src/main/java/com/actiontech/dble/server/handler/CommitHandler.java
@@ -12,6 +12,6 @@ private CommitHandler() {
     }
 
     public static void handle(String stmt, ServerConnection c) {
-        c.commit(stmt);
+        c.commit(stmt, false);
     }
 }
diff --git a/src/main/java/com/actiontech/dble/server/handler/SetHandler.java b/src/main/java/com/actiontech/dble/server/handler/SetHandler.java
@@ -1,8 +1,8 @@
 /*
-* Copyright (C) 2016-2019 ActionTech.
-* based on code by MyCATCopyrightHolder Copyright (c) 2013, OpenCloudDB/MyCAT.
-* License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher.
-*/
+ * Copyright (C) 2016-2019 ActionTech.
+ * based on code by MyCATCopyrightHolder Copyright (c) 2013, OpenCloudDB/MyCAT.
+ * License: http://www.gnu.org/licenses/gpl.html GPL version 2 or higher.
+ */
 package com.actiontech.dble.server.handler;
 
 import com.actiontech.dble.DbleServer;
@@ -27,6 +27,8 @@
 import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSetTransactionStatement;
 import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
 import com.alibaba.druid.sql.parser.SQLStatementParser;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.sql.SQLSyntaxErrorException;
 import java.util.ArrayList;
@@ -42,6 +44,8 @@
  * @author zhuam
  */
 public final class SetHandler {
+    private static final Logger LOGGER = LoggerFactory.getLogger(SetHandler.class);
+
     private SetHandler() {
     }
 
@@ -525,6 +529,9 @@ private static boolean handleSingleCharsetClient(ServerConnection c, SQLExpr val
     }
 
     private static boolean handleSingleAutocommit(String stmt, ServerConnection c, SQLExpr valueExpr) {
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug("set AutoCommit start:{}", c.toString());
+        }
         Boolean switchStatus = isSwitchOn(valueExpr);
         if (switchStatus == null) {
             c.writeErrMessage(ErrorCode.ER_WRONG_TYPE_FOR_VAR, "Incorrect argument type to variable 'AUTOCOMMIT'");
@@ -533,8 +540,8 @@ private static boolean handleSingleAutocommit(String stmt, ServerConnection c, S
             if (c.isAutocommit()) {
                 c.write(c.writeToBuffer(OkPacket.OK, c.allocate()));
             } else {
-                c.commit("commit[because of " + stmt + "]");
-                c.setAutocommit(true);
+                // commit and set Autocommit
+                c.commit("commit[because of " + stmt + "]", true);
             }
         } else {
             if (c.isAutocommit()) {
@@ -543,6 +550,9 @@ private static boolean handleSingleAutocommit(String stmt, ServerConnection c, S
             }
             c.write(c.writeToBuffer(AC_OFF, c.allocate()));
         }
+        if (LOGGER.isDebugEnabled()) {
+            LOGGER.debug("set AutoCommit end:{}", c.toString());
+        }
         return true;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ protected boolean canResponse() {`
`142`	`142`	`return false;`
`143`	`143`	`}`
`144`	`144`
`145`		`- protected void tryErrorFinished(boolean allEnd) {`
	`145`	`+ void tryErrorFinished(boolean allEnd) {`
`146`	`146`	`if (allEnd && !session.closed()) {`
`147`	`147`	`// clear session resources,release all`
`148`	`148`	`if (LOGGER.isDebugEnabled()) {`
`@@ -155,7 +155,7 @@ protected void tryErrorFinished(boolean allEnd) {`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`
`158`		`- protected void clearSessionResources() {`
	`158`	`+ private void clearSessionResources() {`
`159`	`159`	`if (session.getSource().isAutocommit()) {`
`160`	`160`	`session.closeAndClearResources(error);`
`161`	`161`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@`
`21`	`21`	`public abstract class AbstractCommitNodesHandler extends MultiNodeHandler implements CommitNodesHandler {`
`22`	`22`	`protected static final Logger LOGGER = LoggerFactory.getLogger(AbstractCommitNodesHandler.class);`
`23`	`23`	`protected Set<BackendConnection> closedConnSet;`
`24`		`- protected ImplictCommitHandler implictCommitHandler = null;`
	`24`	`+ protected ImplicitCommitHandler implicitCommitHandler = null;`
`25`	`25`
`26`	`26`	`public AbstractCommitNodesHandler(NonBlockingSession session) {`
`27`	`27`	`super(session);`
`@@ -92,7 +92,7 @@ protected boolean checkClosedConn(BackendConnection conn) {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`@Override`
`95`		`- public void setImplictCommitHandler(ImplictCommitHandler implictCommitHandler) {`
`96`		`- this.implictCommitHandler = implictCommitHandler;`
	`95`	`+ public void setImplicitCommitHandler(ImplicitCommitHandler implicitCommitHandler) {`
	`96`	`+ this.implicitCommitHandler = implicitCommitHandler;`
`97`	`97`	`}`
`98`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`
`8`	`8`	`public interface CommitNodesHandler {`
`9`	`9`	`void commit();`
`10`		`- void setImplictCommitHandler(ImplictCommitHandler handler);`
	`10`	`+ void setImplicitCommitHandler(ImplicitCommitHandler handler);`
`11`	`11`	`void clearResources();`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,6 @@`
`5`	`5`
`6`	`6`	`package com.actiontech.dble.backend.mysql.nio.handler.transaction;`
`7`	`7`
`8`		`-public interface ImplictCommitHandler {`
	`8`	`+public interface ImplicitCommitHandler {`
`9`	`9`	`void next();`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,6 @@ private CommitHandler() {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public static void handle(String stmt, ServerConnection c) {`
`15`		`- c.commit(stmt);`
	`15`	`+ c.commit(stmt, false);`
`16`	`16`	`}`
`17`	`17`	`}`