You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by bo...@apache.org on 2014/05/19 23:52:46 UTC
[21/24] git commit: Converted ids to Objects to be compatible with py
rb multilangs
Converted ids to Objects to be compatible with py rb multilangs
Project: http://git-wip-us.apache.org/repos/asf/incubator-storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-storm/commit/0c669f42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-storm/tree/0c669f42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-storm/diff/0c669f42
Branch: refs/heads/master
Commit: 0c669f429b6cf3fa1719dbb35b71b647cd241ab3
Parents: 660d8c4
Author: John Gilmore <jg...@ml.sun.ac.za>
Authored: Thu May 1 14:26:31 2014 +0200
Committer: John Gilmore <jg...@ml.sun.ac.za>
Committed: Thu May 1 14:26:31 2014 +0200
----------------------------------------------------------------------
.../src/jvm/backtype/storm/multilang/JsonSerializer.java | 2 +-
storm-core/src/jvm/backtype/storm/multilang/ShellMsg.java | 6 +++---
storm-core/src/jvm/backtype/storm/multilang/SpoutMsg.java | 6 +++---
storm-core/src/jvm/backtype/storm/spout/ShellSpout.java | 4 ++--
storm-core/src/jvm/backtype/storm/task/ShellBolt.java | 4 ++--
5 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/0c669f42/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java b/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java
index 70d8e5b..0d79659 100644
--- a/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java
+++ b/storm-core/src/jvm/backtype/storm/multilang/JsonSerializer.java
@@ -81,7 +81,7 @@ public class JsonSerializer implements ISerializer {
String command = (String) msg.get("command");
shellMsg.setCommand(command);
- String id = (String) msg.get("id");
+ Object id = msg.get("id");
shellMsg.setId(id);
String log = (String) msg.get("msg");
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/0c669f42/storm-core/src/jvm/backtype/storm/multilang/ShellMsg.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/multilang/ShellMsg.java b/storm-core/src/jvm/backtype/storm/multilang/ShellMsg.java
index 4381c07..1747f5b 100644
--- a/storm-core/src/jvm/backtype/storm/multilang/ShellMsg.java
+++ b/storm-core/src/jvm/backtype/storm/multilang/ShellMsg.java
@@ -17,7 +17,7 @@ import java.util.List;
*/
public class ShellMsg {
private String command;
- private String id;
+ private Object id;
private List<String> anchors;
private String stream;
private long task;
@@ -33,11 +33,11 @@ public class ShellMsg {
this.command = command;
}
- public String getId() {
+ public Object getId() {
return id;
}
- public void setId(String id) {
+ public void setId(Object id) {
this.id = id;
}
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/0c669f42/storm-core/src/jvm/backtype/storm/multilang/SpoutMsg.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/multilang/SpoutMsg.java b/storm-core/src/jvm/backtype/storm/multilang/SpoutMsg.java
index 9b5ffce..d1ee030 100644
--- a/storm-core/src/jvm/backtype/storm/multilang/SpoutMsg.java
+++ b/storm-core/src/jvm/backtype/storm/multilang/SpoutMsg.java
@@ -14,7 +14,7 @@ package backtype.storm.multilang;
*/
public class SpoutMsg {
private String command;
- private String id;
+ private Object id;
public String getCommand() {
return command;
@@ -24,11 +24,11 @@ public class SpoutMsg {
this.command = command;
}
- public String getId() {
+ public Object getId() {
return id;
}
- public void setId(String id) {
+ public void setId(Object id) {
this.id = id;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/0c669f42/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java b/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java
index b28348c..87bc5a8 100644
--- a/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java
+++ b/storm-core/src/jvm/backtype/storm/spout/ShellSpout.java
@@ -73,7 +73,7 @@ public class ShellSpout implements ISpout {
spoutMsg = new SpoutMsg();
}
spoutMsg.setCommand("ack");
- spoutMsg.setId(msgId.toString());
+ spoutMsg.setId(msgId);
querySubprocess();
}
@@ -82,7 +82,7 @@ public class ShellSpout implements ISpout {
spoutMsg = new SpoutMsg();
}
spoutMsg.setCommand("fail");
- spoutMsg.setId(msgId.toString());
+ spoutMsg.setId(msgId);
querySubprocess();
}
http://git-wip-us.apache.org/repos/asf/incubator-storm/blob/0c669f42/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
----------------------------------------------------------------------
diff --git a/storm-core/src/jvm/backtype/storm/task/ShellBolt.java b/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
index 27e55bb..81aca02 100644
--- a/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
+++ b/storm-core/src/jvm/backtype/storm/task/ShellBolt.java
@@ -180,7 +180,7 @@ public class ShellBolt implements IBolt {
_inputs.clear();
}
- private void handleAck(String id) {
+ private void handleAck(Object id) {
Tuple acked = _inputs.remove(id);
if(acked==null) {
throw new RuntimeException("Acked a non-existent or already acked/failed id: " + id);
@@ -188,7 +188,7 @@ public class ShellBolt implements IBolt {
_collector.ack(acked);
}
- private void handleFail(String id) {
+ private void handleFail(Object id) {
Tuple failed = _inputs.remove(id);
if(failed==null) {
throw new RuntimeException("Failed a non-existent or already acked/failed id: " + id);