Reducing the differences
Project: http://git-wip-us.apache.org/repos/asf/storm/repo Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/1ca5f765 Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/1ca5f765 Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/1ca5f765 Branch: refs/heads/master Commit: 1ca5f7659ea807f1ae83694788e889ac5cae6669 Parents: 59fb8de Author: Niels Basjes <[email protected]> Authored: Mon Dec 15 10:58:49 2014 +0100 Committer: Niels Basjes <[email protected]> Committed: Mon Dec 15 10:58:49 2014 +0100 ---------------------------------------------------------------------- .../test/jvm/storm/starter/tools/MockTupleHelpers.java | 1 - storm-core/src/jvm/backtype/storm/tuple/Tuple.java | 4 ++-- storm-core/src/jvm/backtype/storm/tuple/TupleImpl.java | 3 +-- .../src/jvm/storm/trident/topology/TridentBoltExecutor.java | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/storm/blob/1ca5f765/examples/storm-starter/test/jvm/storm/starter/tools/MockTupleHelpers.java ---------------------------------------------------------------------- diff --git a/examples/storm-starter/test/jvm/storm/starter/tools/MockTupleHelpers.java b/examples/storm-starter/test/jvm/storm/starter/tools/MockTupleHelpers.java index eeaeeae..b253350 100644 --- a/examples/storm-starter/test/jvm/storm/starter/tools/MockTupleHelpers.java +++ b/examples/storm-starter/test/jvm/storm/starter/tools/MockTupleHelpers.java @@ -37,5 +37,4 @@ public final class MockTupleHelpers { when(tuple.getSourceStreamId()).thenReturn(streamId); return tuple; } - } http://git-wip-us.apache.org/repos/asf/storm/blob/1ca5f765/storm-core/src/jvm/backtype/storm/tuple/Tuple.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/backtype/storm/tuple/Tuple.java b/storm-core/src/jvm/backtype/storm/tuple/Tuple.java index c644fec..113b300 100644 --- a/storm-core/src/jvm/backtype/storm/tuple/Tuple.java +++ b/storm-core/src/jvm/backtype/storm/tuple/Tuple.java @@ -153,7 +153,7 @@ public interface Tuple { * Gets the id of the component that created this tuple. */ public String getSourceComponent(); - + /** * Gets the id of the task that created this tuple. */ @@ -163,7 +163,7 @@ public interface Tuple { * Gets the id of the stream that this tuple was emitted to. */ public String getSourceStreamId(); - + /** * Gets the message id that associated with this tuple. */ http://git-wip-us.apache.org/repos/asf/storm/blob/1ca5f765/storm-core/src/jvm/backtype/storm/tuple/TupleImpl.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/backtype/storm/tuple/TupleImpl.java b/storm-core/src/jvm/backtype/storm/tuple/TupleImpl.java index 7829327..818eff1 100644 --- a/storm-core/src/jvm/backtype/storm/tuple/TupleImpl.java +++ b/storm-core/src/jvm/backtype/storm/tuple/TupleImpl.java @@ -17,7 +17,6 @@ */ package backtype.storm.tuple; -import backtype.storm.Constants; import backtype.storm.generated.GlobalStreamId; import backtype.storm.task.GeneralTopologyContext; import backtype.storm.utils.IndifferentAccessMap; @@ -213,7 +212,7 @@ public class TupleImpl extends IndifferentAccessMap implements Seqable, Indexed, public String getSourceStreamId() { return streamId; } - + public MessageId getMessageId() { return id; } http://git-wip-us.apache.org/repos/asf/storm/blob/1ca5f765/storm-core/src/jvm/storm/trident/topology/TridentBoltExecutor.java ---------------------------------------------------------------------- diff --git a/storm-core/src/jvm/storm/trident/topology/TridentBoltExecutor.java b/storm-core/src/jvm/storm/trident/topology/TridentBoltExecutor.java index 41741a1..a23e555 100644 --- a/storm-core/src/jvm/storm/trident/topology/TridentBoltExecutor.java +++ b/storm-core/src/jvm/storm/trident/topology/TridentBoltExecutor.java @@ -300,7 +300,7 @@ public class TridentBoltExecutor implements IRichBolt { @Override public void execute(Tuple tuple) { - if (TupleUtils.isTick(tuple)) { + if(TupleUtils.isTick(tuple)) { long now = System.currentTimeMillis(); if(now - _lastRotate > _messageTimeoutMs) { _batches.rotate();
