From e1b0c61e2a529ddd703ce0a66e9f311cbec88597 Mon Sep 17 00:00:00 2001 From: Marty Schoch Date: Wed, 13 Dec 2017 22:07:37 -0500 Subject: [PATCH] fix bug in handling iterator-done --- index/scorch/segment/zap/merge.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/index/scorch/segment/zap/merge.go b/index/scorch/segment/zap/merge.go index 6d635bdf..481d9272 100644 --- a/index/scorch/segment/zap/merge.go +++ b/index/scorch/segment/zap/merge.go @@ -153,10 +153,12 @@ func persistMergedRest(segments []*Segment, drops []*roaring.Bitmap, if dict != nil && dict.fst != nil { itr, err2 := dict.fst.Iterator(nil, nil) - if err2 != nil { + if err2 != nil && err2 != vellum.ErrIteratorDone { return nil, err2 } - itrs = append(itrs, itr) + if itr != nil { + itrs = append(itrs, itr) + } } }