minor cleanup

doc_test.go

@@ -330,5 +330,3 @@ func newStubSynonymDocument(id string, synonymField index.SynonymField) index.Sy
 	}
 	return rv
 }
-
-// -----------------------------------------------------------------------------

section_inverted_text_index.go

@@ -450,8 +450,6 @@ func (io *invertedIndexOpaque) writeDicts(w *CountHashWriter) (dictOffsets []uin
 	}
 
 	for fieldID, terms := range io.DictKeys {
-		dict := io.Dicts[fieldID]
-
 		if cap(docTermMap) < len(io.results) {
 			docTermMap = make([][]byte, len(io.results))
 		} else {
@@ -461,6 +459,8 @@ func (io *invertedIndexOpaque) writeDicts(w *CountHashWriter) (dictOffsets []uin
 			}
 		}
 
+		dict := io.Dicts[fieldID]
+
 		for _, term := range terms { // terms are already sorted
 			pid := dict[term] - 1
 

segment.go

@@ -478,7 +478,7 @@ func (sb *SegmentBase) dictionary(field string) (rv *Dictionary, err error) {
 	return rv, nil
 }
 
-// Thesaurus returns the term thesaurus for the specified field
+// Thesaurus returns the thesaurus with the specified name, or an empty thesaurus if not found.
 func (s *SegmentBase) Thesaurus(name string) (segment.Thesaurus, error) {
 	thesaurus, err := s.thesaurus(name)
 	if err == nil && thesaurus == nil {
@@ -499,14 +499,10 @@ func (sb *SegmentBase) thesaurus(name string) (rv *Thesaurus, err error) {
 			name:    name,
 			fieldID: fieldIDPlus1 - 1,
 		}
-		// the below loop loads the following:
-		// 1. doc values(first 2 iterations) - adhering to the sections format. never
-		// valid values for synonym section.
 		for i := 0; i < 2; i++ {
 			_, n := binary.Uvarint(sb.mem[thesaurusStart : thesaurusStart+binary.MaxVarintLen64])
 			thesaurusStart += uint64(n)
 		}
-		// 2. thesaurus location - valid value for synonym section.
 		thesLoc, n := binary.Uvarint(sb.mem[thesaurusStart : thesaurusStart+binary.MaxVarintLen64])
 		thesaurusStart += uint64(n)
 		fst, synTermMap, err := sb.synIndexCache.loadOrCreate(rv.fieldID, sb.mem[thesLoc:])

synonym_cache.go

@@ -65,7 +65,6 @@ func (sc *synonymIndexCache) loadOrCreate(fieldID uint16, mem []byte) (*vellum.F
 
 func (sc *synonymIndexCache) createAndCacheLOCKED(fieldID uint16, mem []byte) (*vellum.FST, map[uint32][]byte, error) {
 	var pos uint64
-	// read the length of the vellum data
 	vellumLen, read := binary.Uvarint(mem[pos : pos+binary.MaxVarintLen64])
 	if vellumLen == 0 || read <= 0 {
 		return nil, nil, fmt.Errorf("vellum length is 0")
@@ -77,12 +76,12 @@ func (sc *synonymIndexCache) createAndCacheLOCKED(fieldID uint16, mem []byte) (*
 		return nil, nil, fmt.Errorf("vellum err: %v", err)
 	}
 	pos += vellumLen
-	synTermMap := make(map[uint32][]byte)
 	numSyns, n := binary.Uvarint(mem[pos : pos+binary.MaxVarintLen64])
 	pos += uint64(n)
 	if numSyns == 0 {
 		return nil, nil, fmt.Errorf("no synonyms found")
 	}
+	synTermMap := make(map[uint32][]byte, numSyns)
 	for i := 0; i < int(numSyns); i++ {
 		synID, n := binary.Uvarint(mem[pos : pos+binary.MaxVarintLen64])
 		pos += uint64(n)

synonym_posting.go

@@ -90,9 +90,7 @@ func (s *SynonymsList) iterator(rv *SynonymsIterator) *SynonymsIterator {
 	rv.except = s.except
 	rv.Actual = s.synonyms.Iterator()
 	rv.ActualBM = s.synonyms
-
 	rv.synIDTermMap = s.synIDTermMap
-
 	return rv
 }