reorder interfaces

segment.go

@@ -61,11 +61,6 @@ type PersistedSegment interface {
 	Path() string
 }
 
-type SynonymSegment interface {
-	Segment
-	Thesaurus(field string) (Thesaurus, error)
-}
-
 type TermDictionary interface {
 	PostingsList(term []byte, except *roaring.Bitmap, prealloc PostingsList) (PostingsList, error)
 
@@ -75,12 +70,6 @@ type TermDictionary interface {
 	Contains(key []byte) (bool, error)
 }
 
-type Thesaurus interface {
-	SynonymsList(term []byte, except *roaring.Bitmap, prealloc SynonymsList) (SynonymsList, error)
-
-	Contains(key []byte) (bool, error)
-}
-
 type DictionaryIterator interface {
 	Next() (*index.DictEntry, error)
 }
@@ -100,12 +89,6 @@ type PostingsList interface {
 	// Or(other PostingsList) PostingsList
 }
 
-type SynonymsList interface {
-	Iterator(prealloc SynonymsIterator) SynonymsIterator
-
-	Size() int
-}
-
 type PostingsIterator interface {
 	DiskStatsReporter
 
@@ -124,16 +107,6 @@ type PostingsIterator interface {
 	Size() int
 }
 
-type SynonymsIterator interface {
-	// The caller is responsible for copying whatever it needs from
-	// the returned Posting instance before calling Next(), as some
-	// implementations may return a shared instance to reduce memory
-	// allocations.
-	Next() (Synonym, error)
-
-	Size() int
-}
-
 type DiskStatsReporter interface {
 	// BytesRead returns the bytes read from the disk as
 	// part of the current running query.
@@ -166,13 +139,6 @@ type Posting interface {
 	Size() int
 }
 
-type Synonym interface {
-	Term() string
-	DocNum() uint32
-	SynonymID() uint32
-	Size() int
-}
-
 type Location interface {
 	Field() string
 	Start() uint64
@@ -212,3 +178,37 @@ type FieldStats interface {
 	Aggregate(stats FieldStats)
 	Fetch() map[string]map[string]uint64
 }
+
+type ThesaurusSegment interface {
+	Segment
+	Thesaurus(field string) (Thesaurus, error)
+}
+
+type Thesaurus interface {
+	SynonymsList(term []byte, except *roaring.Bitmap, prealloc SynonymsList) (SynonymsList, error)
+
+	AutomatonIterator(a Automaton,
+		startKeyInclusive, endKeyExclusive []byte) ThesaurusIterator
+
+	Contains(key []byte) (bool, error)
+}
+
+type ThesaurusIterator interface {
+	Next() (*index.ThesaurusEntry, error)
+}
+
+type SynonymsList interface {
+	Iterator(prealloc SynonymsIterator) SynonymsIterator
+	Size() int
+}
+
+type SynonymsIterator interface {
+	Next() (Synonym, error)
+	Size() int
+}
+
+type Synonym interface {
+	Number() uint32
+	Term() string
+	Size() int
+}