You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2018/11/06 21:55:34 UTC
[beam] 01/01: Merge pull request #6934: [BEAM-5817] Unify Nexmark
SQL and non-SQL paths
This is an automated email from the ASF dual-hosted git repository.
kenn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
commit b8aa8486f336df6fc9cf581f29040194edad3b87
Merge: cd4e2db 62a0b9f
Author: Kenn Knowles <ke...@kennknowles.com>
AuthorDate: Tue Nov 6 13:55:24 2018 -0800
Merge pull request #6934: [BEAM-5817] Unify Nexmark SQL and non-SQL paths
.../apache/beam/sdk/nexmark/NexmarkLauncher.java | 89 +++++----
.../sdk/nexmark/queries/AbstractSimulator.java | 3 +-
.../sdk/nexmark/queries/BoundedSideInputJoin.java | 19 +-
.../nexmark/queries/BoundedSideInputJoinModel.java | 6 +-
.../beam/sdk/nexmark/queries/NexmarkQuery.java | 202 ++-------------------
.../sdk/nexmark/queries/NexmarkQueryModel.java | 15 +-
.../sdk/nexmark/queries/NexmarkQueryTransform.java | 62 +++++++
.../{NexmarkQuery.java => NexmarkQueryUtil.java} | 123 ++-----------
.../apache/beam/sdk/nexmark/queries/Query0.java | 17 +-
.../beam/sdk/nexmark/queries/Query0Model.java | 6 +-
.../apache/beam/sdk/nexmark/queries/Query1.java | 16 +-
.../apache/beam/sdk/nexmark/queries/Query10.java | 16 +-
.../apache/beam/sdk/nexmark/queries/Query11.java | 19 +-
.../apache/beam/sdk/nexmark/queries/Query12.java | 19 +-
.../beam/sdk/nexmark/queries/Query1Model.java | 6 +-
.../apache/beam/sdk/nexmark/queries/Query2.java | 21 +--
.../beam/sdk/nexmark/queries/Query2Model.java | 6 +-
.../apache/beam/sdk/nexmark/queries/Query3.java | 34 ++--
.../beam/sdk/nexmark/queries/Query3Model.java | 6 +-
.../apache/beam/sdk/nexmark/queries/Query4.java | 16 +-
.../beam/sdk/nexmark/queries/Query4Model.java | 18 +-
.../apache/beam/sdk/nexmark/queries/Query5.java | 21 +--
.../beam/sdk/nexmark/queries/Query5Model.java | 6 +-
.../apache/beam/sdk/nexmark/queries/Query6.java | 24 ++-
.../beam/sdk/nexmark/queries/Query6Model.java | 18 +-
.../apache/beam/sdk/nexmark/queries/Query7.java | 21 +--
.../beam/sdk/nexmark/queries/Query7Model.java | 6 +-
.../apache/beam/sdk/nexmark/queries/Query8.java | 36 ++--
.../beam/sdk/nexmark/queries/Query8Model.java | 6 +-
.../apache/beam/sdk/nexmark/queries/Query9.java | 17 +-
.../beam/sdk/nexmark/queries/Query9Model.java | 7 +-
.../beam/sdk/nexmark/queries/WinningBids.java | 16 +-
.../sdk/nexmark/queries/sql/NexmarkSqlQuery.java | 46 -----
.../beam/sdk/nexmark/queries/sql/SqlQuery0.java | 8 +-
.../beam/sdk/nexmark/queries/sql/SqlQuery1.java | 8 +-
.../beam/sdk/nexmark/queries/sql/SqlQuery2.java | 8 +-
.../beam/sdk/nexmark/queries/sql/SqlQuery3.java | 4 +-
.../beam/sdk/nexmark/queries/sql/SqlQuery5.java | 8 +-
.../beam/sdk/nexmark/queries/sql/SqlQuery7.java | 8 +-
.../nexmark/queries/BoundedSideInputJoinTest.java | 30 +--
.../apache/beam/sdk/nexmark/queries/QueryTest.java | 84 +++------
41 files changed, 396 insertions(+), 705 deletions(-)