database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

branch-2.1: [fix](Prepared Statment) Fix exec prepared insert stmt in non master error (#48689) (#52265)

Browse Source 
backport: https://github.com/apache/doris/pull/48689

Co-authored-by: Lijia Liu <liutang123@yeah.net>
This commit is contained in:
James
2025-06-28 09:57:53 +08:00
committed by GitHub
parent f0ce208e68
commit 307c047377
8 changed files with 85 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/PrepareCommand.java
View File

@ -109,7 +109,7 @@ public class PrepareCommand extends Command {
}
ctx.addPreparedStatementContext(name,
new PreparedStatementContext(this, ctx, ctx.getStatementContext(), name));
if (ctx.getCommand() == MysqlCommand.COM_STMT_PREPARE) {
if (ctx.getCommand() == MysqlCommand.COM_STMT_PREPARE && !ctx.isProxy()) {
executor.sendStmtPrepareOK(Integer.parseInt(name), labels);
}
}

7
fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
View File

@ -69,6 +69,8 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import io.netty.util.concurrent.FastThreadLocal;
import lombok.Getter;
import lombok.Setter;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@ -76,6 +78,7 @@ import org.json.JSONObject;
import org.xnio.StreamConnection;
import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@ -239,6 +242,10 @@ public class ConnectContext {
// it's default thread-safe
private boolean isProxy = false;
@Getter
@Setter
private ByteBuffer prepareExecuteBuffer;
private MysqlHandshakePacket mysqlHandshakePacket;
public void setUserQueryTimeout(int queryTimeout) {

28
fe/fe-core/src/main/java/org/apache/doris/qe/ConnectProcessor.java
View File

@ -61,6 +61,7 @@ import org.apache.doris.nereids.parser.Dialect;
import org.apache.doris.nereids.parser.NereidsParser;
import org.apache.doris.nereids.stats.StatsErrorEstimator;
import org.apache.doris.nereids.trees.plans.commands.ExplainCommand;
import org.apache.doris.nereids.trees.plans.commands.PrepareCommand;
import org.apache.doris.nereids.trees.plans.logical.LogicalPlan;
import org.apache.doris.nereids.trees.plans.logical.LogicalSqlCache;
import org.apache.doris.plugin.DialectConverterPlugin;
@ -87,6 +88,7 @@ import org.apache.thrift.TException;
import java.io.IOException;
import java.io.StringReader;
import java.nio.ByteBuffer;
import java.nio.ByteOrder;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@ -732,8 +734,24 @@ public abstract class ConnectProcessor {
UUID uuid = UUID.randomUUID();
queryId = new TUniqueId(uuid.getMostSignificantBits(), uuid.getLeastSignificantBits());
}
executor.execute(queryId);
if (request.isSetPrepareExecuteBuffer()) {
ctx.setCommand(MysqlCommand.COM_STMT_PREPARE);
executor.execute();
ctx.setCommand(MysqlCommand.COM_STMT_EXECUTE);
String preparedStmtId = executor.getPrepareStmtName();
PreparedStatementContext preparedStatementContext = ctx.getPreparedStementContext(preparedStmtId);
if (preparedStatementContext == null) {
if (LOG.isDebugEnabled()) {
LOG.debug("Something error, just support nereids preparedStmtId:{}", preparedStmtId);
}
throw new RuntimeException("Prepare failed when proxy execute");
}
handleExecute(preparedStatementContext.command, Long.parseLong(preparedStmtId),
preparedStatementContext,
ByteBuffer.wrap(request.getPrepareExecuteBuffer()).order(ByteOrder.LITTLE_ENDIAN), queryId);
} else {
executor.execute(queryId);
}
} catch (IOException e) {
// Client failed.
LOG.warn("Process one query failed because IOException: ", e);
@ -796,4 +814,10 @@ public abstract class ConnectProcessor {
throw new TException(e.getMessage());
}
}
protected void handleExecute(PrepareCommand prepareCommand, long stmtId, PreparedStatementContext prepCtx,
ByteBuffer packetBuf, TUniqueId queryId) {
throw new NotSupportedException("Just MysqlConnectProcessor support execute");
}
}

7
fe/fe-core/src/main/java/org/apache/doris/qe/MasterOpExecutor.java
View File

@ -23,6 +23,7 @@ import org.apache.doris.catalog.Env;
import org.apache.doris.common.ClientPool;
import org.apache.doris.common.DdlException;
import org.apache.doris.common.ErrorCode;
import org.apache.doris.mysql.MysqlCommand;
import org.apache.doris.thrift.FrontendService;
import org.apache.doris.thrift.TExpr;
import org.apache.doris.thrift.TExprNode;
@ -183,6 +184,12 @@ public class MasterOpExecutor {
if (null != ctx.queryId()) {
params.setQueryId(ctx.queryId());
}
if (ctx.getCommand() == MysqlCommand.COM_STMT_EXECUTE) {
if (null != ctx.getPrepareExecuteBuffer()) {
params.setPrepareExecuteBuffer(ctx.getPrepareExecuteBuffer());
}
}
return params;
}

28
fe/fe-core/src/main/java/org/apache/doris/qe/MysqlConnectProcessor.java
View File

@ -46,6 +46,7 @@ import org.apache.doris.nereids.trees.expressions.literal.Literal;
import org.apache.doris.nereids.trees.plans.PlaceholderId;
import org.apache.doris.nereids.trees.plans.commands.ExecuteCommand;
import org.apache.doris.nereids.trees.plans.commands.PrepareCommand;
import org.apache.doris.thrift.TUniqueId;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
@ -170,7 +171,18 @@ public class MysqlConnectProcessor extends ConnectProcessor {
}
}
private void handleExecute(PrepareCommand prepareCommand, long stmtId, PreparedStatementContext prepCtx) {
private String getHexStr(ByteBuffer packetBuf) {
byte[] bytes = packetBuf.array();
StringBuilder hex = new StringBuilder();
for (int i = packetBuf.position(); i < packetBuf.limit(); ++i) {
hex.append(String.format("%02X ", bytes[i]));
}
return hex.toString();
}
@Override
protected void handleExecute(PrepareCommand prepareCommand, long stmtId, PreparedStatementContext prepCtx,
ByteBuffer packetBuf, TUniqueId queryId) {
int paramCount = prepareCommand.placeholderCount();
LOG.debug("execute prepared statement {}, paramCount {}", stmtId, paramCount);
// null bitmap
@ -178,6 +190,12 @@ public class MysqlConnectProcessor extends ConnectProcessor {
try {
StatementContext statementContext = prepCtx.statementContext;
if (paramCount > 0) {
if (LOG.isDebugEnabled()) {
LOG.debug("execute param buf: {}, array: {}", packetBuf, getHexStr(packetBuf));
}
if (!ctx.isProxy()) {
ctx.setPrepareExecuteBuffer(packetBuf.duplicate());
}
byte[] nullbitmapData = new byte[(paramCount + 7) / 8];
packetBuf.get(nullbitmapData);
// new_params_bind_flag
@ -218,7 +236,11 @@ public class MysqlConnectProcessor extends ConnectProcessor {
stmt.setOrigStmt(prepareCommand.getOriginalStmt());
executor = new StmtExecutor(ctx, stmt);
ctx.setExecutor(executor);
executor.execute();
if (null != queryId) {
executor.execute(queryId);
} else {
executor.execute();
}
if (ctx.getSessionVariable().isEnablePreparedStmtAuditLog()) {
stmtStr = executeStmt.toSql();
stmtStr = stmtStr + " /*originalSql = " + prepareCommand.getOriginalStmt().originStmt + "*/";
@ -266,7 +288,7 @@ public class MysqlConnectProcessor extends ConnectProcessor {
"msg: Not supported such prepared statement");
return;
}
handleExecute(preparedStatementContext.command, stmtId, preparedStatementContext);
handleExecute(preparedStatementContext.command, stmtId, preparedStatementContext, packetBuf, null);
}
}

14
fe/fe-core/src/main/java/org/apache/doris/qe/StmtExecutor.java
View File

@ -143,6 +143,7 @@ import org.apache.doris.nereids.exceptions.ParseException;
import org.apache.doris.nereids.glue.LogicalPlanAdapter;
import org.apache.doris.nereids.minidump.MinidumpUtils;
import org.apache.doris.nereids.parser.NereidsParser;
import org.apache.doris.nereids.trees.expressions.Placeholder;
import org.apache.doris.nereids.trees.plans.commands.Command;
import org.apache.doris.nereids.trees.plans.commands.CreateTableCommand;
import org.apache.doris.nereids.trees.plans.commands.DeleteFromCommand;
@ -269,6 +270,7 @@ public class StmtExecutor {
private boolean isCached;
private String stmtName;
private StatementBase prepareStmt = null;
private String prepareStmtName; // for prox
private String mysqlLoadId;
// Distinguish from prepare and execute command
private boolean isExecuteStmt = false;
@ -682,8 +684,12 @@ public class StmtExecutor {
}
long stmtId = Config.prepared_stmt_start_id > 0
? Config.prepared_stmt_start_id : context.getPreparedStmtId();
logicalPlan = new PrepareCommand(String.valueOf(stmtId),
logicalPlan, statementContext.getPlaceholders(), originStmt);
this.prepareStmtName = String.valueOf(stmtId);
// When proxy executing, this.statementContext is created in constructor.
// But context.statementContext is created in LogicalPlanBuilder.
List<Placeholder> placeholders = context == null
? statementContext.getPlaceholders() : context.getStatementContext().getPlaceholders();
logicalPlan = new PrepareCommand(prepareStmtName, logicalPlan, placeholders, originStmt);
}
// when we in transaction mode, we only support insert into command and transaction command
if (context.isTxnModel()) {
@ -3488,4 +3494,8 @@ public class StmtExecutor {
context.getMysqlChannel().sendOnePacket(byteBuffer);
}
}
public String getPrepareStmtName() {
return this.prepareStmtName;
}
}