Skip to content

Commit

Permalink
kv: remove context from canCommitInParallel
Browse files Browse the repository at this point in the history
This was missed in cockroachdb#44608. I noticed while backporting that change in cockroachdb#44703.
  • Loading branch information
nvanbenschoten committed Feb 4, 2020
1 parent 5224918 commit ee8380b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pkg/kv/txn_interceptor_committer.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ func (tc *txnCommitter) SendLocked(
// attached to the EndTxn request to the IntentSpans and clear the in-flight
// write set; no writes will be in-flight concurrently with the EndTxn
// request.
if len(et.InFlightWrites) > 0 && !tc.canCommitInParallel(ctx, ba, et) {
if len(et.InFlightWrites) > 0 && !tc.canCommitInParallel(ba, et) {
// NB: when parallel commits is disabled, this is the best place to
// detect whether the batch has only distinct spans. We can set this
// flag based on whether any of previously declared in-flight writes
Expand Down Expand Up @@ -279,7 +279,7 @@ func (tc *txnCommitter) sendLockedWithElidedEndTxn(
// writes, which all should have corresponding QueryIntent requests in the
// batch.
func (tc *txnCommitter) canCommitInParallel(
ctx context.Context, ba roachpb.BatchRequest, et *roachpb.EndTxnRequest,
ba roachpb.BatchRequest, et *roachpb.EndTxnRequest,
) bool {
if !parallelCommitsEnabled.Get(&tc.st.SV) {
return false
Expand Down

0 comments on commit ee8380b

Please sign in to comment.