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

storage: unify storage/fs.FS and pebble/vfs.FS #98776

Merged
merged 1 commit into from
Mar 22, 2023
Merged

Conversation

jbowens
Copy link
Collaborator

@jbowens jbowens commented Mar 16, 2023

The storage/fs.FS had largely the same interface as vfs.FS. The storage/fs.FS interface was intended as a temporary stepping stone to using pebble's vfs.FS interface throughout Cockroach for all filesystem access. This commit unifies the two.

Epic: None
Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@jbowens jbowens force-pushed the vfs branch 5 times, most recently from 0284348 to 78ad2a7 Compare March 16, 2023 16:35
@jbowens jbowens marked this pull request as ready for review March 16, 2023 17:13
@jbowens jbowens requested review from a team as code owners March 16, 2023 17:13
@jbowens jbowens requested a review from a team March 16, 2023 17:13
@jbowens jbowens requested review from a team as code owners March 16, 2023 17:13
Copy link
Collaborator

@rharding6373 rharding6373 left a comment

Choose a reason for hiding this comment

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

:lgtm: for sql queries changes

Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @dt, @RaduBerinde, and @tbg)

Copy link
Member

@tbg tbg left a comment

Choose a reason for hiding this comment

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

Thank you!
I'll defer to you on whether to merge this after the branch cut. There doesn't seem to be a pressing reason to merge it before, and there might be a flake or two due to the changed sorting behavior in List.

Copy link
Collaborator Author

@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.

TFTRs!

Yeah, I'll sit on this until the branch cut.

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

@dt
Copy link
Member

dt commented Mar 17, 2023

counter-arg: backports will be easier for the next year+ of supporting 23.1 if we merge before branch cut.

Can always revert if there's a flake.

@tbg
Copy link
Member

tbg commented Mar 20, 2023

I'm fine either way, it is a long way to the release and hopefully bugs here would be obvious.

The storage/fs.FS had largely the same interface as vfs.FS. The storage/fs.FS
interface was intended as a temporary stepping stone to using pebble's vfs.FS
interface throughout Cockroach for all filesystem access. This commit unifies
the two.

Epic: None
Release note: None
@jbowens
Copy link
Collaborator Author

jbowens commented Mar 22, 2023

TFTRs!

bors r+

@craig
Copy link
Contributor

craig bot commented Mar 22, 2023

Build succeeded:

@craig craig bot merged commit f592975 into cockroachdb:master Mar 22, 2023
@jbowens jbowens deleted the vfs branch March 22, 2023 14:27
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.

5 participants