refactor

Author: CascadingRadium

index/scorch/introducer.go

@@ -167,6 +167,11 @@ func (s *Scorch) introduceSegment(next *segmentIntroduction) error {
 			newss.deleted = nil
 		}
 
+		// update the deleted bitmap to include any nested/sub-documents as well
+		// if the segment supports that
+		if ns, ok := newss.segment.(segment.NestedSegment); ok {
+			newss.deleted = ns.AddNestedDocuments(newss.deleted)
+		}
 		// check for live size before copying
 		if newss.LiveSize() > 0 {
 			newSnapshot.segment = append(newSnapshot.segment, newss)

mapping/document.go

@@ -451,7 +451,7 @@ func (dm *DocumentMapping) walkDocument(data interface{}, path []string, indexes
 			if val.Index(i).CanInterface() {
 				fieldVal := val.Index(i).Interface()
 				if nestedSubObjects {
-					nestedDocument := document.NewDocument(fmt.Sprintf("%s_%s_%d", context.doc.ID(), encodePath(path), i))
+					nestedDocument := document.NewDocument(fmt.Sprintf("%s_$%s_$%d", context.doc.ID(), encodePath(path), i))
 					nestedContext := context.im.newWalkContext(nestedDocument, dm)
 					dm.processProperty(fieldVal, path, append(indexes, uint64(i)), nestedContext)
 					context.doc.AddNestedDocument(nestedDocument)