You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by pe...@apache.org on 2017/08/20 15:03:26 UTC

[26/53] [abbrv] beam git commit: jstorm-runner: remove code that was commented out.

jstorm-runner: remove code that was commented out.


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/8cdd41b1
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/8cdd41b1
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/8cdd41b1

Branch: refs/heads/jstorm-runner
Commit: 8cdd41b1d4c7cd5aaf96f3f9c6c2fd203c047e02
Parents: 74ceac6
Author: Pei He <pe...@apache.org>
Authored: Fri Jul 14 15:51:22 2017 +0800
Committer: Pei He <pe...@apache.org>
Committed: Sat Aug 19 12:02:57 2017 +0800

----------------------------------------------------------------------
 .../beam/runners/jstorm/translation/ExecutorsBolt.java      | 9 ++++-----
 .../runners/jstorm/translation/JStormStateInternals.java    | 1 -
 .../runners/jstorm/translation/TransformTranslator.java     | 2 --
 3 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/8cdd41b1/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/translation/ExecutorsBolt.java
----------------------------------------------------------------------
diff --git a/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/translation/ExecutorsBolt.java b/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/translation/ExecutorsBolt.java
index ef12db8..ce6ea2c 100644
--- a/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/translation/ExecutorsBolt.java
+++ b/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/translation/ExecutorsBolt.java
@@ -319,12 +319,11 @@ public class ExecutorsBolt extends AbstractComponent implements IRichBatchBolt {
 
   @Override
   public String toString() {
-    // LOG.info("bolt: " + executorContext.getTopologyContext().toJSONString());
     List<String> ret = new ArrayList<>();
-        /*ret.add("inputTags");
-        for (TupleTag inputTag : inputTagToExecutor.keySet()) {
-            ret.add(inputTag.getId());
-        }*/
+    ret.add("inputTags");
+    for (TupleTag inputTag : inputTagToExecutor.keySet()) {
+      ret.add(inputTag.getId());
+    }
     ret.add("internalExecutors");
     for (Executor executor : inputTagToExecutor.values()) {
       ret.add(executor.toString());

http://git-wip-us.apache.org/repos/asf/beam/blob/8cdd41b1/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/translation/JStormStateInternals.java
----------------------------------------------------------------------
diff --git a/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/translation/JStormStateInternals.java b/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/translation/JStormStateInternals.java
index fce870f..78882f2 100644
--- a/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/translation/JStormStateInternals.java
+++ b/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/translation/JStormStateInternals.java
@@ -73,7 +73,6 @@ class JStormStateInternals<K> implements StateInternals {
   @Override
   public <T extends State> T state(
       StateNamespace namespace, StateTag<T> address, StateContext<?> c) {
-    // throw new UnsupportedOperationException("StateContext is not supported.");
     /**
      * TODOļ¼š
      * Same implementation as state() which is without StateContext. This might be updated after

http://git-wip-us.apache.org/repos/asf/beam/blob/8cdd41b1/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/translation/TransformTranslator.java
----------------------------------------------------------------------
diff --git a/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/translation/TransformTranslator.java b/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/translation/TransformTranslator.java
index edd3d8a..4d431d3 100644
--- a/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/translation/TransformTranslator.java
+++ b/runners/jstorm/src/main/java/org/apache/beam/runners/jstorm/translation/TransformTranslator.java
@@ -62,7 +62,6 @@ interface TransformTranslator<T extends PTransform<?, ?>> {
                 @Override
                 public String apply(Map.Entry<TupleTag<?>, PValue> taggedPValue) {
                   return taggedPValue.getKey().getId();
-                  // return taggedPValue.getValue().getName();
                 }
               })),
           transform.getName(),
@@ -71,7 +70,6 @@ interface TransformTranslator<T extends PTransform<?, ?>> {
                 @Override
                 public String apply(Map.Entry<TupleTag<?>, PValue> taggedPvalue) {
                   return taggedPvalue.getKey().getId();
-                  //return taggedPValue.getValue().getName();
                 }
               })));
     }