Fix panic cause miss stmt info and log (matrixorigin#19369)

fengttt · Oct 18, 2024 · 5c9094b · 5c9094b
1 parent f9b8368
commit 5c9094b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/pkg/frontend/mysql_cmd_executor.go b/pkg/frontend/mysql_cmd_executor.go
@@ -3057,6 +3057,8 @@ func ExecRequest(ses *Session, execCtx *ExecCtx, req *Request) (resp *Response,
 			} else {
 				resp = NewGeneralErrorResponse(COM_QUERY, ses.txnHandler.GetServerStatus(), moe)
 			}
+			// log the query's statement and error info.
+			logStatementStatus(execCtx.reqCtx, ses, execCtx.stmt, fail, err)
 		}
 	}()
 	ses.EnterFPrint(FPExecRequest)

diff --git a/pkg/frontend/util.go b/pkg/frontend/util.go
@@ -524,8 +524,9 @@ func logStatementStringStatus(ctx context.Context, ses FeSession, stmtStr string
 
 	// pls make sure: NO ONE use the ses.tStmt after EndStatement
 	if !ses.IsBackgroundSession() {
-		stmt := ses.GetStmtInfo()
-		stmt.EndStatement(ctx, err, ses.SendRows(), outBytes, outPacket)
+		if stmt := ses.GetStmtInfo(); stmt != nil {
+			stmt.EndStatement(ctx, err, ses.SendRows(), outBytes, outPacket)
+		}
 	}
 	// need just below EndStatement
 	ses.SetTStmt(nil)