Merge pull request #6565 from sfc-gh-jfu/jfu-fix-conflict-range-bug

Apply stricter condition for special keys check
This commit is contained in:
A.J. Beamon 2022-03-08 14:52:59 -08:00 committed by GitHub
commit 693bcb4582
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions

View File

@ -328,8 +328,8 @@ struct ConflictRangeWorkload : TestWorkload {
if (res.size() == originalResults.size()) { if (res.size() == originalResults.size()) {
for (int i = 0; i < res.size(); i++) { for (int i = 0; i < res.size(); i++) {
if (res[i] != originalResults[i] && !res[i].key.startsWith("\xff"_sr) && if (res[i] != originalResults[i] &&
!originalResults[i].key.startsWith("\xff"_sr)) { !(res[i].key.startsWith("\xff"_sr) && originalResults[i].key.startsWith("\xff"_sr))) {
TraceEvent(SevError, "ConflictRangeError") TraceEvent(SevError, "ConflictRangeError")
.detail("Info", "No conflict returned, however results do not match") .detail("Info", "No conflict returned, however results do not match")
.detail("Original", .detail("Original",