[beam] branch master updated (195bbf3 -> 49b9d1b)

[ib...@apache.org]

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

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


    from 195bbf3  Merge pull request #14271 from [BEAM-9038] Fix typo for setting_global_window example
     new aa6c075  [BEAM-12010] Create separate merge rules for different Calc implementations.
     new 3a096ee  [BEAM-12010] Use simpler rule constructor so we don't have to pass null.
     new 49b9d1b  Merge pull request #14265 from ibzib/BEAM-12010

The 31189 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:
 .../extensions/sql/impl/planner/BeamRuleSets.java  |  8 +++--
 .../BeamCalcMergeRule.java}                        | 34 +++++++++++---------
 .../LogicalCalcMergeRule.java}                     | 34 +++++++++++---------
 .../sql/zetasql/BeamZetaSqlCalcMergeRule.java}     | 37 +++++++++++++---------
 .../sql/zetasql/ZetaSQLQueryPlanner.java           |  4 ++-
 5 files changed, 69 insertions(+), 48 deletions(-)
 copy sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/{parser/SqlDropTable.java => rule/BeamCalcMergeRule.java} (60%)
 copy sdks/java/extensions/sql/src/main/java/org/apache/beam/sdk/extensions/sql/impl/{parser/SqlDropTable.java => rule/LogicalCalcMergeRule.java} (63%)
 copy sdks/java/extensions/sql/{src/main/java/org/apache/beam/sdk/extensions/sql/impl/parser/SqlDropTable.java => zetasql/src/main/java/org/apache/beam/sdk/extensions/sql/zetasql/BeamZetaSqlCalcMergeRule.java} (59%)