Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

kvserver: unify two request flags #60548

Merged

Conversation

andreimatei
Copy link
Contributor

isIntentWrite and consultsTSCache are always used in conjunction. It
seems that they must always be used in conjunction. Remove
consultsTSCache.

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

func (ba *BatchRequest) IsUnsplittable() bool {
return ba.hasFlag(isUnsplittable)
}

// ConsultsTimestampCache returns whether the request must consult
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why keep BatchRequest.ConsultsTimestampCache() but not ConsultsTimestampCache(Request)? I'd either keep both or remove both.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done

@andreimatei andreimatei force-pushed the small.unify-isintent-consultstscache branch from 8fbc4f6 to 456c53f Compare February 12, 2021 23:30
@@ -207,7 +207,7 @@ func (r *Replica) tryReproposeWithNewLeaseIndex(
defer untrack(ctx, 0, 0, 0) // covers all error paths below
// The ConsultsTimestampCache condition matches the similar logic for caring
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This comment now needs an update.

Copy link
Member

@nvanbenschoten nvanbenschoten left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

isIntentWrite and consultsTSCache are always used in conjunction. It
seems that they must always be used in conjunction. Remove
consultsTSCache.

Release note: None
@andreimatei andreimatei force-pushed the small.unify-isintent-consultstscache branch from 456c53f to b956057 Compare February 16, 2021 16:42
Copy link
Contributor Author

@andreimatei andreimatei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @nvanbenschoten)


pkg/kv/kvserver/replica_application_result.go, line 208 at r2 (raw file):

Previously, nvanbenschoten (Nathan VanBenschoten) wrote…

This comment now needs an update.

done

Copy link
Member

@nvanbenschoten nvanbenschoten left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 1 of 1 files at r3.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @nvanbenschoten)

Copy link
Contributor Author

@andreimatei andreimatei left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bors r+

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @nvanbenschoten)

@craig
Copy link
Contributor

craig bot commented Feb 16, 2021

Build succeeded:

@craig craig bot merged commit e1911bc into cockroachdb:master Feb 16, 2021
@andreimatei andreimatei deleted the small.unify-isintent-consultstscache branch January 21, 2022 17:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants