Skip to content

Commit 785dcc6

Browse files
committed
MB-35297: Change from SCAN_ABORTED to SCAN_CANCELLED
couchstore status is renamed in linked couchstore change Change-Id: Ieb4e7e47aa8bc0780ba56771ce59cfedd621b65d Reviewed-on: https://review.couchbase.org/c/kv_engine/+/172035 Reviewed-by: Dave Rigby <[email protected]> Tested-by: Build Bot <[email protected]>
1 parent 9f02fd9 commit 785dcc6

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

engines/ep/src/kvstore/couch-kvstore/couch-kvstore.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2334,7 +2334,7 @@ ScanStatus CouchKVStore::scan(BySeqnoScanContext& ctx) const {
23342334
return ScanStatus::Success;
23352335
} else if (errorCode == COUCHSTORE_ERROR_SCAN_YIELD) {
23362336
return ScanStatus::Yield;
2337-
} else if (errorCode == COUCHSTORE_ERROR_SCAN_ABORTED) {
2337+
} else if (errorCode == COUCHSTORE_ERROR_SCAN_CANCELLED) {
23382338
return ScanStatus::Cancelled;
23392339
}
23402340

@@ -2399,7 +2399,7 @@ ScanStatus CouchKVStore::scan(ByIdScanContext& ctx) const {
23992399
return ScanStatus::Success;
24002400
} else if (errorCode == COUCHSTORE_ERROR_SCAN_YIELD) {
24012401
return ScanStatus::Yield;
2402-
} else if (errorCode == COUCHSTORE_ERROR_SCAN_ABORTED) {
2402+
} else if (errorCode == COUCHSTORE_ERROR_SCAN_CANCELLED) {
24032403
return ScanStatus::Cancelled;
24042404
}
24052405

@@ -2824,7 +2824,7 @@ static int bySeqnoScanCallback(Db* db, DocInfo* docinfo, void* ctx) {
28242824
if (cl.getStatus() == cb::engine_errc::no_memory) {
28252825
return COUCHSTORE_ERROR_SCAN_YIELD;
28262826
}
2827-
return COUCHSTORE_ERROR_SCAN_ABORTED;
2827+
return COUCHSTORE_ERROR_SCAN_CANCELLED;
28282828
}
28292829
}
28302830

@@ -2882,7 +2882,7 @@ static int bySeqnoScanCallback(Db* db, DocInfo* docinfo, void* ctx) {
28822882
if (cb.getStatus() == cb::engine_errc::no_memory) {
28832883
return COUCHSTORE_ERROR_SCAN_YIELD;
28842884
}
2885-
return COUCHSTORE_ERROR_SCAN_ABORTED;
2885+
return COUCHSTORE_ERROR_SCAN_CANCELLED;
28862886
}
28872887

28882888
sctx->lastReadSeqno = byseqno;

0 commit comments

Comments
 (0)