Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[BEAM-10179] Clean-up URNJavaDoFn workaround in Go SDK. #11899

Merged
merged 1 commit into from
Jun 2, 2020
Merged

[BEAM-10179] Clean-up URNJavaDoFn workaround in Go SDK. #11899

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[BEAM-10179] Clean-up URNJavaDoFn workaround in Go SDK. 
Now that the SDK has migrated to use the Dataflow runner v2, this is no longer required.
  • Loading branch information
@lukecwik
lukecwik committed Jun 2, 2020
commit 88f43d6a3c4fb81c7cbca46d019f2c065c7fe17d
1 change: 0 additions & 1 deletion sdks/go/pkg/beam/core/runtime/exec/translate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,6 @@ func (b *builder) makeLink(from string, id linkID) (Node, error) {
var u Node
switch urn {
case graphx.URNParDo,
graphx.URNJavaDoFn,
urnPerKeyCombinePre,
urnPerKeyCombineMerge,
urnPerKeyCombineExtract,
Expand Down
13 changes: 4 additions & 9 deletions sdks/go/pkg/beam/core/runtime/graphx/translate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,7 @@ const (
URNSessionsWindowFn = "beam:window_fn:session_windows:v1"

// SDK constants

// URNJavaDoFn is the legacy constant for marking a DoFn.
// TODO: remove URNJavaDoFN when the Dataflow runner
// uses the model pipeline and no longer falls back to Java.
URNJavaDoFn = "beam:dofn:javasdk:0.1"
URNDoFn = "beam:go:transform:dofn:v1"
URNDoFn = "beam:go:transform:dofn:v1"

URNIterableSideInputKey = "beam:go:transform:iterablesideinputkey:v1"
URNReshuffleInput = "beam:go:transform:reshuffleinput:v1"
Expand Down Expand Up @@ -239,7 +234,7 @@ func (m *marshaller) updateIfCombineComposite(s *ScopeTree, transform *pipepb.PT
acID := m.coders.Add(edge.AccumCoder)
payload := &pipepb.CombinePayload{
CombineFn: &pipepb.FunctionSpec{
Urn: URNJavaDoFn,
Urn: URNDoFn,
Payload: []byte(mustEncodeMultiEdgeBase64(edge)),
},
AccumulatorCoderId: acID,
Expand Down Expand Up @@ -341,7 +336,7 @@ func (m *marshaller) addMultiEdge(edge NamedEdge) []string {

payload := &pipepb.ParDoPayload{
DoFn: &pipepb.FunctionSpec{
Urn: URNJavaDoFn,
Urn: URNDoFn,
Payload: []byte(mustEncodeMultiEdgeBase64(edge.Edge)),
},
SideInputs: si,
Expand All @@ -355,7 +350,7 @@ func (m *marshaller) addMultiEdge(edge NamedEdge) []string {
case graph.Combine:
payload := &pipepb.ParDoPayload{
DoFn: &pipepb.FunctionSpec{
Urn: URNJavaDoFn,
Urn: URNDoFn,
Payload: []byte(mustEncodeMultiEdgeBase64(edge.Edge)),
},
}
Expand Down