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

Rename variables in ImmutableCFOptions to avoid conflicts with ImmutableDBOptions #8227

Closed
wants to merge 10 commits into from

Conversation

mrambacher
Copy link
Contributor

Renaming ImmutableCFOptions::info_log and statistics to logger and stats. This is stage 2 in creating an ImmutableOptions class. It is necessary because the names match those in ImmutableOptions and have different types.

Changed (almost all) the values in the Immutable option formats to match the Options form, meaning that more are shared_ptr.  This change will allow an Option to be re-created from its Immutable and Mutable forms.

This is stage 1 of this process.  A goal is to introduce a ImmutableOptions class that contains the Immutable DB and CF Options to eliminate cross referencing between the two (there are options in ImmutableCFOptions that are ImmutableDBOptions.  Because of the linkage, promoting options to Mutable can be difficult).
Renamed the variables in ImmutableCFOptions (info_log, statistics)  to (logger, stats).  This is step 2 of creating an ImmutableOptions struct that is both an ImmutableDBOptions and ImmutableCFOptions.

The name change is necessary because the ImmutableDBOptions has members with those same names that are a different type.

There is no functionality change associated with this PR.  Only variable renaming.
@facebook-github-bot
Copy link
Contributor

@mrambacher has imported this pull request. If you are a Facebook employee, you can view this diff on Phabricator.

Copy link
Contributor

@jay-zhuang jay-zhuang left a comment

Choose a reason for hiding this comment

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

As ImmutableCFOptions is internal structure, I think renaming info_log and statistics should be fine.

@facebook-github-bot
Copy link
Contributor

@mrambacher has updated the pull request. You must reimport the pull request before landing.

@facebook-github-bot
Copy link
Contributor

@mrambacher has imported this pull request. If you are a Facebook employee, you can view this diff on Phabricator.

1 similar comment
@facebook-github-bot
Copy link
Contributor

@mrambacher has imported this pull request. If you are a Facebook employee, you can view this diff on Phabricator.

@facebook-github-bot
Copy link
Contributor

@mrambacher merged this pull request in 0ca6d62.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants