fix(spanner): multiplexed_session_previous_transaction_id is not supported in the request for a non multiplexed session (#11626)

rahul2393 · web-flow · commit a940befed09b · 2025-02-21T11:18:09.000+05:30
diff --git a/spanner/transaction.go b/spanner/transaction.go
@@ -1538,14 +1538,19 @@ func (t *ReadWriteTransaction) setSessionEligibilityForLongRunning(sh *sessionHa
 }
 
 func beginTransaction(ctx context.Context, opts transactionBeginOptions) (transactionID, *sppb.MultiplexedSessionPrecommitToken, error) {
+	readWriteOptions := &sppb.TransactionOptions_ReadWrite{
+		ReadLockMode: opts.txOptions.ReadLockMode,
+	}
+
+	if opts.multiplexEnabled {
+		readWriteOptions.MultiplexedSessionPreviousTransactionId = opts.previousTx
+	}
+
 	res, err := opts.client.BeginTransaction(ctx, &sppb.BeginTransactionRequest{
 		Session: opts.sessionID,
 		Options: &sppb.TransactionOptions{
 			Mode: &sppb.TransactionOptions_ReadWrite_{
-				ReadWrite: &sppb.TransactionOptions_ReadWrite{
-					ReadLockMode:                            opts.txOptions.ReadLockMode,
-					MultiplexedSessionPreviousTransactionId: opts.previousTx,
-				},
+				ReadWrite: readWriteOptions,
 			},
 			ExcludeTxnFromChangeStreams: opts.txOptions.ExcludeTxnFromChangeStreams,
 		},
@@ -1609,11 +1614,12 @@ func (t *ReadWriteTransaction) begin(ctx context.Context, mutation *sppb.Mutatio
 			sh.updateLastUseTime()
 		}
 		tx, precommitToken, err = beginTransaction(contextWithOutgoingMetadata(ctx, sh.getMetadata(), t.disableRouteToLeader), transactionBeginOptions{
-			sessionID:  sh.getID(),
-			client:     sh.getClient(),
-			txOptions:  t.txOpts,
-			mutation:   mutation,
-			previousTx: previousTx,
+			multiplexEnabled: t.sp.isMultiplexedSessionForRWEnabled(),
+			sessionID:        sh.getID(),
+			client:           sh.getClient(),
+			txOptions:        t.txOpts,
+			mutation:         mutation,
+			previousTx:       previousTx,
 		})
 		if isSessionNotFoundError(err) {
 			sh.destroy()
@@ -2089,9 +2095,10 @@ func isAbortedErr(err error) bool {
 
 // transactionBeginOptions holds the parameters for beginning a transaction.
 type transactionBeginOptions struct {
-	sessionID  string
-	client     spannerClient
-	txOptions  TransactionOptions
-	previousTx transactionID
-	mutation   *sppb.Mutation
+	multiplexEnabled bool
+	sessionID        string
+	client           spannerClient
+	txOptions        TransactionOptions
+	previousTx       transactionID
+	mutation         *sppb.Mutation
 }
