Repository: beam Updated Branches: refs/heads/master 217f085f2 -> 7a075cc34
[BEAM-1348] Add Runner API constructs to ProcessBundleDescriptor. This is towards removing the Fn API constructs once code has been migrated. Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/fa23fa2b Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/fa23fa2b Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/fa23fa2b Branch: refs/heads/master Commit: fa23fa2b0080461d0d860dc219283a9f90ebdb23 Parents: 217f085 Author: Luke Cwik <[email protected]> Authored: Wed May 31 10:10:06 2017 -0700 Committer: Lukasz Cwik <[email protected]> Committed: Thu Jun 1 21:58:55 2017 -0700 ---------------------------------------------------------------------- sdks/common/fn-api/pom.xml | 5 ++++ .../fn-api/src/main/proto/beam_fn_api.proto | 25 ++++++++++++++++---- sdks/java/core/pom.xml | 7 ++++++ 3 files changed, 33 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/fa23fa2b/sdks/common/fn-api/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/common/fn-api/pom.xml b/sdks/common/fn-api/pom.xml index ded9559..77a9ba5 100644 --- a/sdks/common/fn-api/pom.xml +++ b/sdks/common/fn-api/pom.xml @@ -82,6 +82,11 @@ <dependencies> <dependency> + <groupId>org.apache.beam</groupId> + <artifactId>beam-sdks-common-runner-api</artifactId> + </dependency> + + <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/beam/blob/fa23fa2b/sdks/common/fn-api/src/main/proto/beam_fn_api.proto ---------------------------------------------------------------------- diff --git a/sdks/common/fn-api/src/main/proto/beam_fn_api.proto b/sdks/common/fn-api/src/main/proto/beam_fn_api.proto index 79e1872..9fe2b2f 100644 --- a/sdks/common/fn-api/src/main/proto/beam_fn_api.proto +++ b/sdks/common/fn-api/src/main/proto/beam_fn_api.proto @@ -37,6 +37,7 @@ package org.apache.beam.fn.v1; option java_package = "org.apache.beam.fn.v1"; option java_outer_classname = "BeamFnApi"; +import "beam_runner_api.proto"; import "google/protobuf/any.proto"; import "google/protobuf/timestamp.proto"; @@ -264,19 +265,35 @@ message RegisterRequest { message RegisterResponse { } -// A descriptor of references used when processing a bundle. -// Stable +// Definitions that should be used to construct the bundle processing graph. message ProcessBundleDescriptor { // (Required) A pipeline level unique id which can be used as a reference to // refer to this. string id = 1; - // (Required) A list of primitive transforms that should + // (Deprecated) A list of primitive transforms that should // be used to construct the bundle processing graph. repeated PrimitiveTransform primitive_transform = 2; - // (Required) The set of all coders referenced in this bundle. + // (Deprecated) The set of all coders referenced in this bundle. repeated Coder coders = 4; + + // (Required) A map from pipeline-scoped id to PTransform. + map<string, org.apache.beam.runner_api.v1.PTransform> transforms = 5; + + // (Required) A map from pipeline-scoped id to PCollection. + map<string, org.apache.beam.runner_api.v1.PCollection> pcollections = 6; + + // (Required) A map from pipeline-scoped id to WindowingStrategy. + map<string, org.apache.beam.runner_api.v1.WindowingStrategy> windowing_strategies = 7; + + // (Required) A map from pipeline-scoped id to Coder. + // TODO: Rename to "coders" once deprecated coders field is removed. Unique + // name is choosen to make it an easy search/replace + map<string, org.apache.beam.runner_api.v1.Coder> codersyyy = 8; + + // (Required) A map from pipeline-scoped id to Environment. + map<string, org.apache.beam.runner_api.v1.Environment> environments = 9; } // A request to process a given bundle. http://git-wip-us.apache.org/repos/asf/beam/blob/fa23fa2b/sdks/java/core/pom.xml ---------------------------------------------------------------------- diff --git a/sdks/java/core/pom.xml b/sdks/java/core/pom.xml index 3c68c96..11b68e6 100644 --- a/sdks/java/core/pom.xml +++ b/sdks/java/core/pom.xml @@ -305,6 +305,13 @@ <artifactId>beam-sdks-common-fn-api</artifactId> <type>test-jar</type> <scope>test</scope> + <exclusions> + <!-- We only rely on the standard_coders.yaml --> + <exclusion> + <groupId>org.apache.beam</groupId> + <artifactId>beam-sdks-common-runner-api</artifactId> + </exclusion> + </exclusions> </dependency> <dependency>
