You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2016/03/09 16:54:01 UTC
[08/12] storm git commit: Merge branch 'master' into DRPC
Merge branch 'master' into DRPC
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/b0c9574c
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/b0c9574c
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/b0c9574c
Branch: refs/heads/master
Commit: b0c9574cbf2477d9c5a88a55c12f0541137669cf
Parents: d1a9b3d d42c437
Author: xiaojian.fxj <xi...@alibaba-inc.com>
Authored: Wed Mar 2 10:21:04 2016 +0800
Committer: xiaojian.fxj <xi...@alibaba-inc.com>
Committed: Wed Mar 2 10:21:04 2016 +0800
----------------------------------------------------------------------
CHANGELOG.md | 6 +
README.markdown | 4 +
bin/storm.cmd | 2 +-
bin/storm.py | 4 +-
.../storm/starter/ThroughputVsLatency.java | 2 +-
.../apache/storm/sql/compiler/CompilerUtil.java | 7 +-
.../apache/storm/sql/compiler/ExprCompiler.java | 32 ++++-
.../backends/standalone/RelNodeCompiler.java | 6 +-
.../apache/storm/sql/parser/StormParser.java | 5 +
.../test/org/apache/storm/sql/TestStormSql.java | 64 +++++++++-
.../storm/sql/compiler/TestCompilerUtils.java | 62 ++++++++-
.../storm/sql/compiler/TestExprSemantic.java | 18 +++
.../backends/standalone/TestPlanCompiler.java | 20 +++
.../backends/trident/TestPlanCompiler.java | 4 +-
.../test/org/apache/storm/sql/TestUtils.java | 32 ++++-
.../apache/storm/command/upload_credentials.clj | 35 -----
.../src/clj/org/apache/storm/daemon/acker.clj | 108 ----------------
.../src/clj/org/apache/storm/daemon/common.clj | 17 ++-
storm-core/src/clj/org/apache/storm/testing.clj | 7 +-
.../storm/blobstore/LocalFsBlobStore.java | 2 +-
.../src/jvm/org/apache/storm/command/List.java | 50 --------
.../apache/storm/command/ListTopologies.java | 52 ++++++++
.../apache/storm/command/UploadCredentials.java | 61 +++++++++
.../src/jvm/org/apache/storm/daemon/Acker.java | 128 +++++++++++++++++++
.../apache/storm/topology/TopologyBuilder.java | 13 +-
.../jvm/org/apache/storm/utils/ConfigUtils.java | 2 +-
.../src/jvm/org/apache/storm/utils/Utils.java | 4 +
.../storm/topology/TopologyBuilderTest.java | 65 ++++++++++
28 files changed, 571 insertions(+), 241 deletions(-)
----------------------------------------------------------------------