Merge branch 'STORM-2810-1.x' of https://github.com/srdo/storm into asfgit-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/6d45875d Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/6d45875d Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/6d45875d Branch: refs/heads/1.x-branch Commit: 6d45875dac89be8d3c35f84194a7e1b95e364343 Parents: a5ed0f9 83adfd9 Author: Stig Rohde Døssing <[email protected]> Authored: Tue Nov 14 07:50:48 2017 +0100 Committer: Stig Rohde Døssing <[email protected]> Committed: Tue Nov 14 07:50:48 2017 +0100 ---------------------------------------------------------------------- .../storm/hdfs/blobstore/HdfsBlobStoreImpl.java | 14 +- .../storm/hdfs/bolt/AbstractHdfsBolt.java | 48 +- .../org/apache/storm/hdfs/spout/HdfsSpout.java | 1484 +++++++++--------- .../hdfs/avro/TestFixedAvroSerializer.java | 13 +- .../hdfs/avro/TestGenericAvroSerializer.java | 11 +- .../storm/hdfs/blobstore/BlobStoreTest.java | 897 ++++++----- .../hdfs/blobstore/HdfsBlobStoreImplTest.java | 288 ++-- .../hdfs/bolt/AvroGenericRecordBoltTest.java | 142 +- .../apache/storm/hdfs/bolt/TestHdfsBolt.java | 108 +- .../storm/hdfs/bolt/TestSequenceFileBolt.java | 71 +- .../apache/storm/hdfs/spout/TestDirLock.java | 281 ++-- .../apache/storm/hdfs/spout/TestFileLock.java | 679 ++++---- .../storm/hdfs/spout/TestHdfsSemantics.java | 311 ++-- .../apache/storm/hdfs/spout/TestHdfsSpout.java | 1235 +++++++-------- .../storm/hdfs/spout/TestProgressTracker.java | 179 +-- .../storm/hdfs/testing/MiniDFSClusterRule.java | 78 + 16 files changed, 2955 insertions(+), 2884 deletions(-) ----------------------------------------------------------------------
