MB-70998 Merge remote-tracking branch 'origin/trinity' into morpheus

Change-Id: I878396dbbb72df89fa7d17f1da49a363cffece49

Author: miaobingjie

algebra/algebra.go

@@ -68,7 +68,7 @@ type Statement interface {
 	/*
 		Returns the parameter count, for AutoPrepare and other purposes
 	*/
-	Params() int
+	ParamsCount() int
 
 	/*
 		Returns the optimizer hints

algebra/base.go

@@ -76,7 +76,7 @@ func (this *statementBase) SetParamsCount(params int) {
 /*
 does it have parameters?
 */
-func (this *statementBase) Params() int {
+func (this *statementBase) ParamsCount() int {
 	return this.paramCount
 }
 

algebra/statement_util.go

@@ -0,0 +1,28 @@
+//  Copyright 2026-Present Couchbase, Inc.
+//
+//  Use of this software is governed by the Business Source License included
+//  in the file licenses/BSL-Couchbase.txt.  As of the Change Date specified
+//  in that file, in accordance with the Business Source License, use of this
+//  software will be governed by the Apache License, Version 2.0, included in
+//  the file licenses/APL2.txt.
+
+package algebra
+
+/*
+ * With auto prepare, determine whether a statement can skip being prepared
+ */
+func CanSkipAutoPrepare(stmt Statement) bool {
+	switch stmt.(type) {
+	case *InferKeyspace, *InferExpression, *Explain, *ExplainFunction, *Prepare, *Execute,
+		*UpdateStatistics,
+		*CreateIndex, *DropIndex, *BuildIndexes, *AlterIndex, *CreatePrimaryIndex,
+		*CreateScope, *DropScope,
+		*CreateCollection, *DropCollection, *FlushCollection,
+		*GrantRole, *RevokeRole,
+		*CreateFunction, *DropFunction, *ExecuteFunction,
+		*StartTransaction, *CommitTransaction, *RollbackTransaction, *Savepoint, *TransactionIsolation,
+		*CreateSequence, *DropSequence, *AlterSequence:
+		return true
+	}
+	return false
+}

prepareds/prepareds.go

@@ -440,7 +440,7 @@ func AddAutoPreparePlan(stmt algebra.Statement, prepared *plan.Prepared) bool {
 
 	// we also don't cache anything that might depend on placeholders
 	// (you should be using prepared statements for that anyway!)
-	if stmt.Params() > 0 {
+	if stmt.ParamsCount() > 0 {
 		return false
 	}
 
@@ -645,7 +645,11 @@ func (prepareds *preparedCache) getPrepared(preparedName string, queryContext st
 		// without blocking the whole prepared cacheline
 		// locking will occur at adding time: both requests will insert,
 		// the last wins
-		if (!good || prepared.PreparedTime().IsZero()) && !metaCheck {
+		if metaCheck {
+			if !good {
+				prepared = nil
+			}
+		} else if !good || prepared.PreparedTime().IsZero() {
 			prepared, err = reprepare(prepared, nil, phaseTime, log)
 			if err == nil {
 				err = AddPrepared(prepared)

server/server.go

@@ -1837,7 +1837,7 @@ func (this *Server) getPrepared(request Request, context *execution.Context) (*p
 	positionalArgs := request.PositionalArgs()
 	dsContext := context
 	autoExecute := request.AutoExecute() == value.TRUE
-	if len(namedArgs) > 0 || len(positionalArgs) > 0 || autoExecute {
+	if autoExecute {
 		autoPrepare = false
 	}
 
@@ -1874,6 +1874,14 @@ func (this *Server) getPrepared(request Request, context *execution.Context) (*p
 			}
 		}
 
+		if autoPrepare {
+			if stmt.ParamsCount() > 0 {
+				autoPrepare = false
+			} else if algebra.CanSkipAutoPrepare(stmt) {
+				autoPrepare = false
+			}
+		}
+
 		isPrepare := false
 		if _, ok := stmt.(*algebra.Prepare); ok {
 			isPrepare = true