Skip to content

Commit 49047cf

Browse files
committed
MB-57888: Naming changes
1 parent 9c53352 commit 49047cf

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

index/scorch/optimize_knn.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ func (o *OptimizeVR) Finish() error {
8787
for field, vrs := range o.vrs {
8888
var vecIndex segment_api.VectorIndex
8989
var err error
90-
if info, ok := o.snapshot.updatedFields[field]; ok && (info.RemoveAll || info.Index) {
90+
if info, ok := o.snapshot.updatedFields[field]; ok && (info.Deleted || info.Index) {
9191
vecIndex, err = segment.InterpretVectorIndex("",
9292
o.requiresFiltering, origSeg.deleted)
9393
} else {

index/scorch/scorch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -947,7 +947,7 @@ func (s *Scorch) updateBolt(fieldInfo map[string]index.UpdateFieldInfo, mappingB
947947
for field, info := range fieldInfo {
948948
if val, ok := updatedFields[field]; ok {
949949
updatedFields[field] = index.UpdateFieldInfo{
950-
RemoveAll: info.RemoveAll || val.RemoveAll,
950+
Deleted: info.Deleted || val.Deleted,
951951
Store: info.Store || val.Store,
952952
DocValues: info.DocValues || val.DocValues,
953953
Index: info.Index || val.Index,

index/scorch/snapshot_index.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ func (is *IndexSnapshot) Document(id string) (rv index.Document, err error) {
473473

474474
// Skip fields that are supposed to have deleted store values
475475
if info, ok := is.updatedFields[name]; ok &&
476-
(info.RemoveAll || info.Store) {
476+
(info.Deleted || info.Store) {
477477
return true
478478
}
479479

@@ -622,7 +622,7 @@ func (is *IndexSnapshot) TermFieldReader(ctx context.Context, term []byte, field
622622

623623
// Skip fields that are supposed to have no indexing
624624
if info, ok := is.updatedFields[field]; ok &&
625-
(info.Index || info.RemoveAll) {
625+
(info.Index || info.Deleted) {
626626
dict, err = s.segment.Dictionary("")
627627
} else {
628628
dict, err = s.segment.Dictionary(field)
@@ -779,7 +779,7 @@ func (is *IndexSnapshot) documentVisitFieldTermsOnSegment(
779779
var filteredFields []string
780780
for _, field := range vFields {
781781
if info, ok := is.updatedFields[field]; ok &&
782-
(info.DocValues || info.RemoveAll) {
782+
(info.DocValues || info.Deleted) {
783783
continue
784784
} else {
785785
filteredFields = append(filteredFields, field)
@@ -1172,7 +1172,7 @@ func (is *IndexSnapshot) UpdateFieldsInfo(updatedFields map[string]*index.Update
11721172
} else {
11731173
for fieldName, info := range updatedFields {
11741174
if val, ok := is.updatedFields[fieldName]; ok {
1175-
val.RemoveAll = val.RemoveAll || info.RemoveAll
1175+
val.Deleted = val.Deleted || info.Deleted
11761176
val.Index = val.Index || info.Index
11771177
val.DocValues = val.DocValues || info.DocValues
11781178
val.Store = val.Store || info.Store

index/scorch/snapshot_segment.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ func (s *SegmentSnapshot) UpdateFieldsInfo(updatedFields map[string]*index.Updat
154154
} else {
155155
for fieldName, info := range updatedFields {
156156
if val, ok := s.updatedFields[fieldName]; ok {
157-
val.RemoveAll = val.RemoveAll || info.RemoveAll
157+
val.Deleted = val.Deleted || info.Deleted
158158
val.Index = val.Index || info.Index
159159
val.DocValues = val.DocValues || info.DocValues
160160
val.Store = val.Store || info.Store

index_update.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,10 @@ func DeletedFields(ori, upd *mapping.IndexMappingImpl) (map[string]*index.Update
101101
// Remove entries from the list with no changes between the
102102
// original and the updated mapping
103103
for name, info := range fieldInfo {
104-
if !info.RemoveAll && !info.Index && !info.DocValues && !info.Store {
104+
if !info.Deleted && !info.Index && !info.DocValues && !info.Store {
105105
delete(fieldInfo, name)
106106
}
107-
if info.RemoveAll {
107+
if info.Deleted {
108108
if upd.IndexDynamic {
109109
return nil, fmt.Errorf("Mapping cannot be removed when index dynamic is true")
110110
}
@@ -322,7 +322,7 @@ func compareFieldMapping(original, updated *mapping.FieldMapping, defaultChanges
322322

323323
if updated == nil {
324324
if original != nil && !original.IncludeInAll {
325-
rv.RemoveAll = true
325+
rv.Deleted = true
326326
return rv, true, nil
327327
} else if original == nil {
328328
return nil, false, nil
@@ -406,7 +406,7 @@ func compareFieldMapping(original, updated *mapping.FieldMapping, defaultChanges
406406
}
407407
}
408408

409-
if rv.RemoveAll || rv.Index || rv.Store || rv.DocValues {
409+
if rv.Deleted || rv.Index || rv.Store || rv.DocValues {
410410
return rv, true, nil
411411
}
412412
return rv, false, nil
@@ -437,7 +437,7 @@ func validateFieldInfo(newInfo *index.UpdateFieldInfo, updated bool, fInfo map[s
437437
}
438438
}
439439
if oldInfo, ok := fInfo[name]; ok {
440-
if oldInfo.RemoveAll != newInfo.RemoveAll || oldInfo.Index != newInfo.Index ||
440+
if oldInfo.Deleted != newInfo.Deleted || oldInfo.Index != newInfo.Index ||
441441
oldInfo.DocValues != newInfo.DocValues || oldInfo.Store != newInfo.Store {
442442
return fmt.Errorf("updated field impossible to verify because multiple mappings point to the same field name")
443443
}

index_update_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func TestCompareFieldMapping(t *testing.T) {
5555
synonymSource: false,
5656
},
5757
indexFieldInfo: &index.UpdateFieldInfo{
58-
RemoveAll: true,
58+
Deleted: true,
5959
},
6060
changed: true,
6161
err: false,
@@ -1913,7 +1913,7 @@ func TestDeletedFields(t *testing.T) {
19131913
DocValues: true,
19141914
},
19151915
"d": {
1916-
RemoveAll: true,
1916+
Deleted: true,
19171917
},
19181918
},
19191919
err: false,

0 commit comments

Comments
 (0)