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

[BEAM-78] Rename com.google.cloud.dataflow to org.apache.beam #176

Closed
wants to merge 17 commits into from

Conversation

bjchambers
Copy link
Contributor

Be sure to do all of the following to help us incorporate your contribution
quickly and easily:

  • Make sure the PR title is formatted like:
    [BEAM-<Jira issue #>] Description of pull request
  • Make sure tests pass via mvn clean verify. (Even better, enable
    Travis-CI on your fork and ensure the whole test matrix passes).
  • Replace <Jira issue #> in the title with the actual Jira issue
    number, if there is one.
  • If this contribution is large, please file an Apache
    Individual Contributor License Agreement.

Note that this doesn't rename everything possible. Follow-up work that remains includes at least:

  1. Updating README.mds
  2. Deploying updated testing protos to maven central, and fixing up the ProtoCoder tests to use them.

@davorbonaci
Copy link
Member

Move files, instead of remove & add.

bchambers added 17 commits April 13, 2016 17:34
Applied this script:

    mkdir -p $1/org/apache/beam;
    git mv $1/com/google/cloud/dataflow/* $1/org/apache;
    rmdir -p $1/com/google/cloud/dataflow;

To these directories:
  - sdks/java/core/src/{main,test}
  - sdks/java/java8tests/src/test
  - runners/google-cloud-dataflow-java/src/{main,test}
  - contrib/{join-library,hadoop}/src/{main,test}
  - examples/java{,8}/src/{main,test}
Performed using the following script

    find . -iname "*.java" -exec sed -i -e \
        "s/package com.google.cloud.dataflow/package org.apache.beam/" {} +
Performed using the following command:

    find . -iname "*.java" -exec sed -i -e \
        "s/com.google.cloud.dataflow/org.apache.beam/" {} +

Revert changes to imports of proto2 coders (deployed to maven)
@bjchambers
Copy link
Contributor Author

Done.

This required rebuilding the entire PR -- Git doesn't have a notion of "move". It detects this within each commit. Since the commit has so many files modified, it bypasses the "detect moves in files with N% changed". I had to restructure it as a commit that moves everything without changing contents (so it can detect diffs by just looking at the MD5 hashes) and then a series of commits to fix the build.

Important note: When merging, we cannot squash any changes into the commit that does the moves. Any modified files will not be recorded as moves.

@bjchambers
Copy link
Contributor Author

R: @lukecwik
R: @davorbonaci

@bjchambers
Copy link
Contributor Author

When merging, note that each of the fixup! commits can be squashed, but contains a description of the changes that needed to be performed (and/or scripts used) to make edits. It may be worth preserving those for historical purposes.

@bjchambers bjchambers changed the title Rename packages [BEAM-78] Rename com.google.cloud.dataflow->org.apache.beam Apr 14, 2016
@bjchambers bjchambers changed the title [BEAM-78] Rename com.google.cloud.dataflow->org.apache.beam [BEAM-78] Rename com.google.cloud.dataflow to org.apache.beam Apr 14, 2016
@davorbonaci
Copy link
Member

A few minor comments:

  • Commit: "Rename com/google/cloud/dataflow->org/apache/beam" --> has removal of empty lines at the end of the file.
  • Spark has different import order. I think we could have followed the same order regardless.
  • TODO: Package reorganization inside the Cloud Dataflow runner.

All this is minor and can be addressed later.

Merge in progress.

@asfgit asfgit closed this in 96765f1 Apr 14, 2016
swegner pushed a commit to swegner/beam that referenced this pull request Apr 22, 2016
Explicitly track the Source a ReadEvaluator is using
@bjchambers bjchambers deleted the rename-packages branch November 21, 2016 21:41
mareksimunek pushed a commit to mareksimunek/beam that referenced this pull request May 9, 2018
…tations

 [euphoria-core] add API audience annotations to core
pl04351820 pushed a commit to pl04351820/beam that referenced this pull request Dec 20, 2023

Co-authored-by: Tres Seaver <tseaver@palladion.com>
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.

2 participants