Repository: incubator-beam Updated Branches: refs/heads/python-sdk d5c0175ca -> a46091a79
Update python-sdk pom.xml version and fixup to merge errors. Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/cce0952c Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/cce0952c Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/cce0952c Branch: refs/heads/python-sdk Commit: cce0952c903c58a7030ba89363185c301663eb5a Parents: 07a0728 Author: Ahmet Altay <[email protected]> Authored: Thu Dec 22 11:53:12 2016 -0800 Committer: Dan Halperin <[email protected]> Committed: Thu Dec 22 15:34:41 2016 -0800 ---------------------------------------------------------------------- .../flink/translation/FlinkBatchTransformTranslators.java | 4 ++-- .../beam/runners/spark/translation/TransformTranslator.java | 1 - sdks/python/pom.xml | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/cce0952c/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/FlinkBatchTransformTranslators.java ---------------------------------------------------------------------- diff --git a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/FlinkBatchTransformTranslators.java b/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/FlinkBatchTransformTranslators.java index 1a161b0..eb625b2 100644 --- a/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/FlinkBatchTransformTranslators.java +++ b/runners/flink/runner/src/main/java/org/apache/beam/runners/flink/translation/FlinkBatchTransformTranslators.java @@ -536,7 +536,7 @@ class FlinkBatchTransformTranslators { FlinkDoFnFunction<InputT, OutputT> doFnWrapper = new FlinkDoFnFunction<>( - oldDoFn, + doFn, context.getOutput(transform).getWindowingStrategy(), sideInputStrategies, context.getPipelineOptions()); @@ -613,7 +613,7 @@ class FlinkBatchTransformTranslators { @SuppressWarnings("unchecked") FlinkMultiOutputDoFnFunction<InputT, OutputT> doFnWrapper = new FlinkMultiOutputDoFnFunction( - oldDoFn, + doFn, windowingStrategy, sideInputStrategies, context.getPipelineOptions(), http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/cce0952c/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/TransformTranslator.java ---------------------------------------------------------------------- diff --git a/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/TransformTranslator.java b/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/TransformTranslator.java index 8430bbf..5dd6beb 100644 --- a/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/TransformTranslator.java +++ b/runners/spark/src/main/java/org/apache/beam/runners/spark/translation/TransformTranslator.java @@ -56,7 +56,6 @@ import org.apache.beam.sdk.transforms.GroupByKey; import org.apache.beam.sdk.transforms.PTransform; import org.apache.beam.sdk.transforms.ParDo; import org.apache.beam.sdk.transforms.View; -import org.apache.beam.sdk.transforms.reflect.DoFnSignatures; import org.apache.beam.sdk.transforms.windowing.BoundedWindow; import org.apache.beam.sdk.transforms.windowing.Window; import org.apache.beam.sdk.util.CombineFnUtil; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/cce0952c/sdks/python/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/python/pom.xml b/sdks/python/pom.xml index 797966e..cc90969 100644 --- a/sdks/python/pom.xml +++ b/sdks/python/pom.xml @@ -22,7 +22,7 @@ <parent> <groupId>org.apache.beam</groupId> <artifactId>beam-sdks-parent</artifactId> - <version>0.4.0-incubating-SNAPSHOT</version> + <version>0.5.0-incubating-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent>
