You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2016/09/13 04:46:52 UTC

[3/4] storm git commit: Merge branch 'STORM-2057'

Merge branch 'STORM-2057'


Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/f7f5aa4f
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/f7f5aa4f
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/f7f5aa4f

Branch: refs/heads/master
Commit: f7f5aa4fda1eaac6a4ae85dd268a09883d6d6123
Parents: a1e9626 0bfd1af
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Tue Sep 13 13:31:51 2016 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Tue Sep 13 13:31:51 2016 +0900

----------------------------------------------------------------------
 docs/storm-sql.md                               |  16 +-
 external/sql/README.md                          |  12 +-
 .../trident/TridentLogicalPlanCompiler.java     |  61 ++++++-
 .../storm/sql/compiler/TestCompilerUtils.java   |  44 +++++
 .../backends/trident/TestPlanCompiler.java      |  74 ++++++++
 .../test/org/apache/storm/sql/TestUtils.java    | 151 ++++++++++++++++
 .../src/clj/org/apache/storm/daemon/nimbus.clj  |   4 +-
 .../apache/storm/trident/JoinOutFieldsMode.java |  33 ++++
 .../apache/storm/trident/TridentTopology.java   |  52 +++++-
 .../storm/trident/operation/impl/JoinState.java |  22 +++
 .../operation/impl/JoinerMultiReducer.java      |  43 ++---
 ...PreservingFieldsOrderJoinerMultiReducer.java | 175 +++++++++++++++++++
 12 files changed, 639 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/storm/blob/f7f5aa4f/docs/storm-sql.md
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/storm/blob/f7f5aa4f/storm-core/src/clj/org/apache/storm/daemon/nimbus.clj
----------------------------------------------------------------------