Skip to content

clusterversion,storage: remove 22.1 PebbleFormat version gates#85854

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
celiala:remove-gates.PebbleFormat
Aug 12, 2022
Merged

clusterversion,storage: remove 22.1 PebbleFormat version gates#85854
craig[bot] merged 1 commit intocockroachdb:masterfrom
celiala:remove-gates.PebbleFormat

Conversation

@celiala
Copy link
Copy Markdown
Collaborator

@celiala celiala commented Aug 9, 2022

This commit removes the following 22.1 version gates:

  • PebbleFormatBlockPropertyCollector
  • PebbleFormatSplitUserKeysMarked

Cleanup was done following guidance from 21.2 cleanup:

For the most part, if the gates were just simple if !version.IsActive { return x } or something, I just removed the block, and even if it was a little more complicated, like args = [x]; if version { args = append(args, y) }; foo(args) I still tried to mostly inline it such that it looked natural (i.e. remove that append and make it args = [x, y]).

However for just a couple more complicated cases that were referring to <21.2 versions that needed to be replaced when those were deleted, I added a placeholder clusterversion.TODOPre21_2 alias for 21.2. Replacing those calls with this alias shouldn't change their behavior -- it was already always true, since the code today should never run in a <21.2 cluster -- but means we can delete those older versions in the meantime and then the owners of these bits can decide how to update them.

Partially addresses #80663

Release note: none

@celiala celiala requested a review from a team as a code owner August 9, 2022 21:49
@celiala celiala requested review from a team August 9, 2022 21:49
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

@celiala celiala marked this pull request as draft August 9, 2022 21:55
@celiala celiala force-pushed the remove-gates.PebbleFormat branch from dc4de64 to 68cb1eb Compare August 9, 2022 22:00
@celiala celiala marked this pull request as ready for review August 9, 2022 22:01
@celiala celiala requested review from jbowens and sumeerbhola August 9, 2022 22:01
@celiala celiala force-pushed the remove-gates.PebbleFormat branch from 68cb1eb to d203107 Compare August 10, 2022 23:45
@celiala celiala requested a review from a team as a code owner August 10, 2022 23:45
@celiala celiala changed the title clusterversion,storage,sql: remove 22.1 PebbleFormat version gates clusterversion,storage: remove 22.1 PebbleFormat version gates Aug 10, 2022
@celiala celiala removed request for a team August 10, 2022 23:46
@celiala celiala force-pushed the remove-gates.PebbleFormat branch from d203107 to 87f0e86 Compare August 10, 2022 23:52
Copy link
Copy Markdown
Contributor

@jbowens jbowens left a comment

Choose a reason for hiding this comment

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

thanks!

:lgtm:

Reviewed 3 of 6 files at r1, 2 of 3 files at r2, 5 of 5 files at r3, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @sumeerbhola)

@celiala celiala force-pushed the remove-gates.PebbleFormat branch from 87f0e86 to 0c74249 Compare August 11, 2022 20:11
@celiala celiala force-pushed the remove-gates.PebbleFormat branch from 0c74249 to 9ea2a19 Compare August 12, 2022 09:10
@celiala
Copy link
Copy Markdown
Collaborator Author

celiala commented Aug 12, 2022

TFTR!

bors r=jbowens

TestReplicaProbeRequest is a net new test failure - calling this unrelated to this PR (the only updates have been rebases)

@craig craig bot merged commit ff3fc7e into cockroachdb:master Aug 12, 2022
@craig
Copy link
Copy Markdown
Contributor

craig bot commented Aug 12, 2022

Build succeeded:

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