From d2e940941315c4ace9bcc257a8b156e0de7097bf Mon Sep 17 00:00:00 2001 From: Marty Schoch Date: Tue, 7 Apr 2015 12:04:59 -0400 Subject: [PATCH] fix issues identified by errcheck part of #169 --- index/upside_down/dump.go | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/index/upside_down/dump.go b/index/upside_down/dump.go index 9b9443f6..05333918 100644 --- a/index/upside_down/dump.go +++ b/index/upside_down/dump.go @@ -27,7 +27,12 @@ func (udc *UpsideDownCouch) dumpPrefix(kvreader store.KVReader, rv chan interfac start = []byte{0} } it := kvreader.Iterator(start) - defer it.Close() + defer func() { + cerr := it.Close() + if cerr != nil { + rv <- cerr + } + }() key, val, valid := it.Current() for valid { @@ -58,7 +63,12 @@ func (udc *UpsideDownCouch) DumpAll() chan interface{} { rv <- err return } - defer kvreader.Close() + defer func() { + cerr := kvreader.Close() + if cerr != nil { + rv <- cerr + } + }() udc.dumpPrefix(kvreader, rv, nil) }() @@ -76,7 +86,12 @@ func (udc *UpsideDownCouch) DumpFields() chan interface{} { rv <- err return } - defer kvreader.Close() + defer func() { + cerr := kvreader.Close() + if cerr != nil { + rv <- cerr + } + }() udc.dumpPrefix(kvreader, rv, []byte{'f'}) }() @@ -102,7 +117,12 @@ func (udc *UpsideDownCouch) DumpDoc(id string) chan interface{} { rv <- err return } - defer kvreader.Close() + defer func() { + cerr := kvreader.Close() + if cerr != nil { + rv <- cerr + } + }() back, err := udc.backIndexRowForDoc(kvreader, id) if err != nil { @@ -130,7 +150,12 @@ func (udc *UpsideDownCouch) DumpDoc(id string) chan interface{} { // now walk term keys in order and add them as well if len(keys) > 0 { it := kvreader.Iterator(keys[0]) - defer it.Close() + defer func() { + cerr := it.Close() + if cerr != nil { + rv <- cerr + } + }() for _, key := range keys { it.Seek(key)