diff --git a/src/include/aerospike/as_status.h b/src/include/aerospike/as_status.h index 6f0293168..d16197758 100644 --- a/src/include/aerospike/as_status.h +++ b/src/include/aerospike/as_status.h @@ -280,42 +280,11 @@ typedef enum as_status_e { */ AEROSPIKE_LOST_CONFLICT = 28, - /** - * MRT record blocked by a different transaction. - */ - AEROSPIKE_MRT_BLOCKED = 29, - - /** - * MRT read version mismatch identified during commit. - * Some other command changed the record outside of the transaction. - */ - AEROSPIKE_MRT_VERSION_MISMATCH = 30, - - /** - * MRT deadline reached without a successful commit or abort. - */ - AEROSPIKE_MRT_EXPIRED = 31, - /** * Write can't complete until XDR finishes shipping. */ AEROSPIKE_XDR_KEY_BUSY = 32, - /** - * MRT was already committed. - */ - AEROSPIKE_MRT_COMMITTED = 33, - - /** - * MRT was already aborted. - */ - AEROSPIKE_MRT_ABORTED = 34, - - /** - * MRT write command limit (4096) exceeded. - */ - AEROSPIKE_MRT_TOO_MANY_WRITES = 35, - /** * There are no more records left for query. */ @@ -441,16 +410,47 @@ typedef enum as_status_e { */ AEROSPIKE_ERR_UDF = 100, + /** + * MRT record blocked by a different transaction. + */ + AEROSPIKE_MRT_BLOCKED = 120, + + /** + * MRT read version mismatch identified during commit. + * Some other command changed the record outside of the transaction. + */ + AEROSPIKE_MRT_VERSION_MISMATCH = 121, + + /** + * MRT deadline reached without a successful commit or abort. + */ + AEROSPIKE_MRT_EXPIRED = 122, + + /** + * MRT write command limit (4096) exceeded. + */ + AEROSPIKE_MRT_TOO_MANY_WRITES = 123, + + /** + * MRT was already committed. + */ + AEROSPIKE_MRT_COMMITTED = 124, + + /** + * MRT was already aborted. + */ + AEROSPIKE_MRT_ABORTED = 125, + /** * Batch functionality has been disabled. */ AEROSPIKE_ERR_BATCH_DISABLED = 150, - + /** * Batch max requests have been exceeded. */ AEROSPIKE_ERR_BATCH_MAX_REQUESTS_EXCEEDED = 151, - + /** * All batch queues are full. */ diff --git a/src/main/aerospike/as_error.c b/src/main/aerospike/as_error.c index d81d42190..f4b2a05be 100644 --- a/src/main/aerospike/as_error.c +++ b/src/main/aerospike/as_error.c @@ -77,13 +77,7 @@ as_error_string(as_status status) CASE_ASSIGN(AEROSPIKE_ERR_OP_NOT_APPLICABLE); CASE_ASSIGN(AEROSPIKE_FILTERED_OUT); CASE_ASSIGN(AEROSPIKE_LOST_CONFLICT); - CASE_ASSIGN(AEROSPIKE_MRT_BLOCKED); - CASE_ASSIGN(AEROSPIKE_MRT_VERSION_MISMATCH); - CASE_ASSIGN(AEROSPIKE_MRT_EXPIRED); CASE_ASSIGN(AEROSPIKE_XDR_KEY_BUSY); - CASE_ASSIGN(AEROSPIKE_MRT_COMMITTED); - CASE_ASSIGN(AEROSPIKE_MRT_ABORTED); - CASE_ASSIGN(AEROSPIKE_MRT_TOO_MANY_WRITES); CASE_ASSIGN(AEROSPIKE_SECURITY_NOT_SUPPORTED); CASE_ASSIGN(AEROSPIKE_SECURITY_NOT_ENABLED); CASE_ASSIGN(AEROSPIKE_SECURITY_SCHEME_NOT_SUPPORTED); @@ -108,6 +102,12 @@ as_error_string(as_status status) CASE_ASSIGN(AEROSPIKE_NOT_WHITELISTED); CASE_ASSIGN(AEROSPIKE_QUOTA_EXCEEDED); CASE_ASSIGN(AEROSPIKE_ERR_UDF); + CASE_ASSIGN(AEROSPIKE_MRT_BLOCKED); + CASE_ASSIGN(AEROSPIKE_MRT_VERSION_MISMATCH); + CASE_ASSIGN(AEROSPIKE_MRT_EXPIRED); + CASE_ASSIGN(AEROSPIKE_MRT_TOO_MANY_WRITES); + CASE_ASSIGN(AEROSPIKE_MRT_COMMITTED); + CASE_ASSIGN(AEROSPIKE_MRT_ABORTED); CASE_ASSIGN(AEROSPIKE_ERR_BATCH_DISABLED); CASE_ASSIGN(AEROSPIKE_ERR_BATCH_MAX_REQUESTS_EXCEEDED); CASE_ASSIGN(AEROSPIKE_ERR_BATCH_QUEUES_FULL);