gibheer
/
bleve
0
0
Fork 0
Code

Merge pull request #845 from steveyen/MB-28719-related-assertions 

MB-28719 related assertions
This commit is contained in:
Steve Yen 2018-03-20 11:38:31 -07:00 committed by GitHub
parent 65e16a7d96 2f4d3d8587
commit e88cb783e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
index/scorch/segment/zap/merge.go
View File

@ -755,6 +755,10 @@ func mergeFields(segments []*SegmentBase) (bool, []string) {
if len(segment0Fields) != len(fields) || segment0Fields[fieldi] != field {
fieldsSame = false
}
if fieldi > 1 && field <= fields[fieldi-1] {
panic(fmt.Sprintf("mergeFields on unsorted fields: %#v", fields))
}
}
}

23
index/scorch/segment/zap/new.go
View File

@ -17,6 +17,7 @@ package zap
import (
"bytes"
"encoding/binary"
"fmt"
"math"
"sort"
"sync"
@ -288,6 +289,16 @@ func (s *interim) getOrDefineField(fieldName string) int {
return int(fieldIDPlus1 - 1)
}
// the fieldName must be for a known field
func (s *interim) getField(fieldName string) int {
fieldIDPlus1, exists := s.FieldsMap[fieldName]
if !exists || fieldIDPlus1 <= 0 {
panic(fmt.Sprintf("getField saw unknown fieldName: %s, fieldsMap: %#v",
fieldName, s.FieldsMap))
}
return int(fieldIDPlus1 - 1)
}
// fill Dicts and DictKeys from analysis results
func (s *interim) prepareDicts() {
var pidNext int
@ -328,14 +339,14 @@ func (s *interim) prepareDicts() {
for _, result := range s.results {
// walk each composite field
for _, field := range result.Document.CompositeFields {
fieldID := uint16(s.getOrDefineField(field.Name()))
fieldID := uint16(s.getField(field.Name()))
_, tf := field.Analyze()
visitField(fieldID, tf)
}
// walk each field
for i, field := range result.Document.Fields {
fieldID := uint16(s.getOrDefineField(field.Name()))
fieldID := uint16(s.getField(field.Name()))
tf := result.Analyzed[i]
visitField(fieldID, tf)
}
@ -439,14 +450,14 @@ func (s *interim) processDocument(docNum uint64,
// walk each composite field
for _, field := range result.Document.CompositeFields {
fieldID := uint16(s.getOrDefineField(field.Name()))
fieldID := uint16(s.getField(field.Name()))
ln, tf := field.Analyze()
visitField(fieldID, field.Name(), ln, tf)
}
// walk each field
for i, field := range result.Document.Fields {
fieldID := uint16(s.getOrDefineField(field.Name()))
fieldID := uint16(s.getField(field.Name()))
ln := result.Length[i]
tf := result.Analyzed[i]
visitField(fieldID, field.Name(), ln, tf)
@ -477,7 +488,7 @@ func (s *interim) processDocument(docNum uint64,
for _, loc := range tf.Locations {
var locf = uint16(fieldID)
if loc.Field != "" {
locf = uint16(s.getOrDefineField(loc.Field))
locf = uint16(s.getField(loc.Field))
}
var arrayposs []uint64
if len(loc.ArrayPositions) > 0 {
@ -517,7 +528,7 @@ func (s *interim) writeStoredFields() (
}
for _, field := range result.Document.Fields {
fieldID := uint16(s.getOrDefineField(field.Name()))
fieldID := uint16(s.getField(field.Name()))
opts := field.Options()