This is an automated email from the ASF dual-hosted git repository.
morrysnow pushed a commit to branch branch-3.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-3.1 by this push:
new 7bc12995851 branch-3.1: [fix](prepare statement)Use client prepare
statement when placeholders are more than 65536. #54568 (#54664)
7bc12995851 is described below
commit 7bc129958518bf495ca521c08292abb9328f5186
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu Aug 14 11:52:50 2025 +0800
branch-3.1: [fix](prepare statement)Use client prepare statement when
placeholders are more than 65536. #54568 (#54664)
Cherry-picked from #54568
Co-authored-by: James <[email protected]>
---
.../doris/nereids/trees/plans/commands/PrepareCommand.java | 6 ++++++
regression-test/suites/prepared_stmt_p0/prepared_stmt.groovy | 12 +++++++++++-
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/PrepareCommand.java
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/PrepareCommand.java
index 663e6c94323..f4dbebd3126 100644
---
a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/PrepareCommand.java
+++
b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/commands/PrepareCommand.java
@@ -19,6 +19,8 @@ package org.apache.doris.nereids.trees.plans.commands;
import org.apache.doris.analysis.StmtType;
import org.apache.doris.catalog.Column;
+import org.apache.doris.common.ErrorCode;
+import org.apache.doris.common.ErrorReport;
import org.apache.doris.mysql.MysqlCommand;
import org.apache.doris.nereids.StatementContext;
import org.apache.doris.nereids.trees.expressions.Placeholder;
@@ -50,6 +52,7 @@ public class PrepareCommand extends Command {
private final List<Placeholder> placeholders = new ArrayList<>();
private final LogicalPlan logicalPlan;
+ private final int maxPlaceholderCount = 65536;
private final String name;
@@ -106,6 +109,9 @@ public class PrepareCommand extends Command {
@Override
public void run(ConnectContext ctx, StmtExecutor executor) throws
Exception {
List<String> labels = getLabels();
+ if (labels.size() >= maxPlaceholderCount) {
+ ErrorReport.reportAnalysisException(ErrorCode.ERR_PS_MANY_PARAM);
+ }
StatementContext statementContext = ctx.getStatementContext();
statementContext.setPrepareStage(true);
List<Slot> slots;
diff --git a/regression-test/suites/prepared_stmt_p0/prepared_stmt.groovy
b/regression-test/suites/prepared_stmt_p0/prepared_stmt.groovy
index 353b4b4552f..80058e72894 100644
--- a/regression-test/suites/prepared_stmt_p0/prepared_stmt.groovy
+++ b/regression-test/suites/prepared_stmt_p0/prepared_stmt.groovy
@@ -63,7 +63,17 @@ suite("test_prepared_stmt", "nonConcurrent") {
sql "set enable_fallback_to_original_planner = false"
sql """set global enable_server_side_prepared_statement = true"""
- def stmt_read = prepareStatement "select * from ${tableName} where k1
= ? order by k1"
+ int count = 65536;
+ StringBuilder sb = new StringBuilder();
+ sb.append("?");
+ for (int i = 1; i < count; i++) {
+ sb.append(", ?");
+ }
+ String sqlWithTooManyPlaceholder = sb.toString();
+ def stmt_read = prepareStatement "select * from ${tableName} where k1
in ${sqlWithTooManyPlaceholder}"
+ assertEquals(com.mysql.cj.jdbc.ClientPreparedStatement,
stmt_read.class)
+
+ stmt_read = prepareStatement "select * from ${tableName} where k1 = ?
order by k1"
assertEquals(com.mysql.cj.jdbc.ServerPreparedStatement,
stmt_read.class)
stmt_read.setInt(1, 1231)
qe_select0 stmt_read
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
