Skip to content

Commit 6921dc3

Browse files
jimwwalkerdaverigby
authored andcommitted
MB-37781: Remove no-manifest error
This error code is no longer used - remove. Change-Id: I9dc425874416f35604f211157bdfbd3245bc10f1 Reviewed-on: http://review.couchbase.org/c/kv_engine/+/137669 Tested-by: Build Bot <[email protected]> Reviewed-by: Richard de Mellow <[email protected]>
1 parent 671bbe3 commit 6921dc3

File tree

6 files changed

+0
-18
lines changed

6 files changed

+0
-18
lines changed

daemon/protocol/mcbp/executors.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ void handle_executor_status(Cookie& cookie, cb::engine_errc status) {
5757
case engine_errc::locked_tmpfail:
5858
case engine_errc::unknown_collection:
5959
case engine_errc::predicate_failed:
60-
case engine_errc::no_collections_manifest:
6160
case engine_errc::cannot_apply_collections_manifest:
6261
case engine_errc::collections_manifest_is_ahead:
6362
case engine_errc::unknown_scope:

engines/utilities/engine_error.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@ std::string cb::to_string(cb::engine_errc code) {
9494
return "unknown collection";
9595
case cb::engine_errc::predicate_failed:
9696
return "predicate_failed";
97-
case cb::engine_errc::no_collections_manifest:
98-
return "no_collections_manifest";
9997
case cb::engine_errc::cannot_apply_collections_manifest:
10098
return "cannot_apply_collections_manifest";
10199
case cb::engine_errc::collections_manifest_is_ahead:

include/mcbp/protocol/status.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,11 +112,6 @@ enum class Status : uint16_t {
112112
*/
113113
UnknownCollection = 0x88,
114114

115-
/**
116-
* Operation attempted and requires that the collections manifest is set.
117-
*/
118-
NoCollectionsManifest = 0x89,
119-
120115
/**
121116
* Bucket Manifest update could not be applied to vbucket(s)
122117
*/

include/memcached/engine_error.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,6 @@ enum class engine_errc {
9999
*/
100100
predicate_failed = 0x17,
101101

102-
/**
103-
* The request cannot complete until a collections manifest has been set
104-
*/
105-
no_collections_manifest = 0x18,
106-
107102
/**
108103
* The collections manifest passed validation but could not be applied
109104
*/

protocol/mcbp/status.cc

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ bool isStatusSuccess(Status status) {
5353
case Status::Etmpfail:
5454
case Status::XattrEinval:
5555
case Status::UnknownCollection:
56-
case Status::NoCollectionsManifest:
5756
case Status::CannotApplyCollectionsManifest:
5857
case Status::CollectionsManifestIsAhead:
5958
case Status::UnknownScope:
@@ -172,8 +171,6 @@ std::string to_string(cb::mcbp::Status status) {
172171
return "Invalid XATTR section";
173172
case Status::UnknownCollection:
174173
return "Unknown Collection";
175-
case Status::NoCollectionsManifest:
176-
return "No Collections Manifest";
177174
case Status::CannotApplyCollectionsManifest:
178175
return "Cannot apply collections manifest";
179176
case Status::CollectionsManifestIsAhead:

utilities/engine_errc_2_mcbp.cc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ cb::mcbp::Status cb::mcbp::to_status(cb::engine_errc code) {
6060
return Status::Locked;
6161
case engine_errc::unknown_collection:
6262
return Status::UnknownCollection;
63-
case engine_errc::no_collections_manifest:
64-
return Status::NoCollectionsManifest;
6563
case engine_errc::cannot_apply_collections_manifest:
6664
return Status::CannotApplyCollectionsManifest;
6765
case engine_errc::collections_manifest_is_ahead:

0 commit comments

Comments
 (0)