Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix handling of snapshots with 0 segments #55

Merged
merged 2 commits into from
Feb 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions index/snapshot.go
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ func (i *Snapshot) ReadFrom(r io.Reader) (int64, error) {

// read bluge snapshot format version
peek, err := br.Peek(binary.MaxVarintLen64)
if err != nil {
if err != nil && err != io.EOF {
return bytesRead, fmt.Errorf("error peeking snapshot format version %d: %w", i.epoch, err)
}
snapshotFormatVersion, n := binary.Uvarint(peek)
Expand All @@ -598,7 +598,7 @@ func (i *Snapshot) readFromVersion1(br *bufio.Reader) (int64, error) {

// read number of segments
peek, err := br.Peek(binary.MaxVarintLen64)
if err != nil {
if err != nil && err != io.EOF {
return bytesRead, fmt.Errorf("error peeking snapshot number of segments %d: %w", i.epoch, err)
}
numSegments, n := binary.Uvarint(peek)
Expand Down
2 changes: 1 addition & 1 deletion index/writer.go
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ func (s *Writer) loadSnapshot(epoch uint64) (*Snapshot, error) {
for _, segSnapshot := range snapshot.segment {
segPlugin, err := loadSegmentPlugin(s.config.supportedSegmentPlugins, segSnapshot.segmentType, segSnapshot.segmentVersion)
if err != nil {
return nil, fmt.Errorf("error loading required segmetn plugin: %v", err)
return nil, fmt.Errorf("error loading required segment plugin: %v", err)
}
segSnapshot.segment, err = s.loadSegment(segSnapshot.id, segPlugin)
if err != nil {
Expand Down
58 changes: 58 additions & 0 deletions index_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1412,3 +1412,61 @@ func randStrn(n int) string {
func randStr() string {
return randStrn(maxRandStrLen)
}

func TestBug54(t *testing.T) {
tmpIndexPath := createTmpIndexPath(t)
defer cleanupTmpIndexPath(t, tmpIndexPath)

// first index 2 documents
config := DefaultConfig(tmpIndexPath)
indexWriter, err := OpenWriter(config)
if err != nil {
t.Fatal(err)
}

doc := NewDocument("a1")
doc.AddField(NewTextField("TestKey1", "TestKey Data1"))
if err = indexWriter.Update(doc.ID(), doc); err != nil {
t.Fatal(err)
}

doc = NewDocument("a2")
doc.AddField(NewTextField("TestKey2", "TestKey Data2"))
if err = indexWriter.Update(doc.ID(), doc); err != nil {
t.Fatal(err)
}

err = indexWriter.Close()
if err != nil {
t.Fatal(err)
}

// now delete both documents
indexWriter, err = OpenWriter(config)
if err != nil {
t.Fatal(err)
}

if err = indexWriter.Delete(Identifier("a1")); err != nil {
t.Fatal(err)
}

if err = indexWriter.Delete(Identifier("a2")); err != nil {
t.Fatal(err)
}

err = indexWriter.Close()
if err != nil {
t.Fatal(err)
}

// now open index again
indexWriter, err = OpenWriter(config)
if err != nil {
t.Fatal(err)
}
err = indexWriter.Close()
if err != nil {
t.Fatal(err)
}
}