You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ri...@apache.org on 2023/09/18 14:49:52 UTC
[beam] branch master updated: Remove extra registrations for createFn. (#28488)
This is an automated email from the ASF dual-hosted git repository.
riteshghorse pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new f087afad003 Remove extra registrations for createFn. (#28488)
f087afad003 is described below
commit f087afad003a058efc13cc95064b7a1a588f08ae
Author: Robert Burke <lo...@users.noreply.github.com>
AuthorDate: Mon Sep 18 07:49:45 2023 -0700
Remove extra registrations for createFn. (#28488)
* Remove extra registrations for createFn.
* go fmt
---------
Co-authored-by: lostluck <13...@users.noreply.github.com>
---
sdks/go/pkg/beam/beam.shims.go | 15 ---------------
sdks/go/pkg/beam/create.go | 5 -----
sdks/go/pkg/beam/util.go | 2 +-
3 files changed, 1 insertion(+), 21 deletions(-)
diff --git a/sdks/go/pkg/beam/beam.shims.go b/sdks/go/pkg/beam/beam.shims.go
index 6653fb0129f..29ebaf2ca68 100644
--- a/sdks/go/pkg/beam/beam.shims.go
+++ b/sdks/go/pkg/beam/beam.shims.go
@@ -25,7 +25,6 @@ import (
// Library imports
"github.com/apache/beam/sdks/v2/go/pkg/beam/core/runtime"
"github.com/apache/beam/sdks/v2/go/pkg/beam/core/runtime/exec"
- "github.com/apache/beam/sdks/v2/go/pkg/beam/core/runtime/graphx/schema"
"github.com/apache/beam/sdks/v2/go/pkg/beam/core/sdf"
"github.com/apache/beam/sdks/v2/go/pkg/beam/core/typex"
"github.com/apache/beam/sdks/v2/go/pkg/beam/core/util/reflectx"
@@ -44,13 +43,6 @@ func init() {
runtime.RegisterFunction(schemaDec)
runtime.RegisterFunction(schemaEnc)
runtime.RegisterFunction(swapKVFn)
- runtime.RegisterType(reflect.TypeOf((*createFn)(nil)).Elem())
- schema.RegisterType(reflect.TypeOf((*createFn)(nil)).Elem())
- runtime.RegisterType(reflect.TypeOf((*reflect.Type)(nil)).Elem())
- schema.RegisterType(reflect.TypeOf((*reflect.Type)(nil)).Elem())
- runtime.RegisterType(reflect.TypeOf((*reflectx.Func)(nil)).Elem())
- schema.RegisterType(reflect.TypeOf((*reflectx.Func)(nil)).Elem())
- reflectx.RegisterStructWrapper(reflect.TypeOf((*createFn)(nil)).Elem(), wrapMakerCreateFn)
reflectx.RegisterFunc(reflect.TypeOf((*func(reflect.Type, []byte) (typex.T, error))(nil)).Elem(), funcMakerReflect۰TypeSliceOfByteГTypex۰TError)
reflectx.RegisterFunc(reflect.TypeOf((*func(reflect.Type, typex.T) ([]byte, error))(nil)).Elem(), funcMakerReflect۰TypeTypex۰TГSliceOfByteError)
reflectx.RegisterFunc(reflect.TypeOf((*func([]byte, func(typex.T)) error)(nil)).Elem(), funcMakerSliceOfByteEmitTypex۰TГError)
@@ -64,13 +56,6 @@ func init() {
exec.RegisterEmitter(reflect.TypeOf((*func(typex.T))(nil)).Elem(), emitMakerTypex۰T)
}
-func wrapMakerCreateFn(fn any) map[string]reflectx.Func {
- dfn := fn.(*createFn)
- return map[string]reflectx.Func{
- "ProcessElement": reflectx.MakeFunc(func(a0 []byte, a1 func(typex.T)) error { return dfn.ProcessElement(a0, a1) }),
- }
-}
-
type callerReflect۰TypeSliceOfByteГTypex۰TError struct {
fn func(reflect.Type, []byte) (typex.T, error)
}
diff --git a/sdks/go/pkg/beam/create.go b/sdks/go/pkg/beam/create.go
index 91e9f335ef8..d2bd554963e 100644
--- a/sdks/go/pkg/beam/create.go
+++ b/sdks/go/pkg/beam/create.go
@@ -112,11 +112,6 @@ func createList(s Scope, values []any, t reflect.Type) (PCollection, error) {
// TODO(herohde) 6/26/2017: make 'create' a SDF once supported. See BEAM-2421.
-func init() {
- register.DoFn2x1[[]byte, func(T), error]((*createFn)(nil))
- register.Emitter1[T]()
-}
-
type createFn struct {
Values [][]byte `json:"values"`
Type EncodedType `json:"type"`
diff --git a/sdks/go/pkg/beam/util.go b/sdks/go/pkg/beam/util.go
index d591dedd762..4b24af83113 100644
--- a/sdks/go/pkg/beam/util.go
+++ b/sdks/go/pkg/beam/util.go
@@ -16,7 +16,7 @@
package beam
//go:generate go install github.com/apache/beam/sdks/v2/go/cmd/starcgen
-//go:generate starcgen --package=beam --identifiers=addFixedKeyFn,dropKeyFn,dropValueFn,swapKVFn,explodeFn,jsonDec,jsonEnc,protoEnc,protoDec,schemaEnc,schemaDec,makePartitionFn,createFn
+//go:generate starcgen --package=beam --identifiers=addFixedKeyFn,dropKeyFn,dropValueFn,swapKVFn,explodeFn,jsonDec,jsonEnc,protoEnc,protoDec,schemaEnc,schemaDec,makePartitionFn
//go:generate go fmt
// We have some freedom to create various utilities, users can use depending on