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 2015/01/14 17:05:54 UTC
[33/44] storm git commit: Merge remote-tracking branch 'apache/master'
Merge remote-tracking branch 'apache/master'
Conflicts:
README.markdown
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3c699e37
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3c699e37
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3c699e37
Branch: refs/heads/master
Commit: 3c699e371a1aba32bdbcd1853edca80f4a00b7e9
Parents: ae71054 38367b0
Author: Rick Kilgore <ri...@hbo.com>
Authored: Wed Oct 1 17:08:14 2014 -0700
Committer: Rick Kilgore <ri...@hbo.com>
Committed: Wed Oct 1 17:08:14 2014 -0700
----------------------------------------------------------------------
CHANGELOG.md | 4 +
README.markdown | 1 +
bin/storm | 2 +-
examples/storm-starter/pom.xml | 2 +-
external/storm-hbase/LICENSE | 202 ++++++++++++++++
external/storm-hbase/README.md | 215 +++++++++++++++++
external/storm-hbase/pom.xml | 78 +++++++
.../storm/hbase/bolt/AbstractHBaseBolt.java | 69 ++++++
.../org/apache/storm/hbase/bolt/HBaseBolt.java | 77 ++++++
.../storm/hbase/bolt/HBaseLookupBolt.java | 83 +++++++
.../storm/hbase/bolt/mapper/HBaseMapper.java | 48 ++++
.../bolt/mapper/HBaseProjectionCriteria.java | 85 +++++++
.../hbase/bolt/mapper/HBaseValueMapper.java | 41 ++++
.../hbase/bolt/mapper/SimpleHBaseMapper.java | 90 +++++++
.../apache/storm/hbase/common/ColumnList.java | 202 ++++++++++++++++
.../apache/storm/hbase/common/HBaseClient.java | 135 +++++++++++
.../org/apache/storm/hbase/common/IColumn.java | 30 +++
.../org/apache/storm/hbase/common/ICounter.java | 29 +++
.../org/apache/storm/hbase/common/Utils.java | 69 ++++++
.../storm/hbase/security/HBaseSecurityUtil.java | 52 +++++
.../mapper/SimpleTridentHBaseMapper.java | 89 +++++++
.../trident/mapper/TridentHBaseMapper.java | 31 +++
.../hbase/trident/state/HBaseMapState.java | 233 +++++++++++++++++++
.../storm/hbase/trident/state/HBaseQuery.java | 40 ++++
.../storm/hbase/trident/state/HBaseState.java | 162 +++++++++++++
.../hbase/trident/state/HBaseStateFactory.java | 40 ++++
.../storm/hbase/trident/state/HBaseUpdater.java | 32 +++
.../storm/hbase/topology/LookupWordCount.java | 79 +++++++
.../hbase/topology/PersistentWordCount.java | 81 +++++++
.../storm/hbase/topology/TotalWordCounter.java | 70 ++++++
.../storm/hbase/topology/WordCountClient.java | 57 +++++
.../hbase/topology/WordCountValueMapper.java | 69 ++++++
.../storm/hbase/topology/WordCounter.java | 59 +++++
.../apache/storm/hbase/topology/WordSpout.java | 88 +++++++
.../storm/hbase/trident/PrintFunction.java | 40 ++++
.../storm/hbase/trident/WordCountTrident.java | 104 +++++++++
external/storm-hdfs/pom.xml | 2 +-
external/storm-kafka/pom.xml | 2 +-
.../src/test/storm/kafka/TridentKafkaTest.java | 9 +-
pom.xml | 27 +--
.../maven-shade-clojure-transformer/pom.xml | 2 +-
storm-core/pom.xml | 2 +-
.../src/jvm/backtype/storm/tuple/ITuple.java | 136 +++++++++++
.../src/jvm/backtype/storm/tuple/Tuple.java | 113 +--------
.../storm/trident/testing/MockTridentTuple.java | 166 -------------
.../jvm/storm/trident/tuple/TridentTuple.java | 46 +---
.../storm/trident/tuple/TridentTupleView.java | 35 ++-
.../jvm/storm/trident/tuple/ValuePointer.java | 1 -
storm-core/src/ui/public/topology.html | 4 +-
.../test/clj/storm/trident/tuple_test.clj | 28 ++-
storm-dist/binary/pom.xml | 2 +-
storm-dist/binary/src/main/assembly/binary.xml | 14 ++
storm-dist/source/pom.xml | 2 +-
53 files changed, 3018 insertions(+), 361 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3c699e37/README.markdown
----------------------------------------------------------------------
diff --cc README.markdown
index e45f63a,2f90a4e..05d29bc
--- a/README.markdown
+++ b/README.markdown
@@@ -174,7 -174,7 +174,8 @@@ under the License
* Ariel Valentin ([@arielvalentin](http://blog.arielvalentin.com/))
* Dane Hammer ([@danehammer](https://github.com/danehammer))
* Christophe Carre' ([@chrisz](https://github.com/chrisz))
+ * Anya Tchernishov ([@anyatch](https://github.com/anyatch))
+* Rick Kilgore ([@rick-kilgore](http://github.com/rick-kilgore))
## Acknowledgements