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 2018/11/13 15:38:27 UTC

[beam] 01/01: Merge pull request #6986: [BEAM-5999] Reconcile timer proto representation.

This is an automated email from the ASF dual-hosted git repository.

mxm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git

commit a0bc60b6b000148a71f2a50d35bb07f582b3cb38
Merge: fca3d98 675187b
Author: Maximilian Michels <mx...@apache.org>
AuthorDate: Tue Nov 13 16:38:19 2018 +0100

    Merge pull request #6986: [BEAM-5999] Reconcile timer proto representation.

 .../pipeline/src/main/proto/beam_runner_api.proto  |  1 +
 .../core/construction/ParDoTranslation.java        |  7 +-
 .../construction/graph/GreedyPipelineFuser.java    |  2 -
 .../core/construction/graph/QueryablePipeline.java |  6 +-
 .../core/construction/graph/TimerReference.java    | 17 ++---
 .../construction/graph/ExecutableStageTest.java    |  3 +-
 .../graph/ImmutableExecutableStageTest.java        |  3 +-
 .../dataflow/PrimitiveParDoSingleFactory.java      |  2 +-
 .../control/ProcessBundleDescriptors.java          | 74 +++++++++++++++++++---
 .../runners/portability/fn_api_runner.py           | 12 +---
 sdks/python/apache_beam/transforms/userstate.py    |  5 +-
 11 files changed, 85 insertions(+), 47 deletions(-)