Repository: beam Updated Branches: refs/heads/master 467e38596 -> 0616245e6
No longer reject timers for ParDo in direct runner Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/27b016d9 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/27b016d9 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/27b016d9 Branch: refs/heads/master Commit: 27b016d9cbd422f5cb7a4087d5adaf023c2c04b9 Parents: d4cc0c3 Author: Kenneth Knowles <[email protected]> Authored: Thu Dec 8 10:27:23 2016 -0800 Committer: Kenneth Knowles <[email protected]> Committed: Tue Jan 3 06:52:40 2017 -0800 ---------------------------------------------------------------------- runners/direct-java/pom.xml | 1 - .../beam/runners/direct/ParDoMultiOverrideFactory.java | 13 ++----------- 2 files changed, 2 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/27b016d9/runners/direct-java/pom.xml ---------------------------------------------------------------------- diff --git a/runners/direct-java/pom.xml b/runners/direct-java/pom.xml index 3578907..0d44136 100644 --- a/runners/direct-java/pom.xml +++ b/runners/direct-java/pom.xml @@ -68,7 +68,6 @@ </goals> <configuration> <groups>org.apache.beam.sdk.testing.NeedsRunner</groups> - <excludedGroups>org.apache.beam.sdk.testing.UsesTimersInParDo</excludedGroups> <parallel>none</parallel> <failIfNoTests>true</failIfNoTests> <dependenciesToScan> http://git-wip-us.apache.org/repos/asf/beam/blob/27b016d9/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoMultiOverrideFactory.java ---------------------------------------------------------------------- diff --git a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoMultiOverrideFactory.java b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoMultiOverrideFactory.java index b35df87..ceb35ec 100644 --- a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoMultiOverrideFactory.java +++ b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoMultiOverrideFactory.java @@ -64,17 +64,8 @@ class ParDoMultiOverrideFactory<InputT, OutputT> DoFnSignature signature = DoFnSignatures.getSignature(fn.getClass()); if (signature.processElement().isSplittable()) { return new SplittableParDo(transform); - } else if (signature.timerDeclarations().size() > 0) { - // Temporarily actually reject timers - throw new UnsupportedOperationException( - String.format( - "Found %s annotations on %s, but %s cannot yet be used with timers in the %s.", - DoFn.TimerId.class.getSimpleName(), - fn.getClass().getName(), - DoFn.class.getSimpleName(), - DirectRunner.class.getSimpleName())); - - } else if (signature.stateDeclarations().size() > 0) { + } else if (signature.stateDeclarations().size() > 0 + || signature.timerDeclarations().size() > 0) { // Based on the fact that the signature is stateful, DoFnSignatures ensures // that it is also keyed ParDo.BoundMulti<KV<?, ?>, OutputT> keyedTransform =
