Merge pull request #645 from steveyen/scorch
scorch InternalID() handles case of unknown docId
This commit is contained in:
commit
f521d80835
|
@ -49,8 +49,7 @@ func (s *Scorch) mainLoop() {
|
|||
if s.root.segment[i].deleted == nil {
|
||||
newSnapshot.segment[i].deleted = delta
|
||||
} else {
|
||||
newSnapshot.segment[i].deleted = s.root.segment[i].deleted.Clone()
|
||||
newSnapshot.segment[i].deleted.Or(delta)
|
||||
newSnapshot.segment[i].deleted = roaring.Or(s.root.segment[i].deleted, delta)
|
||||
}
|
||||
|
||||
newSnapshot.offsets[i] = running
|
||||
|
|
|
@ -93,6 +93,14 @@ func TestIndexReader(t *testing.T) {
|
|||
t.Errorf("count was 2, but only saw %d", actualCount)
|
||||
}
|
||||
|
||||
internalIDBogus, err := indexReader.InternalID("a-bogus-docId")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if internalIDBogus != nil {
|
||||
t.Errorf("expected bogus docId to have nil InternalID")
|
||||
}
|
||||
|
||||
internalID2, err := indexReader.InternalID("2")
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
|
|
|
@ -256,7 +256,7 @@ func (i *IndexSnapshot) InternalID(id string) (rv index.IndexInternalID, err err
|
|||
}()
|
||||
|
||||
next, err := tfr.Next(nil)
|
||||
if err != nil {
|
||||
if err != nil || next == nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user