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 MetaData to Metadata in all of the places #54519

Merged
merged 16 commits into from
Mar 31, 2020

Conversation

jasontedor
Copy link
Member

This is a simple naming change PR, to fix the fact that "metadata" is a single English word, and for too long we have not followed general naming conventions for it. We are also not consistent about it, for example, METADATA instead of META_DATA if we were trying to be consistent with MetaData (although METADATA is correct when considered in the context of "metadata"). This was a simple find and replace across the code base, only taking a few minutes to fix this naming issue forever.

This is a simple naming change PR, to fix the fact that "metadata" is a
single English word, and for too long we have not followed general
naming conventions for it. We are also not consistent about it, for
example, METADATA instead of META_DATA if we were trying to be
consistent with MetaData (although METADATA is correct when considered
in the context of "metadata"). This was a simple find and replace across
the code base, only taking a few minutes to fix this naming issue
forever.
@jasontedor jasontedor requested a review from rjernst March 31, 2020 16:12
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra (:Core/Infra/Core)

@rjernst
Copy link
Member

rjernst commented Mar 31, 2020

Not looking at the actual diff given the size of this, but LGTM. We should separately look at having a more clarifying name (what metadata for what?)

@jasontedor jasontedor merged commit 95a7eed into elastic:master Mar 31, 2020
jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Mar 31, 2020
This is a simple naming change PR, to fix the fact that "metadata" is a
single English word, and for too long we have not followed general
naming conventions for it. We are also not consistent about it, for
example, METADATA instead of META_DATA if we were trying to be
consistent with MetaData (although METADATA is correct when considered
in the context of "metadata"). This was a simple find and replace across
the code base, only taking a few minutes to fix this naming issue
forever.
@jasontedor jasontedor deleted the you-say-metaData-i-say-metadata branch March 31, 2020 21:29
jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Apr 4, 2020
We recently cleaned up the use of the word "metadata" across the
codebase. A few additional uses have trickled in, likely from
in-progress work. This commit cleans up these last few instances.

Relates elastic#54519
jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Apr 4, 2020
We recently cleaned up the use of the word "metadata" across the
codebase. A few additional uses have trickled in, likely from
in-progress work. This commit cleans up these last few instances.

Relates elastic#54519
jasontedor added a commit to jasontedor/elasticsearch that referenced this pull request Apr 4, 2020
We recently renamed "metaData" to "metadata" in all of the places. We
were slightly aggressive in doing this rename in the SQL codebase where
"MetaData" is used by the JDK for its naming of these classes, and we
tried to keep SQL consistent with that, but inadvertently renamed a few
things that we should not have. Also, since we did not make these
renames in the 7.x branch, we should rename them back in the master
branch for reasons of consistency too.

Relates elastic#54519
jasontedor added a commit that referenced this pull request Apr 4, 2020
We recently renamed "metaData" to "metadata" in all of the places. We
were slightly aggressive in doing this rename in the SQL codebase where
"MetaData" is used by the JDK for its naming of these classes, and we
tried to keep SQL consistent with that, but inadvertently renamed a few
things that we should not have. Also, since we did not make these
renames in the 7.x branch, we should rename them back in the master
branch for reasons of consistency too.

Relates #54519
jasontedor added a commit that referenced this pull request Apr 7, 2020
We recently cleaned up the use of the word "metadata" across the
codebase. A few more additional uses have trickled in, likely from
in-progress work. This commit cleans up these last few additional
instances.

Relates #54519
jasontedor added a commit that referenced this pull request Apr 10, 2020
We recently cleaned up the use of the word "metadata" across the
codebase. Even more additional uses have trickled in, likely from
in-progress work. This commit cleans up these last few additional
instances.

Relates #54519
jasontedor added a commit that referenced this pull request Apr 10, 2020
We recently cleaned up the use of the word "metadata" across the
codebase. Even more additional uses have trickled in, likely from
in-progress work. This commit cleans up these last few additional
instances.

Relates #54519
@ywelsch
Copy link
Contributor

ywelsch commented May 19, 2020

This silently reverted one of my PRs (#54519, edit: #54407) that was merged before this change, and I only saw this by chance now 2 months later...
Perhaps worth looking into what went wrong here during the merge of this PR.

@jasontedor
Copy link
Member Author

@ywelsch Can you clarify which PR was silently reverted, since you linked back to this PR I can not investigate. 🙏

@ywelsch
Copy link
Contributor

ywelsch commented May 19, 2020

urgs, sorry. It was #54407. Looks to only have happened on master (7.x is fine)

@jasontedor
Copy link
Member Author

I don't know what could have happened here. This change was purely mechanical, and the lines that you're referencing would not have had any merge conflicts with the lines changed in that file in this PR. Interestingly, the way that I did the 7.x change was not to cherry-pick back, but merely to repeat the mechanical steps I took to prepare the change in master too, so it's surprising that those same steps would cause problems in master but not 7.x. Sorry for the trouble, I'm glad that you caught the reversion.

vhyza added a commit to vhyza/elasticsearch-analysis-lemmagen that referenced this pull request Jun 30, 2020
mkleen added a commit to crate/crate that referenced this pull request Jul 3, 2020
mkleen added a commit to crate/crate that referenced this pull request Jul 3, 2020
Based on elastic/elasticsearch#54519
and also applied in the rest of the code base.
mkleen added a commit to crate/crate that referenced this pull request Jul 3, 2020
mkleen added a commit to crate/crate that referenced this pull request Jul 3, 2020
Based on elastic/elasticsearch#54519
and also applied in the rest of the code base.
mkleen added a commit to crate/crate that referenced this pull request Jul 3, 2020
mkleen added a commit to crate/crate that referenced this pull request Jul 3, 2020
Based on elastic/elasticsearch#54519
This also applies it to the rest of the code base and renames
 META_DATA to METADATA.
mkleen added a commit to crate/crate that referenced this pull request Jul 3, 2020
Based on elastic/elasticsearch#54519
This also applies it to the rest of the code base and also
renames META_DATA to METADATA.
mkleen added a commit to crate/crate that referenced this pull request Jul 3, 2020
Based on elastic/elasticsearch#54519
This also applies it to the rest of the code base and also
renames META_DATA to METADATA.
mergify bot pushed a commit to crate/crate that referenced this pull request Jul 3, 2020
Based on elastic/elasticsearch#54519
This also applies it to the rest of the code base and also
renames META_DATA to METADATA.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants