Merge branch 'STORM-2810' of https://github.com/srdo/storm into STORM-2810-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/9063524f Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/9063524f Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/9063524f Branch: refs/heads/master Commit: 9063524f31bb6822ee1b94dc13a2c1393f7d0732 Parents: 2657c25 caca829 Author: Jungtaek Lim <[email protected]> Authored: Mon Nov 13 06:37:21 2017 +0900 Committer: Jungtaek Lim <[email protected]> Committed: Mon Nov 13 06:37:21 2017 +0900 ---------------------------------------------------------------------- external/storm-hdfs/pom.xml | 2 +- .../storm/hdfs/blobstore/HdfsBlobStoreImpl.java | 14 +- .../storm/hdfs/bolt/AbstractHdfsBolt.java | 1 + .../org/apache/storm/hdfs/spout/HdfsSpout.java | 1495 +++++++++--------- .../hdfs/avro/TestFixedAvroSerializer.java | 13 +- .../hdfs/avro/TestGenericAvroSerializer.java | 11 +- .../storm/hdfs/blobstore/BlobStoreTest.java | 967 ++++++----- .../hdfs/blobstore/HdfsBlobStoreImplTest.java | 290 ++-- .../hdfs/bolt/AvroGenericRecordBoltTest.java | 136 +- .../apache/storm/hdfs/bolt/TestHdfsBolt.java | 56 +- .../storm/hdfs/bolt/TestSequenceFileBolt.java | 40 +- .../apache/storm/hdfs/spout/TestDirLock.java | 281 ++-- .../apache/storm/hdfs/spout/TestFileLock.java | 679 ++++---- .../storm/hdfs/spout/TestHdfsSemantics.java | 312 ++-- .../apache/storm/hdfs/spout/TestHdfsSpout.java | 1235 +++++++-------- .../storm/hdfs/spout/TestProgressTracker.java | 178 +-- .../storm/hdfs/testing/MiniDFSClusterRule.java | 70 + 17 files changed, 2914 insertions(+), 2866 deletions(-) ----------------------------------------------------------------------
