Skip to content

Commit 86935c1

Browse files
committed
Dave's review
1 parent 3ac0547 commit 86935c1

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

internal/verifier/change_stream.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,10 +90,7 @@ func (verifier *Verifier) HandleChangeStreamEvents(ctx context.Context, batch []
9090
}
9191
}
9292

93-
verifier.mux.Lock()
94-
defer verifier.mux.Unlock()
95-
96-
return verifier.insertRecheckDocsWhileLocked(ctx, dbNames, collNames, docIDs, dataSizes)
93+
return verifier.insertRecheckDocs(ctx, dbNames, collNames, docIDs, dataSizes)
9794
}
9895

9996
func (verifier *Verifier) GetChangeStreamFilter() []bson.D {

internal/verifier/recheck.go

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,24 @@ func (verifier *Verifier) InsertFailedCompareRecheckDocs(
4242
collNames[i] = collName
4343
}
4444

45-
verifier.mux.Lock()
46-
defer verifier.mux.Unlock()
47-
48-
return verifier.insertRecheckDocsWhileLocked(context.Background(),
49-
dbNames, collNames, documentIDs, dataSizes)
45+
return verifier.insertRecheckDocs(
46+
context.Background(),
47+
dbNames,
48+
collNames,
49+
documentIDs,
50+
dataSizes,
51+
)
5052
}
5153

52-
func (verifier *Verifier) insertRecheckDocsWhileLocked(
54+
func (verifier *Verifier) insertRecheckDocs(
5355
ctx context.Context,
54-
dbNames []string, collNames []string, documentIDs []interface{}, dataSizes []int) error {
56+
dbNames []string,
57+
collNames []string,
58+
documentIDs []interface{},
59+
dataSizes []int,
60+
) error {
61+
verifier.mux.Lock()
62+
defer verifier.mux.Unlock()
5563

5664
generation, _ := verifier.getGenerationWhileLocked()
5765

internal/verifier/recheck_test.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -333,9 +333,6 @@ func insertRecheckDocs(
333333
documentIDs []any,
334334
dataSizes []int,
335335
) error {
336-
verifier.mux.Lock()
337-
defer verifier.mux.Unlock()
338-
339336
dbNames := make([]string, len(documentIDs))
340337
collNames := make([]string, len(documentIDs))
341338

@@ -344,5 +341,5 @@ func insertRecheckDocs(
344341
collNames[i] = collName
345342
}
346343

347-
return verifier.insertRecheckDocsWhileLocked(ctx, dbNames, collNames, documentIDs, dataSizes)
344+
return verifier.insertRecheckDocs(ctx, dbNames, collNames, documentIDs, dataSizes)
348345
}

0 commit comments

Comments
 (0)