From a575be4d56f89f805b4a4904834932095df5c977 Mon Sep 17 00:00:00 2001
From: Marty Schoch <marty.schoch@gmail.com>
Date: Fri, 15 Dec 2017 19:26:23 -0500
Subject: [PATCH] fix issue where we incorrectly seed the nextSegmentID on
 Open()

---
 index/scorch/persister.go | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/index/scorch/persister.go b/index/scorch/persister.go
index d0f010e4..73a0bd9f 100644
--- a/index/scorch/persister.go
+++ b/index/scorch/persister.go
@@ -22,6 +22,7 @@ import (
 	"os"
 	"path/filepath"
 	"sort"
+	"strconv"
 	"strings"
 
 	"github.com/RoaringBitmap/roaring"
@@ -318,10 +319,9 @@ func (s *Scorch) loadFromBolt() error {
 			}
 			indexSnapshot.epoch = snapshotEpoch
 			// set the nextSegmentID
-			for _, segment := range indexSnapshot.segment {
-				if segment.id > s.nextSegmentID {
-					s.nextSegmentID = segment.id
-				}
+			s.nextSegmentID, err = s.maxSegmentIDOnDisk()
+			if err != nil {
+				return err
 			}
 			s.nextSegmentID++
 			s.nextSnapshotEpoch = snapshotEpoch + 1
@@ -485,6 +485,29 @@ func (s *Scorch) removeOldBoltSnapshots() (numRemoved int, err error) {
 	return numRemoved, err
 }
 
+func (s *Scorch) maxSegmentIDOnDisk() (uint64, error) {
+	currFileInfos, err := ioutil.ReadDir(s.path)
+	if err != nil {
+		return 0, err
+	}
+
+	var rv uint64
+	for _, finfo := range currFileInfos {
+		fname := finfo.Name()
+		if filepath.Ext(fname) == ".zap" {
+			prefix := strings.TrimSuffix(fname, ".zap")
+			id, err2 := strconv.ParseUint(prefix, 16, 64)
+			if err2 != nil {
+				return 0, err2
+			}
+			if id > rv {
+				rv = id
+			}
+		}
+	}
+	return rv, err
+}
+
 // Removes any *.zap files which aren't listed in the rootBolt.
 func (s *Scorch) removeOldZapFiles() error {
 	liveFileNames, err := s.loadZapFileNames()