[beam] branch master updated (943dc60 -> 6429412)

[ap...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

apilloud pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git.


    from 943dc60  Fix beam_PerformanceTests_Python (#6142)
     add 5ab3ed8  remove RelCollationTraitDef
     new 6429412  Merge pull request #6139 from amaliujia/rui_wang-remove_RelCollationTraitDef

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../beam/sdk/extensions/sql/impl/BeamQueryPlanner.java     |  4 +---
 .../apache/beam/sdk/extensions/sql/impl/JdbcDriver.java    | 14 ++++++++++++++
 .../beam/sdk/extensions/sql/impl/planner/BeamRuleSets.java |  4 ++--
 .../sql/impl/interpreter/BeamSqlFnExecutorTestBase.java    |  4 +---
 4 files changed, 18 insertions(+), 8 deletions(-)

[beam] 01/01: Merge pull request #6139 from amaliujia/rui_wang-remove_RelCollationTraitDef

[ap...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

apilloud pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git

commit 6429412228d91f0f03340e59cb01508b7fe70ecf
Merge: 943dc60 5ab3ed8
Author: Andrew Pilloud <ap...@users.noreply.github.com>
AuthorDate: Mon Aug 6 13:28:50 2018 -0700

    Merge pull request #6139 from amaliujia/rui_wang-remove_RelCollationTraitDef
    
    [BEAM-5072][SQL]Remove RelCollationTraitDef configuration in BeamQueryPlanner

 .../beam/sdk/extensions/sql/impl/BeamQueryPlanner.java     |  4 +---
 .../apache/beam/sdk/extensions/sql/impl/JdbcDriver.java    | 14 ++++++++++++++
 .../beam/sdk/extensions/sql/impl/planner/BeamRuleSets.java |  4 ++--
 .../sql/impl/interpreter/BeamSqlFnExecutorTestBase.java    |  4 +---
 4 files changed, 18 insertions(+), 8 deletions(-)