Merge branch 'STORM-1030'
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e2ca82f8 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e2ca82f8 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e2ca82f8 Branch: refs/heads/master Commit: e2ca82f8f55ecdaeac31d3da6c1fc634d9bc4b25 Parents: 4eaaa0b 2eb80a0 Author: Jungtaek Lim <kabh...@gmail.com> Authored: Tue Mar 29 17:01:22 2016 +0900 Committer: Jungtaek Lim <kabh...@gmail.com> Committed: Tue Mar 29 17:01:22 2016 +0900 ---------------------------------------------------------------------- .../org/apache/storm/hive/bolt/HiveBolt.java | 147 ++++++++------ .../apache/storm/hive/common/HiveOptions.java | 8 +- .../org/apache/storm/hive/common/HiveUtils.java | 11 +- .../apache/storm/hive/common/HiveWriter.java | 127 ++++++++----- .../apache/storm/hive/trident/HiveState.java | 38 ++-- .../storm/hive/trident/HiveStateFactory.java | 1 + .../apache/storm/hive/trident/HiveUpdater.java | 1 + .../storm/hive/bolt/BucketTestHiveTopology.java | 190 +++++++++++++++++++ .../apache/storm/hive/bolt/HiveTopology.java | 6 +- .../apache/storm/hive/bolt/TestHiveBolt.java | 11 +- .../storm/hive/common/TestHiveWriter.java | 13 +- .../storm/hive/trident/TridentHiveTopology.java | 2 +- 12 files changed, 415 insertions(+), 140 deletions(-) ----------------------------------------------------------------------
