resolve conflicts for backport of #19674

Signed-off-by: Tim Vaillancourt <tim@timvaillancourt.com>

Author: timvaillancourt

go/vt/vtgate/engine/route.go

@@ -41,12 +41,10 @@ import (
 
 var _ Primitive = (*Route)(nil)
 
-var (
-	replicaWarmingReadsMirrored = stats.NewCountersWithMultiLabels(
-		"ReplicaWarmingReadsMirrored",
-		"Number of reads mirrored to replicas to warm their bufferpools",
-		[]string{"Keyspace"})
-)
+var replicaWarmingReadsMirrored = stats.NewCountersWithMultiLabels(
+	"ReplicaWarmingReadsMirrored",
+	"Number of reads mirrored to replicas to warm their bufferpools",
+	[]string{"Keyspace"})
 
 // Route represents the instructions to route a read query to
 // one or many vttablets.
@@ -103,9 +101,7 @@ func NewRoute(opcode Opcode, keyspace *vindexes.Keyspace, query, fieldQuery stri
 	}
 }
 
-var (
-	partialSuccessScatterQueries = stats.NewCounter("PartialSuccessScatterQueries", "Count of partially successful scatter queries")
-)
+var partialSuccessScatterQueries = stats.NewCounter("PartialSuccessScatterQueries", "Count of partially successful scatter queries")
 
 // TryExecute performs a non-streaming exec.
 func (route *Route) TryExecute(ctx context.Context, vcursor VCursor, bindVars map[string]*querypb.BindVariable, wantfields bool) (*sqltypes.Result, error) {
@@ -512,22 +508,6 @@ func (route *Route) executeWarmingReplicaRead(ctx context.Context, vcursor VCurs
 		return
 	}
 
-<<<<<<< HEAD
-	replicaVCursor := vcursor.CloneForReplicaWarming(ctx)
-=======
-	// Remove FOR UPDATE locks for warming reads if present
-	warmingQueries := queries
-	if modifiedQuery, ok := removeForUpdateLocks(route.QueryStatement); ok {
-		warmingQueries = make([]*querypb.BoundQuery, len(queries))
-		for i, query := range queries {
-			warmingQueries[i] = &querypb.BoundQuery{
-				Sql:           modifiedQuery,
-				BindVariables: query.BindVariables,
-			}
-		}
-	}
-
->>>>>>> 8c937df416 (VTGate: fix warming reads timeout context (#19674))
 	warmingReadsChannel := vcursor.GetWarmingReadsChannel()
 
 	select {
@@ -546,11 +526,7 @@ func (route *Route) executeWarmingReplicaRead(ctx context.Context, vcursor VCurs
 				return
 			}
 
-<<<<<<< HEAD
-			_, errs := replicaVCursor.ExecuteMultiShard(ctx, route, rss, queries, false /*rollbackOnError*/, false /*canAutocommit*/, route.FetchLastInsertID)
-=======
-			_, errs := replicaVCursor.ExecuteMultiShard(warmingCtx, route, rss, warmingQueries, false /*rollbackOnError*/, false /*canAutocommit*/, route.FetchLastInsertID)
->>>>>>> 8c937df416 (VTGate: fix warming reads timeout context (#19674))
+			_, errs := replicaVCursor.ExecuteMultiShard(warmingCtx, route, rss, queries, false /*rollbackOnError*/, false /*canAutocommit*/, route.FetchLastInsertID)
 			if len(errs) > 0 {
 				log.Warningf("Failed to execute warming replica read: %v", errs)
 			} else {

go/vt/vtgate/engine/route_warming_reads_test.go

@@ -25,7 +25,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"vitess.io/vitess/go/sqltypes"
-	"vitess.io/vitess/go/vt/sqlparser"
 	"vitess.io/vitess/go/vt/srvtopo"
 	"vitess.io/vitess/go/vt/vtgate/evalengine"
 	"vitess.io/vitess/go/vt/vtgate/vindexes"
@@ -80,37 +79,37 @@ func TestWarmingReadsSkipsForUpdate(t *testing.T) {
 		{
 			name:                 "SELECT FOR UPDATE",
 			query:                "SELECT * FROM users WHERE id = 1 FOR UPDATE",
-			expectedWarmingQuery: "select * from users where id = 1",
+			expectedWarmingQuery: "SELECT * FROM users WHERE id = 1 FOR UPDATE",
 		},
 		{
 			name:                 "SELECT FOR UPDATE mixed case",
 			query:                "SELECT * FROM users WHERE id = 1 FoR UpDaTe",
-			expectedWarmingQuery: "select * from users where id = 1",
+			expectedWarmingQuery: "SELECT * FROM users WHERE id = 1 FoR UpDaTe",
 		},
 		{
 			name:                 "SELECT FOR UPDATE with extra spaces",
 			query:                "SELECT * FROM users WHERE id = 1 FOR     UPDATE",
-			expectedWarmingQuery: "select * from users where id = 1",
+			expectedWarmingQuery: "SELECT * FROM users WHERE id = 1 FOR     UPDATE",
 		},
 		{
 			name:                 "SELECT FOR UPDATE with comment",
 			query:                "SELECT * FROM users WHERE id = 1 FOR /* comment */ UPDATE",
-			expectedWarmingQuery: "select * from users where id = 1",
+			expectedWarmingQuery: "SELECT * FROM users WHERE id = 1 FOR /* comment */ UPDATE",
 		},
 		{
 			name:                 "SELECT FOR UPDATE NOWAIT",
 			query:                "SELECT * FROM users WHERE id = 1 FOR UPDATE NOWAIT",
-			expectedWarmingQuery: "select * from users where id = 1",
+			expectedWarmingQuery: "SELECT * FROM users WHERE id = 1 FOR UPDATE NOWAIT",
 		},
 		{
 			name:                 "SELECT FOR UPDATE SKIP LOCKED",
 			query:                "SELECT * FROM users WHERE id = 1 FOR UPDATE SKIP LOCKED",
-			expectedWarmingQuery: "select * from users where id = 1",
+			expectedWarmingQuery: "SELECT * FROM users WHERE id = 1 FOR UPDATE SKIP LOCKED",
 		},
 		{
 			name:                 "UNION FOR UPDATE",
 			query:                "SELECT * FROM users WHERE id = 1 UNION SELECT * FROM users WHERE id = 2 FOR UPDATE",
-			expectedWarmingQuery: "select * from users where id = 1 union select * from users where id = 2",
+			expectedWarmingQuery: "SELECT * FROM users WHERE id = 1 UNION SELECT * FROM users WHERE id = 2 FOR UPDATE",
 		},
 		{
 			name:                 "Regular SELECT",
@@ -130,9 +129,6 @@ func TestWarmingReadsSkipsForUpdate(t *testing.T) {
 				tc.query,
 				"dummy_select_field",
 			)
-			// Parse and set QueryStatement to match how Routes are created in production
-			parser, _ := sqlparser.NewTestParser().Parse(tc.query)
-			route.QueryStatement = parser
 			route.Vindex = vindex.(vindexes.SingleColumn)
 			route.Values = []evalengine.Expr{
 				evalengine.NewLiteralInt(1),
@@ -216,8 +212,6 @@ func TestWarmingReadsDroppedWhenChannelFull(t *testing.T) {
 		"SELECT * FROM users WHERE id = 1",
 		"dummy_select_field",
 	)
-	parser, _ := sqlparser.NewTestParser().Parse("SELECT * FROM users WHERE id = 1")
-	route.QueryStatement = parser
 	route.Vindex = vindex.(vindexes.SingleColumn)
 	route.Values = []evalengine.Expr{
 		evalengine.NewLiteralInt(1),
@@ -262,8 +256,6 @@ func TestWarmingReadsContextTimeout(t *testing.T) {
 		"SELECT * FROM users WHERE id = 1",
 		"dummy_select_field",
 	)
-	parser, _ := sqlparser.NewTestParser().Parse("SELECT * FROM users WHERE id = 1")
-	route.QueryStatement = parser
 	route.Vindex = vindex.(vindexes.SingleColumn)
 	route.Values = []evalengine.Expr{
 		evalengine.NewLiteralInt(1),

go/vt/vtgate/executorcontext/vcursor_impl.go

@@ -295,15 +295,6 @@ func (vc *VCursorImpl) CloneForMirroring(ctx context.Context) engine.VCursor {
 }
 
 func (vc *VCursorImpl) CloneForReplicaWarming(ctx context.Context) engine.VCursor {
-<<<<<<< HEAD
-	callerId := callerid.EffectiveCallerIDFromContext(ctx)
-	immediateCallerId := callerid.ImmediateCallerIDFromContext(ctx)
-
-	timedCtx, _ := context.WithTimeout(context.Background(), vc.config.WarmingReadsTimeout) // nolint
-	clonedCtx := callerid.NewContext(timedCtx, callerId, immediateCallerId)
-
-=======
->>>>>>> 8c937df416 (VTGate: fix warming reads timeout context (#19674))
 	v := &VCursorImpl{
 		config:         vc.config,
 		SafeSession:    NewAutocommitSession(vc.SafeSession.Session),
@@ -1351,6 +1342,7 @@ func (vc *VCursorImpl) AddAdvisoryLock(name string) {
 func (vc *VCursorImpl) GetBindVars() map[string]*querypb.BindVariable {
 	return vc.bindVars
 }
+
 func (vc *VCursorImpl) SetBindVars(m map[string]*querypb.BindVariable) {
 	vc.bindVars = m
 }