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-6577] Examine func return types when generating shims #7720

Merged
merged 2 commits into from
Feb 4, 2019
Merged

[BEAM-6577] Examine func return types when generating shims #7720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b406a92
Examine func return types when generating shims
htyleo Feb 4, 2019
065cf6b
Refactor extractParameters
htyleo Feb 4, 2019
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
24 changes: 14 additions & 10 deletions sdks/go/pkg/beam/util/starcgenx/starcgenx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ func (e *Extractor) fromObj(fset *token.FileSet, id *ast.Ident, obj types.Object
}

e.funcs[e.sigKey(sig)] = sig
e.extractParameters(sig)
e.extractFromSignature(sig)
e.Printf("\t%v\n", sig)
case *types.TypeName:
e.Printf("%s: %q is a type %v --- %T %v %v %v %v\n",
Expand Down Expand Up @@ -325,12 +325,16 @@ func (e *Extractor) extractType(ot *types.TypeName) {
e.types[name] = struct{}{}
}

// Examines the signature and extracts types of parameters for generating
// necessary imports and emitter and iterator code.
func (e *Extractor) extractParameters(sig *types.Signature) {
in := sig.Params() // *types.Tuple
for i := 0; i < in.Len(); i++ {
s := in.At(i) // *types.Var
// Examines the signature and extracts types of parameters and results for
// generating necessary imports and emitter and iterator code.
func (e *Extractor) extractFromSignature(sig *types.Signature) {
e.extractFromTuple(sig.Params())
e.extractFromTuple(sig.Results())
}

func (e *Extractor) extractFromTuple(tuple *types.Tuple) {
for i := 0; i < tuple.Len(); i++ {
s := tuple.At(i) // *types.Var

// Pointer types need to be iteratively unwrapped until we're at the base type,
// so we can get the import if necessary.
Expand All @@ -340,7 +344,7 @@ func (e *Extractor) extractParameters(sig *types.Signature) {
t = p.Elem()
p, ok = t.(*types.Pointer)
}
// Here's were we ensure we register new imports.
// Here's where we ensure we register new imports.
if t, ok := t.(*types.Named); ok {
if pkg := t.Obj().Pkg(); pkg != nil {
e.imports[pkg.Path()] = struct{}{}
Expand All @@ -357,8 +361,8 @@ func (e *Extractor) extractParameters(sig *types.Signature) {
if ipt, ok := e.makeInput(a); ok {
e.iters[ipt.Name] = ipt
}
// Tail recurse on functional parameters.
e.extractParameters(a)
// Tail recurse on functional signature.
e.extractFromSignature(a)
}
}
}
Expand Down
17 changes: 17 additions & 0 deletions sdks/go/pkg/beam/util/starcgenx/starcgenx_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ func TestExtractor(t *testing.T) {
{name: "pardo1", files: []string{pardo}, pkg: "pardo",
expected: []string{"runtime.RegisterFunction(MyIdent)", "runtime.RegisterFunction(MyDropVal)", "runtime.RegisterFunction(MyOtherDoFn)", "runtime.RegisterType(reflect.TypeOf((*foo)(nil)).Elem())", "funcMakerStringГString", "funcMakerIntStringГInt", "funcMakerFooГStringFoo"},
},
{name: "imports1", files: []string{imports}, pkg: "imports",
expected: []string{"runtime.RegisterFunction(MyImportedTypesDoFn)", "runtime.RegisterType(reflect.TypeOf((*rand.Rand)(nil)).Elem())", "runtime.RegisterType(reflect.TypeOf((*time.Time)(nil)).Elem())", "funcMakerRand۰RandГTime۰Time", "\"math/rand\"", "\"time\""},
},
{name: "emits1", files: []string{emits}, pkg: "emits",
expected: []string{"runtime.RegisterFunction(anotherFn)", "runtime.RegisterFunction(emitFn)", "runtime.RegisterType(reflect.TypeOf((*reInt)(nil)).Elem())", "funcMakerEmitIntIntГ", "emitMakerIntInt", "funcMakerIntIntEmitIntIntГError"},
},
Expand Down Expand Up @@ -100,6 +103,20 @@ func MyOtherDoFn(v foo) (string,foo) {
}
`

const imports = `
package imports

import (
"math/rand"
"time"
)

// Imported types
func MyImportedTypesDoFn(r *rand.Rand) time.Time {
return time.Unix(r.Int63(), 0)
}
`

const emits = `
package emits

Expand Down