[BEAM-2375] Rebase SQL DSL branch with master

[jbonofre]

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

---

[jbonofre]

R: @xumingming
CC: @xumingmin

[coveralls]

Coverage decreased (-0.007%) to 70.685% when pulling ac39dbe on jbonofre:SQL_REBASE into 7a075cc on apache:master.

[xumingming]

LGTM.

[xumingming]

@jbonofre do you mind share the methods, I was thinking that this rebase might need two steps, because it if I rebase from master, it will conflict with DSL_SQL(as there are some breaking api changes to resolve), if i rebase again from DSL_SQL, it will conflict with master. So separate into two steps by first let DSL_SQL adopt the new breaking apis, then rebase from master.

[aaltay]

cc: @davorbonaci

Hey @jbonofre, does this require a vote before merging a feature branch into master?

[davorbonaci]

Not following this fully, but it seems like a merge from the SQL branch into master. I don't think we are ready for this just yet.

@xumingming's comment make sense to me. Let's merge master branch into the SQL branch, fix up there, and continue development as usual.

[mingmxu]

+1 we're not ready to merge SQL branch into master, guess some miscommunication.

I think what @xumingming wants is pulling the latest code from master branch into SQL branch.

[xumingming]

Yeah, my intention was to pull the latest code into DSL_SQL branch(sorry if there are miscommunication @jbonofre).

[jbonofre]

Dual rebase on master and DSL_SQL (to be up to date from both side).

[coveralls]

Coverage decreased (-0.02%) to 70.6% when pulling 7fffb9b on jbonofre:SQL_REBASE into 6d64c6e on apache:master.

[coveralls]

Coverage decreased (-0.01%) to 70.607% when pulling 7fffb9b on jbonofre:SQL_REBASE into 6d64c6e on apache:master.

[davorbonaci]

But we shouldn't be updating DSL_SQL branch -- that requires force push, and may lose data.

[jbonofre]

It's not a merge on master, it's a rebase of the DSL_SQL branch from master. So, we don't merge on master, we just update the DSL_SQL branch.

[jbonofre]

Let me fix the pull request (it should be base on DSL_SQL branch instead of master).

[coveralls]

Coverage decreased (-0.004%) to 70.617% when pulling 4f6cb13 on jbonofre:SQL_REBASE into c189d5c on apache:master.

[xumingming]

hi guys, can we boost this a little bit? This PR kinda blocks other several PRs.

[jbonofre]

Yeah, let me clean it up. I'm on it.

[jbonofre]

Fixed by #3311

[coveralls]

Coverage increased (+0.01%) to 70.628% when pulling b47af03 on jbonofre:SQL_REBASE into 78b6e3c on apache:master.