Merge branch 'STREAMS-216'
Project: http://git-wip-us.apache.org/repos/asf/incubator-streams/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-streams/commit/6f2acaa2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-streams/tree/6f2acaa2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-streams/diff/6f2acaa2 Branch: refs/heads/master Commit: 6f2acaa21d4fc7052fbab84bf9dd52b9c1b2ec4d Parents: 91dd9a3 a20f01a Author: sblackmon <[email protected]> Authored: Wed Nov 19 12:57:50 2014 -0600 Committer: sblackmon <[email protected]> Committed: Wed Nov 19 12:57:50 2014 -0600 ---------------------------------------------------------------------- .../tasks/BroadcastMonitorThread.java | 5 +- .../org/apache/streams/pojo/json/Broadcast.json | 8 +++ .../local/builders/LocalStreamBuilder.java | 37 +++++++++++--- .../streams/local/builders/StreamComponent.java | 31 +++++++----- .../local/counters/DatumStatusCounter.java | 9 +++- .../local/counters/StreamsTaskCounter.java | 16 ++++-- .../streams/local/queues/ThroughputQueue.java | 52 +++++++++++++++++--- .../streams/local/tasks/BaseStreamsTask.java | 41 ++++++++++++++- .../streams/local/tasks/StreamsMergeTask.java | 7 ++- .../local/tasks/StreamsPersistWriterTask.java | 11 +++-- .../local/tasks/StreamsProcessorTask.java | 14 ++++-- .../local/tasks/StreamsProviderTask.java | 11 +++-- .../local/builders/LocalStreamBuilderTest.java | 9 ++-- .../local/counters/DatumStatusCounterTest.java | 22 ++++----- .../local/counters/StreamsTaskCounterTest.java | 16 +++--- .../queues/ThroughputQueueSingleThreadTest.java | 15 +++--- .../streams/local/tasks/BasicTasksTest.java | 6 +-- .../local/tasks/StreamsProviderTaskTest.java | 10 ++-- 18 files changed, 238 insertions(+), 82 deletions(-) ----------------------------------------------------------------------
