You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/10/29 05:08:31 UTC
[1/2] storm git commit: Deprecated FixedTupleSpout constructor with
String. Added constructor with Fields so more than one output field can be
specified.
Repository: storm
Updated Branches:
refs/heads/1.x-branch 3414a8cad -> 96864e835
Deprecated FixedTupleSpout constructor with String. Added constructor with Fields so more than one output field can be specified.
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/af1fd216
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/af1fd216
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/af1fd216
Branch: refs/heads/1.x-branch
Commit: af1fd216a623e142f18248cd4d40ca1fbc19a9c4
Parents: 3414a8c
Author: Daniel Dara <dd...@g.clemson.edu>
Authored: Fri Oct 27 22:32:29 2017 -0400
Committer: Daniel Dara <dd...@g.clemson.edu>
Committed: Fri Oct 27 22:32:29 2017 -0400
----------------------------------------------------------------------
.../org/apache/storm/testing/FixedTupleSpout.java | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/af1fd216/storm-core/src/jvm/org/apache/storm/testing/FixedTupleSpout.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/org/apache/storm/testing/FixedTupleSpout.java b/storm-core/src/jvm/org/apache/storm/testing/FixedTupleSpout.java
index 87fc52d..5234d32 100644
--- a/storm-core/src/jvm/org/apache/storm/testing/FixedTupleSpout.java
+++ b/storm-core/src/jvm/org/apache/storm/testing/FixedTupleSpout.java
@@ -59,13 +59,21 @@ public class FixedTupleSpout implements IRichSpout {
private Map<String, FixedTuple> _pending;
private String _id;
- private String _fieldName;
+ private Fields _fields;
public FixedTupleSpout(List tuples) {
- this(tuples, null);
+ this(tuples, (Fields) null);
}
+ /**
+ * @deprecated please use {@link #FixedTupleSpout(List, Fields)}
+ */
+ @Deprecated
public FixedTupleSpout(List tuples, String fieldName) {
+ this(tuples, new Fields(fieldName));
+ }
+
+ public FixedTupleSpout(List tuples, Fields fields) {
_id = UUID.randomUUID().toString();
synchronized(acked) {
acked.put(_id, 0);
@@ -83,7 +91,7 @@ public class FixedTupleSpout implements IRichSpout {
}
_tuples.add(ft);
}
- _fieldName = fieldName;
+ _fields = fields;
}
public List<FixedTuple> getSourceTuples() {
@@ -167,8 +175,8 @@ public class FixedTupleSpout implements IRichSpout {
@Override
public void declareOutputFields(OutputFieldsDeclarer declarer) {
- if (_fieldName != null) {
- declarer.declare(new Fields(_fieldName));
+ if (_fields != null) {
+ declarer.declare(_fields);
}
}
[2/2] storm git commit: Merge branch 'STORM-2791-1.x' of
https://github.com/danielsd/storm into STORM-2791-1.x-merge
Posted by ka...@apache.org.
Merge branch 'STORM-2791-1.x' of https://github.com/danielsd/storm into STORM-2791-1.x-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/96864e83
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/96864e83
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/96864e83
Branch: refs/heads/1.x-branch
Commit: 96864e8356eba99bed8c61c0a6d96bceda83cab4
Parents: 3414a8c af1fd21
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Sun Oct 29 14:08:04 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Sun Oct 29 14:08:04 2017 +0900
----------------------------------------------------------------------
.../org/apache/storm/testing/FixedTupleSpout.java | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
----------------------------------------------------------------------