From b93bc96e40ca7c901f27f878de377b985ec06df7 Mon Sep 17 00:00:00 2001 From: Andrew Sisley Date: Wed, 26 Jan 2022 11:59:17 -0500 Subject: [PATCH] Fix linter errors Lines are unchanged, not sure why flagged now --- db/collection_update.go | 6 +++--- db/fetcher/fetcher.go | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/db/collection_update.go b/db/collection_update.go index 2034a688ea..03d5b61ca3 100644 --- a/db/collection_update.go +++ b/db/collection_update.go @@ -252,7 +252,7 @@ func (c *Collection) updateWithFilter(ctx context.Context, txn *Txn, filter inte if err != nil { return nil, err } - if err := query.Start(); err != nil { + if err = query.Start(); err != nil { return nil, err } @@ -262,8 +262,8 @@ func (c *Collection) updateWithFilter(ctx context.Context, txn *Txn, filter inte // loop while we still have results from the filter query for { - next, err := query.Next() - if err != nil { + next, nextErr := query.Next() + if nextErr != nil { return nil, err } // if theres no more records from the query, jump out of the loop diff --git a/db/fetcher/fetcher.go b/db/fetcher/fetcher.go index 82afbef943..1ad3babc06 100644 --- a/db/fetcher/fetcher.go +++ b/db/fetcher/fetcher.go @@ -384,6 +384,11 @@ func (df *DocumentFetcher) Close() error { if df.kvIter == nil { return nil } - df.kvIter.Close() + + err := df.kvIter.Close() + if err != nil { + return err + } + return df.kvResultsIter.Close() }