You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by mx...@apache.org on 2016/10/13 08:45:53 UTC
[1/2] incubator-beam git commit: Fix inconsistent in formatting logs:
leaveCompositeTransform always decrement depth,
but enterCompositeTransform increment depth only on ENTER_TRANSFORM
Repository: incubator-beam
Updated Branches:
refs/heads/master 13b45895e -> 73226168a
Fix inconsistent in formatting logs: leaveCompositeTransform always decrement depth, but enterCompositeTransform increment depth only on ENTER_TRANSFORM
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/cea201ea
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/cea201ea
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/cea201ea
Branch: refs/heads/master
Commit: cea201eaaea24d8cc1e117645d1c81f379beeb41
Parents: 98da6e8
Author: Alexey Diomin <di...@gmail.com>
Authored: Wed Aug 31 18:17:01 2016 +0400
Committer: Alexey Diomin <di...@gmail.com>
Committed: Wed Aug 31 18:17:54 2016 +0400
----------------------------------------------------------------------
.../runners/flink/translation/FlinkBatchPipelineTranslator.java | 2 +-
.../flink/translation/FlinkStreamingPipelineTranslator.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/cea201ea/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/FlinkBatchPipelineTranslator.java
----------------------------------------------------------------------
diff --git a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/FlinkBatchPipelineTranslator.java b/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/FlinkBatchPipelineTranslator.java
index 66c48b0..1cb604f 100644
--- a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/FlinkBatchPipelineTranslator.java
+++ b/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/FlinkBatchPipelineTranslator.java
@@ -65,6 +65,7 @@ public class FlinkBatchPipelineTranslator extends FlinkPipelineTranslator {
@Override
public CompositeBehavior enterCompositeTransform(TransformTreeNode node) {
LOG.info(genSpaces(this.depth) + "enterCompositeTransform- " + formatNodeName(node));
+ this.depth++;
BatchTransformTranslator<?> translator = getTranslator(node);
@@ -73,7 +74,6 @@ public class FlinkBatchPipelineTranslator extends FlinkPipelineTranslator {
LOG.info(genSpaces(this.depth) + "translated-" + formatNodeName(node));
return CompositeBehavior.DO_NOT_ENTER_TRANSFORM;
} else {
- this.depth++;
return CompositeBehavior.ENTER_TRANSFORM;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/cea201ea/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/FlinkStreamingPipelineTranslator.java
----------------------------------------------------------------------
diff --git a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/FlinkStreamingPipelineTranslator.java b/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/FlinkStreamingPipelineTranslator.java
index 284cd23..e5c0d76 100644
--- a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/FlinkStreamingPipelineTranslator.java
+++ b/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/FlinkStreamingPipelineTranslator.java
@@ -52,6 +52,7 @@ public class FlinkStreamingPipelineTranslator extends FlinkPipelineTranslator {
@Override
public CompositeBehavior enterCompositeTransform(TransformTreeNode node) {
LOG.info(genSpaces(this.depth) + "enterCompositeTransform- " + formatNodeName(node));
+ this.depth++;
PTransform<?, ?> transform = node.getTransform();
if (transform != null) {
@@ -64,7 +65,6 @@ public class FlinkStreamingPipelineTranslator extends FlinkPipelineTranslator {
return CompositeBehavior.DO_NOT_ENTER_TRANSFORM;
}
}
- this.depth++;
return CompositeBehavior.ENTER_TRANSFORM;
}
[2/2] incubator-beam git commit: This closes #908
Posted by mx...@apache.org.
This closes #908
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/73226168
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/73226168
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/73226168
Branch: refs/heads/master
Commit: 73226168a436f88bf650e36b45434c2dbe399ae2
Parents: 13b4589 cea201e
Author: Maximilian Michels <mx...@apache.org>
Authored: Thu Oct 13 10:43:30 2016 +0200
Committer: Maximilian Michels <mx...@apache.org>
Committed: Thu Oct 13 10:43:30 2016 +0200
----------------------------------------------------------------------
.../runners/flink/translation/FlinkBatchPipelineTranslator.java | 2 +-
.../flink/translation/FlinkStreamingPipelineTranslator.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/73226168/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/FlinkBatchPipelineTranslator.java
----------------------------------------------------------------------