Merge branch '1.x-branch' of https://git-wip-us.apache.org/repos/asf/storm into 1.x-branch
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/fc64e158 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/fc64e158 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/fc64e158 Branch: refs/heads/1.x-branch Commit: fc64e158f0bfcdccb0a278f81159a2dbe88affea Parents: 00280de 4fe225c Author: P. Taylor Goetz <[email protected]> Authored: Thu Mar 17 15:34:30 2016 -0400 Committer: P. Taylor Goetz <[email protected]> Committed: Thu Mar 17 15:34:30 2016 -0400 ---------------------------------------------------------------------- CHANGELOG.md | 2 + external/storm-mongodb/README.md | 195 +++++++++++++++++++ external/storm-mongodb/pom.xml | 74 +++++++ .../storm/mongodb/bolt/AbstractMongoBolt.java | 56 ++++++ .../storm/mongodb/bolt/MongoInsertBolt.java | 62 ++++++ .../storm/mongodb/bolt/MongoUpdateBolt.java | 75 +++++++ .../storm/mongodb/common/MongoDBClient.java | 91 +++++++++ .../mongodb/common/QueryFilterCreator.java | 38 ++++ .../common/SimpleQueryFilterCreator.java | 39 ++++ .../mongodb/common/mapper/MongoMapper.java | 38 ++++ .../common/mapper/SimpleMongoMapper.java | 40 ++++ .../common/mapper/SimpleMongoUpdateMapper.java | 41 ++++ .../storm/mongodb/trident/state/MongoState.java | 97 +++++++++ .../trident/state/MongoStateFactory.java | 42 ++++ .../trident/state/MongoStateUpdater.java | 34 ++++ .../storm/mongodb/topology/InsertWordCount.java | 81 ++++++++ .../storm/mongodb/topology/UpdateWordCount.java | 91 +++++++++ .../storm/mongodb/topology/WordCounter.java | 67 +++++++ .../storm/mongodb/topology/WordSpout.java | 88 +++++++++ .../storm/mongodb/trident/WordCountTrident.java | 85 ++++++++ pom.xml | 1 + storm-core/src/clj/org/apache/storm/clojure.clj | 3 + .../src/clj/org/apache/storm/daemon/acker.clj | 10 +- .../src/clj/org/apache/storm/daemon/common.clj | 9 +- .../clj/org/apache/storm/daemon/executor.clj | 10 + .../storm/coordination/CoordinatedBolt.java | 4 + .../org/apache/storm/task/IOutputCollector.java | 1 + .../org/apache/storm/task/OutputCollector.java | 11 ++ .../storm/topology/BasicOutputCollector.java | 10 + .../storm/topology/IBasicOutputCollector.java | 2 + .../trident/topology/TridentBoltExecutor.java | 4 + .../org/apache/storm/integration_test.clj | 51 ++++- storm-dist/binary/src/main/assembly/binary.xml | 14 ++ 33 files changed, 1461 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/fc64e158/CHANGELOG.md ---------------------------------------------------------------------- diff --cc CHANGELOG.md index 6697ed0,f765315..bb139d3 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@@ -1,5 -1,6 +1,7 @@@ ## 1.0.0 + * STORM-1483: add storm-mongodb connector + * STORM-1614: backpressure init and cleanup changes + * STORM-1549: Add support for resetting tuple timeout from bolts via the OutputCollector * STORM-971: Metric for messages lost due to kafka retention * STORM-1608: Fix stateful topology acking behavior * STORM-1609: Netty Client is not best effort delivery on failed Connection
