Merge pull request vitessio#3913 from michael-berlin/hot_row_more_queries

michael-berlin · web-flow · commit 119d197a3aaf · 2018-05-10T15:55:41.000-07:00
tabletserver: Do not skip the hot row protection if the ExecuteBatch …
diff --git a/go/vt/vttablet/tabletserver/tabletserver.go b/go/vt/vttablet/tabletserver/tabletserver.go
@@ -972,7 +972,7 @@ func (tsv *TabletServer) ExecuteBatch(ctx context.Context, target *querypb.Targe
 		return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "cannot start a new transaction in the scope of an existing one")
 	}
 
-	if tsv.enableHotRowProtection && asTransaction && len(queries) == 1 {
+	if tsv.enableHotRowProtection && asTransaction {
 		// Serialize transactions which target the same hot row range.
 		// NOTE: We put this intentionally at this place *before* tsv.startRequest()
 		// gets called below. Otherwise, the startRequest()/endRequest() section from

Original file line number	Diff line number	Diff line change
`@@ -972,7 +972,7 @@ func (tsv TabletServer) ExecuteBatch(ctx context.Context, target querypb.Targe`
`972`	`972`	`return nil, vterrors.Errorf(vtrpcpb.Code_INVALID_ARGUMENT, "cannot start a new transaction in the scope of an existing one")`
`973`	`973`	`}`
`974`	`974`
`975`		`- if tsv.enableHotRowProtection && asTransaction && len(queries) == 1 {`
	`975`	`+ if tsv.enableHotRowProtection && asTransaction {`
`976`	`976`	`// Serialize transactions which target the same hot row range.`
`977`	`977`	`// NOTE: We put this intentionally at this place before tsv.startRequest()`
`978`	`978`	`// gets called below. Otherwise, the startRequest()/endRequest() section from`