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

cherrypick: distsql: increment DistSQL version #18546

Merged

Conversation

andreimatei
Copy link
Contributor

Cherrypick #18522

As of #17767 I intended to update DistSQL Version and
MinAcceptedVersion, but I failed to do so. The code currently is lying
by claiming compatibility with a version it's not, in fact, compatible
with. This patch sets the correct version.

cc @cockroachdb/release

Cherrypick cockroachdb#18522

As of cockroachdb#17767 I intended to update DistSQL Version and
MinAcceptedVersion, but I failed to do so. The code currently is lying
by claiming compatibility with a version it's not, in fact, compatible
with. This patch sets the correct version.
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@asubiotto
Copy link
Contributor

:lgtm: with little nits.


Review status: 0 of 2 files reviewed at latest revision, 2 unresolved discussions, all commit checks successful.


pkg/sql/distsqlrun/version_history.txt, line 6 at r1 (raw file):

    sent by the server-side of FlowStream informing the producer of the
    consumer's status. The messages would cause a server running the previous
    version to erroneously think that the consumer has sent a drain signal,

s/has/had


pkg/sql/distsqlrun/version_history.txt, line 7 at r1 (raw file):

    consumer's status. The messages would cause a server running the previous
    version to erroneously think that the consumer has sent a drain signal,
    therefor MinAcceptedVersion was increased.

s/therefor/therefore


Comments from Reviewable

@andreimatei
Copy link
Contributor Author

Too late for these nits, unfortunately. I'll fix them on the master branch though.


Review status: 0 of 2 files reviewed at latest revision, 2 unresolved discussions, all commit checks successful.


Comments from Reviewable

@andreimatei andreimatei merged commit 6d87ebc into cockroachdb:release-1.1 Sep 18, 2017
@andreimatei andreimatei deleted the cherrypick-distsql-version branch September 18, 2017 17:06
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