zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix #676 (#682)

Browse Source
This commit is contained in:
Kevin Wan
2021-05-10 23:10:57 +08:00
committed by GitHub
parent 14cecb9b31
commit a87978568a
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/mr/mapreduce.go
View File

@@ -136,14 +136,16 @@ func MapReduceWithSource(source <-chan interface{}, mapper MapperFunc, reducer R
go func() { go func() {
defer func() { defer func() {
drain(collector)
if r := recover(); r != nil { if r := recover(); r != nil {
cancel(fmt.Errorf("%v", r)) cancel(fmt.Errorf("%v", r))
} else { } else {
finish() finish()
} }
}() }()
reducer(collector, writer, cancel) reducer(collector, writer, cancel)
drain(collector)
}() }()
go executeMappers(func(item interface{}, w Writer) { go executeMappers(func(item interface{}, w Writer) {
@@ -165,7 +167,6 @@ func MapReduceWithSource(source <-chan interface{}, mapper MapperFunc, reducer R
func MapReduceVoid(generate GenerateFunc, mapper MapperFunc, reducer VoidReducerFunc, opts ...Option) error { func MapReduceVoid(generate GenerateFunc, mapper MapperFunc, reducer VoidReducerFunc, opts ...Option) error {
_, err := MapReduce(generate, mapper, func(input <-chan interface{}, writer Writer, cancel func(error)) { _, err := MapReduce(generate, mapper, func(input <-chan interface{}, writer Writer, cancel func(error)) {
reducer(input, cancel) reducer(input, cancel)
drain(input)
// We need to write a placeholder to let MapReduce to continue on reducer done, // We need to write a placeholder to let MapReduce to continue on reducer done,
// otherwise, all goroutines are waiting. The placeholder will be discarded by MapReduce. // otherwise, all goroutines are waiting. The placeholder will be discarded by MapReduce.
writer.Write(lang.Placeholder) writer.Write(lang.Placeholder)