From 5c39692c2015eaa7d43f1a0e9830b4aa7cc6344e Mon Sep 17 00:00:00 2001 From: Jan Date: Fri, 5 Jul 2019 13:36:16 +0200 Subject: [PATCH] remove several outdated error codes (#9402) --- js/common/bootstrap/errors.js | 26 +---- js/server/modules/@arangodb/actions.js | 1 - lib/Basics/errors.dat | 24 ----- lib/Basics/voc-errors.cpp | 24 ----- lib/Basics/voc-errors.h | 132 ------------------------- lib/Rest/GeneralResponse.cpp | 5 - 6 files changed, 1 insertion(+), 211 deletions(-) diff --git a/js/common/bootstrap/errors.js b/js/common/bootstrap/errors.js index 652504ff84..9c24d84e81 100644 --- a/js/common/bootstrap/errors.js +++ b/js/common/bootstrap/errors.js @@ -91,7 +91,6 @@ "ERROR_ARANGO_DOCUMENT_TOO_LARGE" : { "code" : 1216, "message" : "document too large" }, "ERROR_ARANGO_COLLECTION_NOT_UNLOADED" : { "code" : 1217, "message" : "collection must be unloaded" }, "ERROR_ARANGO_COLLECTION_TYPE_INVALID" : { "code" : 1218, "message" : "collection type invalid" }, - "ERROR_ARANGO_VALIDATION_FAILED" : { "code" : 1219, "message" : "validator failed" }, "ERROR_ARANGO_ATTRIBUTE_PARSER_FAILED" : { "code" : 1220, "message" : "parsing attribute name definition failed" }, "ERROR_ARANGO_DOCUMENT_KEY_BAD" : { "code" : 1221, "message" : "illegal document key" }, "ERROR_ARANGO_DOCUMENT_KEY_UNEXPECTED" : { "code" : 1222, "message" : "unexpected document key" }, @@ -102,10 +101,8 @@ "ERROR_ARANGO_DATABASE_NOT_FOUND" : { "code" : 1228, "message" : "database not found" }, "ERROR_ARANGO_DATABASE_NAME_INVALID" : { "code" : 1229, "message" : "database name invalid" }, "ERROR_ARANGO_USE_SYSTEM_DATABASE" : { "code" : 1230, "message" : "operation only allowed in system database" }, - "ERROR_ARANGO_ENDPOINT_NOT_FOUND" : { "code" : 1231, "message" : "endpoint not found" }, "ERROR_ARANGO_INVALID_KEY_GENERATOR" : { "code" : 1232, "message" : "invalid key generator" }, "ERROR_ARANGO_INVALID_EDGE_ATTRIBUTE" : { "code" : 1233, "message" : "edge attribute missing or invalid" }, - "ERROR_ARANGO_INDEX_DOCUMENT_ATTRIBUTE_MISSING" : { "code" : 1234, "message" : "index insertion warning - attribute missing in document" }, "ERROR_ARANGO_INDEX_CREATION_FAILED" : { "code" : 1235, "message" : "index creation failed" }, "ERROR_ARANGO_WRITE_THROTTLE_TIMEOUT" : { "code" : 1236, "message" : "write-throttling timeout" }, "ERROR_ARANGO_COLLECTION_TYPE_MISMATCH" : { "code" : 1237, "message" : "collection type mismatch" }, @@ -134,12 +131,8 @@ "ERROR_REPLICATION_START_TICK_NOT_PRESENT" : { "code" : 1414, "message" : "start tick not present" }, "ERROR_REPLICATION_WRONG_CHECKSUM" : { "code" : 1416, "message" : "wrong checksum" }, "ERROR_REPLICATION_SHARD_NONEMPTY" : { "code" : 1417, "message" : "shard not empty" }, - "ERROR_CLUSTER_NO_AGENCY" : { "code" : 1450, "message" : "could not connect to agency" }, - "ERROR_CLUSTER_NO_COORDINATOR_HEADER" : { "code" : 1451, "message" : "missing coordinator header" }, - "ERROR_CLUSTER_COULD_NOT_LOCK_PLAN" : { "code" : 1452, "message" : "could not lock plan in agency" }, "ERROR_CLUSTER_COLLECTION_ID_EXISTS" : { "code" : 1453, "message" : "collection ID already exists" }, "ERROR_CLUSTER_COULD_NOT_CREATE_COLLECTION_IN_PLAN" : { "code" : 1454, "message" : "could not create collection in plan" }, - "ERROR_CLUSTER_COULD_NOT_READ_CURRENT_VERSION" : { "code" : 1455, "message" : "could not read version in current in agency" }, "ERROR_CLUSTER_COULD_NOT_CREATE_COLLECTION" : { "code" : 1456, "message" : "could not create collection" }, "ERROR_CLUSTER_TIMEOUT" : { "code" : 1457, "message" : "timeout in cluster operation" }, "ERROR_CLUSTER_COULD_NOT_REMOVE_COLLECTION_IN_PLAN" : { "code" : 1458, "message" : "could not remove collection from plan" }, @@ -159,12 +152,8 @@ "ERROR_CLUSTER_READING_PLAN_AGENCY" : { "code" : 1472, "message" : "error reading Plan in agency" }, "ERROR_CLUSTER_COULD_NOT_TRUNCATE_COLLECTION" : { "code" : 1473, "message" : "could not truncate collection" }, "ERROR_CLUSTER_AQL_COMMUNICATION" : { "code" : 1474, "message" : "error in cluster internal communication for AQL" }, - "ERROR_ARANGO_DOCUMENT_NOT_FOUND_OR_SHARDING_ATTRIBUTES_CHANGED" : { "code" : 1475, "message" : "document not found or sharding attributes changed" }, - "ERROR_CLUSTER_COULD_NOT_DETERMINE_ID" : { "code" : 1476, "message" : "could not determine my ID from my local info" }, "ERROR_CLUSTER_ONLY_ON_DBSERVER" : { "code" : 1477, "message" : "this operation is only valid on a DBserver in a cluster" }, "ERROR_CLUSTER_BACKEND_UNAVAILABLE" : { "code" : 1478, "message" : "A cluster backend which was required for the operation could not be reached" }, - "ERROR_CLUSTER_UNKNOWN_CALLBACK_ENDPOINT" : { "code" : 1479, "message" : "An endpoint couldn't be found" }, - "ERROR_CLUSTER_AGENCY_STRUCTURE_INVALID" : { "code" : 1480, "message" : "Invalid agency structure" }, "ERROR_CLUSTER_AQL_COLLECTION_OUT_OF_SYNC" : { "code" : 1481, "message" : "collection is out of sync" }, "ERROR_CLUSTER_COULD_NOT_CREATE_INDEX_IN_PLAN" : { "code" : 1482, "message" : "could not create index in plan" }, "ERROR_CLUSTER_COULD_NOT_DROP_INDEX_IN_PLAN" : { "code" : 1483, "message" : "could not drop index in plan" }, @@ -177,8 +166,6 @@ "ERROR_CLUSTER_SHARD_FOLLOWER_REFUSES_OPERATION" : { "code" : 1490, "message" : "a shard follower refuses to perform an operation that is not a replication" }, "ERROR_CLUSTER_SHARD_LEADER_RESIGNED" : { "code" : 1491, "message" : "a (former) shard leader refuses to perform an operation, because it has resigned in the meantime" }, "ERROR_CLUSTER_AGENCY_COMMUNICATION_FAILED" : { "code" : 1492, "message" : "some agency operation failed" }, - "ERROR_CLUSTER_DISTRIBUTE_SHARDS_LIKE_REPLICATION_FACTOR" : { "code" : 1493, "message" : "conflicting replication factor with distributeShardsLike parameter assignment" }, - "ERROR_CLUSTER_DISTRIBUTE_SHARDS_LIKE_NUMBER_OF_SHARDS" : { "code" : 1494, "message" : "conflicting shard number with distributeShardsLike parameter assignment" }, "ERROR_CLUSTER_LEADERSHIP_CHALLENGE_ONGOING" : { "code" : 1495, "message" : "leadership challenge is ongoing" }, "ERROR_CLUSTER_NOT_LEADER" : { "code" : 1496, "message" : "not a leader" }, "ERROR_CLUSTER_COULD_NOT_CREATE_VIEW_IN_PLAN" : { "code" : 1497, "message" : "could not create view in plan" }, @@ -225,7 +212,6 @@ "ERROR_QUERY_FUNCTION_RUNTIME_ERROR" : { "code" : 1583, "message" : "user function runtime error: %s" }, "ERROR_QUERY_BAD_JSON_PLAN" : { "code" : 1590, "message" : "bad execution plan JSON" }, "ERROR_QUERY_NOT_FOUND" : { "code" : 1591, "message" : "query ID not found" }, - "ERROR_QUERY_IN_USE" : { "code" : 1592, "message" : "query with this ID is in use" }, "ERROR_QUERY_USER_ASSERT" : { "code" : 1593, "message" : "%s" }, "ERROR_QUERY_USER_WARN" : { "code" : 1594, "message" : "%s" }, "ERROR_CURSOR_NOT_FOUND" : { "code" : 1600, "message" : "cursor not found" }, @@ -237,12 +223,9 @@ "ERROR_TRANSACTION_ABORTED" : { "code" : 1654, "message" : "transaction aborted" }, "ERROR_TRANSACTION_NOT_FOUND" : { "code" : 1655, "message" : "transaction not found" }, "ERROR_USER_INVALID_NAME" : { "code" : 1700, "message" : "invalid user name" }, - "ERROR_USER_INVALID_PASSWORD" : { "code" : 1701, "message" : "invalid password" }, "ERROR_USER_DUPLICATE" : { "code" : 1702, "message" : "duplicate user" }, "ERROR_USER_NOT_FOUND" : { "code" : 1703, "message" : "user not found" }, "ERROR_USER_EXTERNAL" : { "code" : 1705, "message" : "user is external" }, - "ERROR_SERVICE_INVALID_NAME" : { "code" : 1750, "message" : "invalid service name" }, - "ERROR_SERVICE_INVALID_MOUNT" : { "code" : 1751, "message" : "invalid mount" }, "ERROR_SERVICE_DOWNLOAD_FAILED" : { "code" : 1752, "message" : "service download failed" }, "ERROR_SERVICE_UPLOAD_FAILED" : { "code" : 1753, "message" : "service upload failed" }, "ERROR_LDAP_CANNOT_INIT" : { "code" : 1800, "message" : "cannot init a LDAP connection" }, @@ -345,7 +328,6 @@ "ERROR_CLUSTER_REPAIRS_JOB_FAILED" : { "code" : 5008, "message" : "move shard job failed during cluster repairs" }, "ERROR_CLUSTER_REPAIRS_JOB_DISAPPEARED" : { "code" : 5009, "message" : "move shard job disappeared during cluster repairs" }, "ERROR_CLUSTER_REPAIRS_OPERATION_FAILED" : { "code" : 5010, "message" : "agency transaction failed during cluster repairs" }, - "ERROR_AGENCY_INQUIRY_SYNTAX" : { "code" : 20001, "message" : "Illegal inquiry syntax" }, "ERROR_AGENCY_INFORM_MUST_BE_OBJECT" : { "code" : 20011, "message" : "Inform message must be an object." }, "ERROR_AGENCY_INFORM_MUST_CONTAIN_TERM" : { "code" : 20012, "message" : "Inform message must contain uint parameter 'term'" }, "ERROR_AGENCY_INFORM_MUST_CONTAIN_ID" : { "code" : 20013, "message" : "Inform message must contain string parameter 'id'" }, @@ -354,16 +336,10 @@ "ERROR_AGENCY_INFORM_MUST_CONTAIN_MIN_PING" : { "code" : 20016, "message" : "Inform message must contain object 'min ping'" }, "ERROR_AGENCY_INFORM_MUST_CONTAIN_MAX_PING" : { "code" : 20017, "message" : "Inform message must contain object 'max ping'" }, "ERROR_AGENCY_INFORM_MUST_CONTAIN_TIMEOUT_MULT" : { "code" : 20018, "message" : "Inform message must contain object 'timeoutMult'" }, - "ERROR_AGENCY_INQUIRE_CLIENT_ID_MUST_BE_STRING" : { "code" : 20020, "message" : "Inquiry failed" }, "ERROR_AGENCY_CANNOT_REBUILD_DBS" : { "code" : 20021, "message" : "Cannot rebuild readDB and spearHead" }, "ERROR_SUPERVISION_GENERAL_FAILURE" : { "code" : 20501, "message" : "general supervision failure" }, - "ERROR_DISPATCHER_IS_STOPPING" : { "code" : 21001, "message" : "dispatcher stopped" }, - "ERROR_QUEUE_UNKNOWN" : { "code" : 21002, "message" : "named queue does not exist" }, "ERROR_QUEUE_FULL" : { "code" : 21003, "message" : "named queue is full" }, - "ERROR_ACTION_ALREADY_REGISTERED" : { "code" : 6001, "message" : "maintenance action already registered" }, - "ERROR_ACTION_OPERATION_UNABORTABLE" : { "code" : 6002, "message" : "this maintenance action cannot be stopped" }, - "ERROR_ACTION_UNFINISHED" : { "code" : 6003, "message" : "maintenance action still processing" }, - "ERROR_NO_SUCH_ACTION" : { "code" : 6004, "message" : "no such maintenance action" } + "ERROR_ACTION_OPERATION_UNABORTABLE" : { "code" : 6002, "message" : "this maintenance action cannot be stopped" } }; // For compatibility with <= 3.3 diff --git a/js/server/modules/@arangodb/actions.js b/js/server/modules/@arangodb/actions.js index e0ab4f8ae8..7788ad71a1 100644 --- a/js/server/modules/@arangodb/actions.js +++ b/js/server/modules/@arangodb/actions.js @@ -1794,7 +1794,6 @@ function arangoErrorToHttpCode (num) { case arangodb.ERROR_ARANGO_DATA_SOURCE_NOT_FOUND: case arangodb.ERROR_ARANGO_DOCUMENT_NOT_FOUND: case arangodb.ERROR_ARANGO_DATABASE_NOT_FOUND: - case arangodb.ERROR_ARANGO_ENDPOINT_NOT_FOUND: case arangodb.ERROR_ARANGO_NO_INDEX: case arangodb.ERROR_ARANGO_INDEX_NOT_FOUND: case arangodb.ERROR_CURSOR_NOT_FOUND: diff --git a/lib/Basics/errors.dat b/lib/Basics/errors.dat index 7871ebdab7..8192a90416 100755 --- a/lib/Basics/errors.dat +++ b/lib/Basics/errors.dat @@ -113,7 +113,6 @@ ERROR_ARANGO_INDEX_HANDLE_BAD,1214,"illegal index handle","Will be raised when a ERROR_ARANGO_DOCUMENT_TOO_LARGE,1216,"document too large","Will be raised when the document cannot fit into any datafile because of it is too large." ERROR_ARANGO_COLLECTION_NOT_UNLOADED,1217,"collection must be unloaded","Will be raised when a collection should be unloaded, but has a different status." ERROR_ARANGO_COLLECTION_TYPE_INVALID,1218,"collection type invalid","Will be raised when an invalid collection type is used in a request." -ERROR_ARANGO_VALIDATION_FAILED,1219,"validator failed","Will be raised when the validation of an attribute of a structure failed." ERROR_ARANGO_ATTRIBUTE_PARSER_FAILED,1220,"parsing attribute name definition failed","Will be raised when parsing an attribute name definition failed." ERROR_ARANGO_DOCUMENT_KEY_BAD,1221,"illegal document key","Will be raised when a document key is corrupt." ERROR_ARANGO_DOCUMENT_KEY_UNEXPECTED,1222,"unexpected document key","Will be raised when a user-defined document key is supplied for collections with auto key generation." @@ -124,10 +123,8 @@ ERROR_ARANGO_DOCUMENT_TYPE_INVALID,1227,"invalid document type","Will be raised ERROR_ARANGO_DATABASE_NOT_FOUND,1228,"database not found","Will be raised when a non-existing database is accessed." ERROR_ARANGO_DATABASE_NAME_INVALID,1229,"database name invalid","Will be raised when an invalid database name is used." ERROR_ARANGO_USE_SYSTEM_DATABASE,1230,"operation only allowed in system database","Will be raised when an operation is requested in a database other than the system database." -ERROR_ARANGO_ENDPOINT_NOT_FOUND,1231,"endpoint not found","Will be raised when there is an attempt to delete a non-existing endpoint." ERROR_ARANGO_INVALID_KEY_GENERATOR,1232,"invalid key generator","Will be raised when an invalid key generator description is used." ERROR_ARANGO_INVALID_EDGE_ATTRIBUTE,1233,"edge attribute missing or invalid","will be raised when the _from or _to values of an edge are undefined or contain an invalid value." -ERROR_ARANGO_INDEX_DOCUMENT_ATTRIBUTE_MISSING,1234,"index insertion warning - attribute missing in document","Will be raised when an attempt to insert a document into an index is caused by in the document not having one or more attributes which the index is built on." ERROR_ARANGO_INDEX_CREATION_FAILED,1235,"index creation failed","Will be raised when an attempt to create an index has failed." ERROR_ARANGO_WRITE_THROTTLE_TIMEOUT,1236,"write-throttling timeout","Will be raised when the server is write-throttled and a write operation has waited too long for the server to process queued operations." ERROR_ARANGO_COLLECTION_TYPE_MISMATCH,1237,"collection type mismatch","Will be raised when a collection has a different type from what has been expected." @@ -172,12 +169,8 @@ ERROR_REPLICATION_SHARD_NONEMPTY,1417,"shard not empty","Will be raised when a s ## ArangoDB cluster errors ################################################################################ -ERROR_CLUSTER_NO_AGENCY,1450,"could not connect to agency","Will be raised when none of the agency servers can be connected to." -ERROR_CLUSTER_NO_COORDINATOR_HEADER,1451,"missing coordinator header","Will be raised when a DB server in a cluster receives a HTTP request without a coordinator header." -ERROR_CLUSTER_COULD_NOT_LOCK_PLAN,1452,"could not lock plan in agency","Will be raised when a coordinator in a cluster cannot lock the Plan hierarchy in the agency." ERROR_CLUSTER_COLLECTION_ID_EXISTS,1453,"collection ID already exists","Will be raised when a coordinator in a cluster tries to create a collection and the collection ID already exists." ERROR_CLUSTER_COULD_NOT_CREATE_COLLECTION_IN_PLAN,1454,"could not create collection in plan","Will be raised when a coordinator in a cluster cannot create an entry for a new collection in the Plan hierarchy in the agency." -ERROR_CLUSTER_COULD_NOT_READ_CURRENT_VERSION,1455,"could not read version in current in agency","Will be raised when a coordinator in a cluster cannot read the Version entry in the Current hierarchy in the agency." ERROR_CLUSTER_COULD_NOT_CREATE_COLLECTION,1456,"could not create collection","Will be raised when a coordinator in a cluster notices that some DBServers report problems when creating shards for a new collection." ERROR_CLUSTER_TIMEOUT,1457,"timeout in cluster operation","Will be raised when a coordinator in a cluster runs into a timeout for some cluster wide operation." ERROR_CLUSTER_COULD_NOT_REMOVE_COLLECTION_IN_PLAN,1458,"could not remove collection from plan","Will be raised when a coordinator in a cluster cannot remove an entry for a collection in the Plan hierarchy in the agency." @@ -197,12 +190,8 @@ ERROR_CLUSTER_ONLY_ON_COORDINATOR,1471,"this operation is only valid on a coordi ERROR_CLUSTER_READING_PLAN_AGENCY,1472,"error reading Plan in agency","Will be raised if a coordinator or DBserver cannot read the Plan in the agency." ERROR_CLUSTER_COULD_NOT_TRUNCATE_COLLECTION,1473,"could not truncate collection","Will be raised if a coordinator cannot truncate all shards of a cluster collection." ERROR_CLUSTER_AQL_COMMUNICATION,1474,"error in cluster internal communication for AQL","Will be raised if the internal communication of the cluster for AQL produces an error." -ERROR_ARANGO_DOCUMENT_NOT_FOUND_OR_SHARDING_ATTRIBUTES_CHANGED,1475,"document not found or sharding attributes changed","Will be raised when a document with a given identifier or handle is unknown, or if the sharding attributes have been changed in a REPLACE operation in the cluster." -ERROR_CLUSTER_COULD_NOT_DETERMINE_ID,1476,"could not determine my ID from my local info","Will be raised if a cluster server at startup could not determine its own ID from the local info provided." ERROR_CLUSTER_ONLY_ON_DBSERVER,1477,"this operation is only valid on a DBserver in a cluster","Will be raised if there is an attempt to run a DBserver-only operation on a different type of node." ERROR_CLUSTER_BACKEND_UNAVAILABLE,1478,"A cluster backend which was required for the operation could not be reached","Will be raised if a required db server can't be reached." -ERROR_CLUSTER_UNKNOWN_CALLBACK_ENDPOINT,1479,"An endpoint couldn't be found","An endpoint couldn't be found" -ERROR_CLUSTER_AGENCY_STRUCTURE_INVALID,1480,"Invalid agency structure","The structure in the agency is invalid" ERROR_CLUSTER_AQL_COLLECTION_OUT_OF_SYNC,1481,"collection is out of sync","Will be raised if a collection needed during query execution is out of sync. This currently can only happen when using satellite collections" ERROR_CLUSTER_COULD_NOT_CREATE_INDEX_IN_PLAN,1482,"could not create index in plan","Will be raised when a coordinator in a cluster cannot create an entry for a new index in the Plan hierarchy in the agency." ERROR_CLUSTER_COULD_NOT_DROP_INDEX_IN_PLAN,1483,"could not drop index in plan","Will be raised when a coordinator in a cluster cannot remove an index from the Plan hierarchy in the agency." @@ -215,8 +204,6 @@ ERROR_CLUSTER_SHARD_LEADER_REFUSES_REPLICATION,1489,"a shard leader refuses to p ERROR_CLUSTER_SHARD_FOLLOWER_REFUSES_OPERATION,1490,"a shard follower refuses to perform an operation that is not a replication","Will be raised if a non-replication operation is refused by a shard follower." ERROR_CLUSTER_SHARD_LEADER_RESIGNED,1491,"a (former) shard leader refuses to perform an operation, because it has resigned in the meantime","Will be raised if a non-replication operation is refused by a former shard leader that has found out that it is no longer the leader." ERROR_CLUSTER_AGENCY_COMMUNICATION_FAILED,1492,"some agency operation failed","Will be raised if after various retries an agency operation could not be performed successfully." -ERROR_CLUSTER_DISTRIBUTE_SHARDS_LIKE_REPLICATION_FACTOR,1493,"conflicting replication factor with distributeShardsLike parameter assignment","Will be raised if intended replication factor does not match that of the prototype shard given in distributeShardsLike parameter." -ERROR_CLUSTER_DISTRIBUTE_SHARDS_LIKE_NUMBER_OF_SHARDS,1494,"conflicting shard number with distributeShardsLike parameter assignment","Will be raised if intended number of shards does not match that of the prototype shard given in distributeShardsLike parameter." ERROR_CLUSTER_LEADERSHIP_CHALLENGE_ONGOING,1495,"leadership challenge is ongoing","Will be raised when servers are currently competing for leadership, and the result is still unknown." ERROR_CLUSTER_NOT_LEADER,1496,"not a leader","Will be raised when an operation is sent to a non-leading server." ERROR_CLUSTER_COULD_NOT_CREATE_VIEW_IN_PLAN,1497,"could not create view in plan","Will be raised when a coordinator in a cluster cannot create an entry for a new view in the Plan hierarchy in the agency." @@ -278,7 +265,6 @@ ERROR_QUERY_FUNCTION_RUNTIME_ERROR,1583,"user function runtime error: %s","Will ERROR_QUERY_BAD_JSON_PLAN,1590,"bad execution plan JSON","Will be raised when an HTTP API for a query got an invalid JSON object." ERROR_QUERY_NOT_FOUND,1591,"query ID not found","Will be raised when an Id of a query is not found by the HTTP API." -ERROR_QUERY_IN_USE,1592,"query with this ID is in use","Will be raised when an Id of a query is found by the HTTP API but the query is in use." ERROR_QUERY_USER_ASSERT,1593,"%s","Will be raised if and user provided expression fails to evalutate to true" ERROR_QUERY_USER_WARN,1594,"%s","Will be raised if and user provided expression fails to evalutate to true" @@ -306,7 +292,6 @@ ERROR_TRANSACTION_NOT_FOUND,1655,"transaction not found","Will be raised when a ################################################################################ ERROR_USER_INVALID_NAME,1700,"invalid user name","Will be raised when an invalid user name is used." -ERROR_USER_INVALID_PASSWORD,1701,"invalid password","Will be raised when an invalid password is used." ERROR_USER_DUPLICATE,1702,"duplicate user","Will be raised when a user name already exists." ERROR_USER_NOT_FOUND,1703,"user not found","Will be raised when a user name is updated that does not exist." ERROR_USER_EXTERNAL,1705,"user is external","Will be raised when the user is authenicated by an external server." @@ -316,8 +301,6 @@ ERROR_USER_EXTERNAL,1705,"user is external","Will be raised when the user is aut ## These have been superceded by the Foxx management errors in public APIs. ################################################################################ -ERROR_SERVICE_INVALID_NAME,1750,"invalid service name","Will be raised when an invalid service name is specified." -ERROR_SERVICE_INVALID_MOUNT,1751,"invalid mount","Will be raised when an invalid mount is specified." ERROR_SERVICE_DOWNLOAD_FAILED,1752,"service download failed","Will be raised when a service download from the central repository failed." ERROR_SERVICE_UPLOAD_FAILED,1753,"service upload failed","Will be raised when a service upload from the client to the ArangoDB server failed." @@ -480,7 +463,6 @@ ERROR_CLUSTER_REPAIRS_OPERATION_FAILED,5010,"agency transaction failed during cl ## Agency errors ################################################################################ -ERROR_AGENCY_INQUIRY_SYNTAX,20001,"Illegal inquiry syntax","Inquiry handles a list of string clientIds: [,...]." ERROR_AGENCY_INFORM_MUST_BE_OBJECT,20011,"Inform message must be an object.","The inform message in the agency must be an object." ERROR_AGENCY_INFORM_MUST_CONTAIN_TERM,20012,"Inform message must contain uint parameter 'term'","The inform message in the agency must contain a uint parameter 'term'." ERROR_AGENCY_INFORM_MUST_CONTAIN_ID,20013,"Inform message must contain string parameter 'id'","The inform message in the agency must contain a string parameter 'id'." @@ -489,7 +471,6 @@ ERROR_AGENCY_INFORM_MUST_CONTAIN_POOL,20015,"Inform message must contain object ERROR_AGENCY_INFORM_MUST_CONTAIN_MIN_PING,20016,"Inform message must contain object 'min ping'","The inform message in the agency must contain an object 'min ping'." ERROR_AGENCY_INFORM_MUST_CONTAIN_MAX_PING,20017,"Inform message must contain object 'max ping'","The inform message in the agency must contain an object 'max ping'." ERROR_AGENCY_INFORM_MUST_CONTAIN_TIMEOUT_MULT,20018,"Inform message must contain object 'timeoutMult'","The inform message in the agency must contain an object 'timeoutMult'." -ERROR_AGENCY_INQUIRE_CLIENT_ID_MUST_BE_STRING,20020,"Inquiry failed","Inquiry by clientId failed" ERROR_AGENCY_CANNOT_REBUILD_DBS,20021,"Cannot rebuild readDB and spearHead","Will be raised if the readDB or the spearHead cannot be rebuilt from the replicated log." ################################################################################ @@ -502,15 +483,10 @@ ERROR_SUPERVISION_GENERAL_FAILURE,20501,"general supervision failure","General s ## Dispatcher errors ################################################################################ -ERROR_DISPATCHER_IS_STOPPING,21001,"dispatcher stopped","Will be returned if a shutdown is in progress." -ERROR_QUEUE_UNKNOWN,21002,"named queue does not exist","Will be returned if a queue with this name does not exist." ERROR_QUEUE_FULL,21003,"named queue is full","Will be returned if a queue with this name is full." ################################################################################ ## Maintenance errors ################################################################################ -ERROR_ACTION_ALREADY_REGISTERED,6001,"maintenance action already registered","Action with this description has been registered already" ERROR_ACTION_OPERATION_UNABORTABLE,6002,"this maintenance action cannot be stopped","This maintenance action cannot be stopped once it is started" -ERROR_ACTION_UNFINISHED,6003,"maintenance action still processing","This maintenance action is still processing" -ERROR_NO_SUCH_ACTION,6004,"no such maintenance action","No such maintenance action exists" diff --git a/lib/Basics/voc-errors.cpp b/lib/Basics/voc-errors.cpp index c0048db6ae..b2c4faab80 100644 --- a/lib/Basics/voc-errors.cpp +++ b/lib/Basics/voc-errors.cpp @@ -90,7 +90,6 @@ void TRI_InitializeErrorMessages() { REG_ERROR(ERROR_ARANGO_DOCUMENT_TOO_LARGE, "document too large"); REG_ERROR(ERROR_ARANGO_COLLECTION_NOT_UNLOADED, "collection must be unloaded"); REG_ERROR(ERROR_ARANGO_COLLECTION_TYPE_INVALID, "collection type invalid"); - REG_ERROR(ERROR_ARANGO_VALIDATION_FAILED, "validator failed"); REG_ERROR(ERROR_ARANGO_ATTRIBUTE_PARSER_FAILED, "parsing attribute name definition failed"); REG_ERROR(ERROR_ARANGO_DOCUMENT_KEY_BAD, "illegal document key"); REG_ERROR(ERROR_ARANGO_DOCUMENT_KEY_UNEXPECTED, "unexpected document key"); @@ -101,10 +100,8 @@ void TRI_InitializeErrorMessages() { REG_ERROR(ERROR_ARANGO_DATABASE_NOT_FOUND, "database not found"); REG_ERROR(ERROR_ARANGO_DATABASE_NAME_INVALID, "database name invalid"); REG_ERROR(ERROR_ARANGO_USE_SYSTEM_DATABASE, "operation only allowed in system database"); - REG_ERROR(ERROR_ARANGO_ENDPOINT_NOT_FOUND, "endpoint not found"); REG_ERROR(ERROR_ARANGO_INVALID_KEY_GENERATOR, "invalid key generator"); REG_ERROR(ERROR_ARANGO_INVALID_EDGE_ATTRIBUTE, "edge attribute missing or invalid"); - REG_ERROR(ERROR_ARANGO_INDEX_DOCUMENT_ATTRIBUTE_MISSING, "index insertion warning - attribute missing in document"); REG_ERROR(ERROR_ARANGO_INDEX_CREATION_FAILED, "index creation failed"); REG_ERROR(ERROR_ARANGO_WRITE_THROTTLE_TIMEOUT, "write-throttling timeout"); REG_ERROR(ERROR_ARANGO_COLLECTION_TYPE_MISMATCH, "collection type mismatch"); @@ -133,12 +130,8 @@ void TRI_InitializeErrorMessages() { REG_ERROR(ERROR_REPLICATION_START_TICK_NOT_PRESENT, "start tick not present"); REG_ERROR(ERROR_REPLICATION_WRONG_CHECKSUM, "wrong checksum"); REG_ERROR(ERROR_REPLICATION_SHARD_NONEMPTY, "shard not empty"); - REG_ERROR(ERROR_CLUSTER_NO_AGENCY, "could not connect to agency"); - REG_ERROR(ERROR_CLUSTER_NO_COORDINATOR_HEADER, "missing coordinator header"); - REG_ERROR(ERROR_CLUSTER_COULD_NOT_LOCK_PLAN, "could not lock plan in agency"); REG_ERROR(ERROR_CLUSTER_COLLECTION_ID_EXISTS, "collection ID already exists"); REG_ERROR(ERROR_CLUSTER_COULD_NOT_CREATE_COLLECTION_IN_PLAN, "could not create collection in plan"); - REG_ERROR(ERROR_CLUSTER_COULD_NOT_READ_CURRENT_VERSION, "could not read version in current in agency"); REG_ERROR(ERROR_CLUSTER_COULD_NOT_CREATE_COLLECTION, "could not create collection"); REG_ERROR(ERROR_CLUSTER_TIMEOUT, "timeout in cluster operation"); REG_ERROR(ERROR_CLUSTER_COULD_NOT_REMOVE_COLLECTION_IN_PLAN, "could not remove collection from plan"); @@ -158,12 +151,8 @@ void TRI_InitializeErrorMessages() { REG_ERROR(ERROR_CLUSTER_READING_PLAN_AGENCY, "error reading Plan in agency"); REG_ERROR(ERROR_CLUSTER_COULD_NOT_TRUNCATE_COLLECTION, "could not truncate collection"); REG_ERROR(ERROR_CLUSTER_AQL_COMMUNICATION, "error in cluster internal communication for AQL"); - REG_ERROR(ERROR_ARANGO_DOCUMENT_NOT_FOUND_OR_SHARDING_ATTRIBUTES_CHANGED, "document not found or sharding attributes changed"); - REG_ERROR(ERROR_CLUSTER_COULD_NOT_DETERMINE_ID, "could not determine my ID from my local info"); REG_ERROR(ERROR_CLUSTER_ONLY_ON_DBSERVER, "this operation is only valid on a DBserver in a cluster"); REG_ERROR(ERROR_CLUSTER_BACKEND_UNAVAILABLE, "A cluster backend which was required for the operation could not be reached"); - REG_ERROR(ERROR_CLUSTER_UNKNOWN_CALLBACK_ENDPOINT, "An endpoint couldn't be found"); - REG_ERROR(ERROR_CLUSTER_AGENCY_STRUCTURE_INVALID, "Invalid agency structure"); REG_ERROR(ERROR_CLUSTER_AQL_COLLECTION_OUT_OF_SYNC, "collection is out of sync"); REG_ERROR(ERROR_CLUSTER_COULD_NOT_CREATE_INDEX_IN_PLAN, "could not create index in plan"); REG_ERROR(ERROR_CLUSTER_COULD_NOT_DROP_INDEX_IN_PLAN, "could not drop index in plan"); @@ -176,8 +165,6 @@ void TRI_InitializeErrorMessages() { REG_ERROR(ERROR_CLUSTER_SHARD_FOLLOWER_REFUSES_OPERATION, "a shard follower refuses to perform an operation that is not a replication"); REG_ERROR(ERROR_CLUSTER_SHARD_LEADER_RESIGNED, "a (former) shard leader refuses to perform an operation, because it has resigned in the meantime"); REG_ERROR(ERROR_CLUSTER_AGENCY_COMMUNICATION_FAILED, "some agency operation failed"); - REG_ERROR(ERROR_CLUSTER_DISTRIBUTE_SHARDS_LIKE_REPLICATION_FACTOR, "conflicting replication factor with distributeShardsLike parameter assignment"); - REG_ERROR(ERROR_CLUSTER_DISTRIBUTE_SHARDS_LIKE_NUMBER_OF_SHARDS, "conflicting shard number with distributeShardsLike parameter assignment"); REG_ERROR(ERROR_CLUSTER_LEADERSHIP_CHALLENGE_ONGOING, "leadership challenge is ongoing"); REG_ERROR(ERROR_CLUSTER_NOT_LEADER, "not a leader"); REG_ERROR(ERROR_CLUSTER_COULD_NOT_CREATE_VIEW_IN_PLAN, "could not create view in plan"); @@ -224,7 +211,6 @@ void TRI_InitializeErrorMessages() { REG_ERROR(ERROR_QUERY_FUNCTION_RUNTIME_ERROR, "user function runtime error: %s"); REG_ERROR(ERROR_QUERY_BAD_JSON_PLAN, "bad execution plan JSON"); REG_ERROR(ERROR_QUERY_NOT_FOUND, "query ID not found"); - REG_ERROR(ERROR_QUERY_IN_USE, "query with this ID is in use"); REG_ERROR(ERROR_QUERY_USER_ASSERT, "%s"); REG_ERROR(ERROR_QUERY_USER_WARN, "%s"); REG_ERROR(ERROR_CURSOR_NOT_FOUND, "cursor not found"); @@ -236,12 +222,9 @@ void TRI_InitializeErrorMessages() { REG_ERROR(ERROR_TRANSACTION_ABORTED, "transaction aborted"); REG_ERROR(ERROR_TRANSACTION_NOT_FOUND, "transaction not found"); REG_ERROR(ERROR_USER_INVALID_NAME, "invalid user name"); - REG_ERROR(ERROR_USER_INVALID_PASSWORD, "invalid password"); REG_ERROR(ERROR_USER_DUPLICATE, "duplicate user"); REG_ERROR(ERROR_USER_NOT_FOUND, "user not found"); REG_ERROR(ERROR_USER_EXTERNAL, "user is external"); - REG_ERROR(ERROR_SERVICE_INVALID_NAME, "invalid service name"); - REG_ERROR(ERROR_SERVICE_INVALID_MOUNT, "invalid mount"); REG_ERROR(ERROR_SERVICE_DOWNLOAD_FAILED, "service download failed"); REG_ERROR(ERROR_SERVICE_UPLOAD_FAILED, "service upload failed"); REG_ERROR(ERROR_LDAP_CANNOT_INIT, "cannot init a LDAP connection"); @@ -344,7 +327,6 @@ void TRI_InitializeErrorMessages() { REG_ERROR(ERROR_CLUSTER_REPAIRS_JOB_FAILED, "move shard job failed during cluster repairs"); REG_ERROR(ERROR_CLUSTER_REPAIRS_JOB_DISAPPEARED, "move shard job disappeared during cluster repairs"); REG_ERROR(ERROR_CLUSTER_REPAIRS_OPERATION_FAILED, "agency transaction failed during cluster repairs"); - REG_ERROR(ERROR_AGENCY_INQUIRY_SYNTAX, "Illegal inquiry syntax"); REG_ERROR(ERROR_AGENCY_INFORM_MUST_BE_OBJECT, "Inform message must be an object."); REG_ERROR(ERROR_AGENCY_INFORM_MUST_CONTAIN_TERM, "Inform message must contain uint parameter 'term'"); REG_ERROR(ERROR_AGENCY_INFORM_MUST_CONTAIN_ID, "Inform message must contain string parameter 'id'"); @@ -353,14 +335,8 @@ void TRI_InitializeErrorMessages() { REG_ERROR(ERROR_AGENCY_INFORM_MUST_CONTAIN_MIN_PING, "Inform message must contain object 'min ping'"); REG_ERROR(ERROR_AGENCY_INFORM_MUST_CONTAIN_MAX_PING, "Inform message must contain object 'max ping'"); REG_ERROR(ERROR_AGENCY_INFORM_MUST_CONTAIN_TIMEOUT_MULT, "Inform message must contain object 'timeoutMult'"); - REG_ERROR(ERROR_AGENCY_INQUIRE_CLIENT_ID_MUST_BE_STRING, "Inquiry failed"); REG_ERROR(ERROR_AGENCY_CANNOT_REBUILD_DBS, "Cannot rebuild readDB and spearHead"); REG_ERROR(ERROR_SUPERVISION_GENERAL_FAILURE, "general supervision failure"); - REG_ERROR(ERROR_DISPATCHER_IS_STOPPING, "dispatcher stopped"); - REG_ERROR(ERROR_QUEUE_UNKNOWN, "named queue does not exist"); REG_ERROR(ERROR_QUEUE_FULL, "named queue is full"); - REG_ERROR(ERROR_ACTION_ALREADY_REGISTERED, "maintenance action already registered"); REG_ERROR(ERROR_ACTION_OPERATION_UNABORTABLE, "this maintenance action cannot be stopped"); - REG_ERROR(ERROR_ACTION_UNFINISHED, "maintenance action still processing"); - REG_ERROR(ERROR_NO_SUCH_ACTION, "no such maintenance action"); } diff --git a/lib/Basics/voc-errors.h b/lib/Basics/voc-errors.h index 59e6a515ee..bc18dd907a 100644 --- a/lib/Basics/voc-errors.h +++ b/lib/Basics/voc-errors.h @@ -437,11 +437,6 @@ constexpr int TRI_ERROR_ARANGO_COLLECTION_NOT_UNLOADED /// Will be raised when an invalid collection type is used in a request. constexpr int TRI_ERROR_ARANGO_COLLECTION_TYPE_INVALID = 1218; -/// 1219: ERROR_ARANGO_VALIDATION_FAILED -/// "validator failed" -/// Will be raised when the validation of an attribute of a structure failed. -constexpr int TRI_ERROR_ARANGO_VALIDATION_FAILED = 1219; - /// 1220: ERROR_ARANGO_ATTRIBUTE_PARSER_FAILED /// "parsing attribute name definition failed" /// Will be raised when parsing an attribute name definition failed. @@ -496,11 +491,6 @@ constexpr int TRI_ERROR_ARANGO_DATABASE_NAME_INVALID /// system database. constexpr int TRI_ERROR_ARANGO_USE_SYSTEM_DATABASE = 1230; -/// 1231: ERROR_ARANGO_ENDPOINT_NOT_FOUND -/// "endpoint not found" -/// Will be raised when there is an attempt to delete a non-existing endpoint. -constexpr int TRI_ERROR_ARANGO_ENDPOINT_NOT_FOUND = 1231; - /// 1232: ERROR_ARANGO_INVALID_KEY_GENERATOR /// "invalid key generator" /// Will be raised when an invalid key generator description is used. @@ -512,13 +502,6 @@ constexpr int TRI_ERROR_ARANGO_INVALID_KEY_GENERATOR /// contain an invalid value. constexpr int TRI_ERROR_ARANGO_INVALID_EDGE_ATTRIBUTE = 1233; -/// 1234: ERROR_ARANGO_INDEX_DOCUMENT_ATTRIBUTE_MISSING -/// "index insertion warning - attribute missing in document" -/// Will be raised when an attempt to insert a document into an index is caused -/// by in the document not having one or more attributes which the index is -/// built on. -constexpr int TRI_ERROR_ARANGO_INDEX_DOCUMENT_ATTRIBUTE_MISSING = 1234; - /// 1235: ERROR_ARANGO_INDEX_CREATION_FAILED /// "index creation failed" /// Will be raised when an attempt to create an index has failed. @@ -675,23 +658,6 @@ constexpr int TRI_ERROR_REPLICATION_WRONG_CHECKSUM /// Will be raised when a shard is not empty and the follower tries a shortcut constexpr int TRI_ERROR_REPLICATION_SHARD_NONEMPTY = 1417; -/// 1450: ERROR_CLUSTER_NO_AGENCY -/// "could not connect to agency" -/// Will be raised when none of the agency servers can be connected to. -constexpr int TRI_ERROR_CLUSTER_NO_AGENCY = 1450; - -/// 1451: ERROR_CLUSTER_NO_COORDINATOR_HEADER -/// "missing coordinator header" -/// Will be raised when a DB server in a cluster receives a HTTP request -/// without a coordinator header. -constexpr int TRI_ERROR_CLUSTER_NO_COORDINATOR_HEADER = 1451; - -/// 1452: ERROR_CLUSTER_COULD_NOT_LOCK_PLAN -/// "could not lock plan in agency" -/// Will be raised when a coordinator in a cluster cannot lock the Plan -/// hierarchy in the agency. -constexpr int TRI_ERROR_CLUSTER_COULD_NOT_LOCK_PLAN = 1452; - /// 1453: ERROR_CLUSTER_COLLECTION_ID_EXISTS /// "collection ID already exists" /// Will be raised when a coordinator in a cluster tries to create a collection @@ -704,12 +670,6 @@ constexpr int TRI_ERROR_CLUSTER_COLLECTION_ID_EXISTS /// new collection in the Plan hierarchy in the agency. constexpr int TRI_ERROR_CLUSTER_COULD_NOT_CREATE_COLLECTION_IN_PLAN = 1454; -/// 1455: ERROR_CLUSTER_COULD_NOT_READ_CURRENT_VERSION -/// "could not read version in current in agency" -/// Will be raised when a coordinator in a cluster cannot read the Version -/// entry in the Current hierarchy in the agency. -constexpr int TRI_ERROR_CLUSTER_COULD_NOT_READ_CURRENT_VERSION = 1455; - /// 1456: ERROR_CLUSTER_COULD_NOT_CREATE_COLLECTION /// "could not create collection" /// Will be raised when a coordinator in a cluster notices that some DBServers @@ -826,19 +786,6 @@ constexpr int TRI_ERROR_CLUSTER_COULD_NOT_TRUNCATE_COLLECTION /// produces an error. constexpr int TRI_ERROR_CLUSTER_AQL_COMMUNICATION = 1474; -/// 1475: ERROR_ARANGO_DOCUMENT_NOT_FOUND_OR_SHARDING_ATTRIBUTES_CHANGED -/// "document not found or sharding attributes changed" -/// Will be raised when a document with a given identifier or handle is -/// unknown, or if the sharding attributes have been changed in a REPLACE -/// operation in the cluster. -constexpr int TRI_ERROR_ARANGO_DOCUMENT_NOT_FOUND_OR_SHARDING_ATTRIBUTES_CHANGED = 1475; - -/// 1476: ERROR_CLUSTER_COULD_NOT_DETERMINE_ID -/// "could not determine my ID from my local info" -/// Will be raised if a cluster server at startup could not determine its own -/// ID from the local info provided. -constexpr int TRI_ERROR_CLUSTER_COULD_NOT_DETERMINE_ID = 1476; - /// 1477: ERROR_CLUSTER_ONLY_ON_DBSERVER /// "this operation is only valid on a DBserver in a cluster" /// Will be raised if there is an attempt to run a DBserver-only operation on a @@ -850,16 +797,6 @@ constexpr int TRI_ERROR_CLUSTER_ONLY_ON_DBSERVER /// Will be raised if a required db server can't be reached. constexpr int TRI_ERROR_CLUSTER_BACKEND_UNAVAILABLE = 1478; -/// 1479: ERROR_CLUSTER_UNKNOWN_CALLBACK_ENDPOINT -/// "An endpoint couldn't be found" -/// An endpoint couldn't be found -constexpr int TRI_ERROR_CLUSTER_UNKNOWN_CALLBACK_ENDPOINT = 1479; - -/// 1480: ERROR_CLUSTER_AGENCY_STRUCTURE_INVALID -/// "Invalid agency structure" -/// The structure in the agency is invalid -constexpr int TRI_ERROR_CLUSTER_AGENCY_STRUCTURE_INVALID = 1480; - /// 1481: ERROR_CLUSTER_AQL_COLLECTION_OUT_OF_SYNC /// "collection is out of sync" /// Will be raised if a collection needed during query execution is out of @@ -936,19 +873,6 @@ constexpr int TRI_ERROR_CLUSTER_SHARD_LEADER_RESIGNED /// performed successfully. constexpr int TRI_ERROR_CLUSTER_AGENCY_COMMUNICATION_FAILED = 1492; -/// 1493: ERROR_CLUSTER_DISTRIBUTE_SHARDS_LIKE_REPLICATION_FACTOR -/// "conflicting replication factor with distributeShardsLike parameter -/// "assignment" -/// Will be raised if intended replication factor does not match that of the -/// prototype shard given in distributeShardsLike parameter. -constexpr int TRI_ERROR_CLUSTER_DISTRIBUTE_SHARDS_LIKE_REPLICATION_FACTOR = 1493; - -/// 1494: ERROR_CLUSTER_DISTRIBUTE_SHARDS_LIKE_NUMBER_OF_SHARDS -/// "conflicting shard number with distributeShardsLike parameter assignment" -/// Will be raised if intended number of shards does not match that of the -/// prototype shard given in distributeShardsLike parameter. -constexpr int TRI_ERROR_CLUSTER_DISTRIBUTE_SHARDS_LIKE_NUMBER_OF_SHARDS = 1494; - /// 1495: ERROR_CLUSTER_LEADERSHIP_CHALLENGE_ONGOING /// "leadership challenge is ongoing" /// Will be raised when servers are currently competing for leadership, and the @@ -1201,12 +1125,6 @@ constexpr int TRI_ERROR_QUERY_BAD_JSON_PLAN /// Will be raised when an Id of a query is not found by the HTTP API. constexpr int TRI_ERROR_QUERY_NOT_FOUND = 1591; -/// 1592: ERROR_QUERY_IN_USE -/// "query with this ID is in use" -/// Will be raised when an Id of a query is found by the HTTP API but the query -/// is in use. -constexpr int TRI_ERROR_QUERY_IN_USE = 1592; - /// 1593: ERROR_QUERY_USER_ASSERT /// "%s" /// Will be raised if and user provided expression fails to evalutate to true @@ -1266,11 +1184,6 @@ constexpr int TRI_ERROR_TRANSACTION_NOT_FOUND /// Will be raised when an invalid user name is used. constexpr int TRI_ERROR_USER_INVALID_NAME = 1700; -/// 1701: ERROR_USER_INVALID_PASSWORD -/// "invalid password" -/// Will be raised when an invalid password is used. -constexpr int TRI_ERROR_USER_INVALID_PASSWORD = 1701; - /// 1702: ERROR_USER_DUPLICATE /// "duplicate user" /// Will be raised when a user name already exists. @@ -1286,16 +1199,6 @@ constexpr int TRI_ERROR_USER_NOT_FOUND /// Will be raised when the user is authenicated by an external server. constexpr int TRI_ERROR_USER_EXTERNAL = 1705; -/// 1750: ERROR_SERVICE_INVALID_NAME -/// "invalid service name" -/// Will be raised when an invalid service name is specified. -constexpr int TRI_ERROR_SERVICE_INVALID_NAME = 1750; - -/// 1751: ERROR_SERVICE_INVALID_MOUNT -/// "invalid mount" -/// Will be raised when an invalid mount is specified. -constexpr int TRI_ERROR_SERVICE_INVALID_MOUNT = 1751; - /// 1752: ERROR_SERVICE_DOWNLOAD_FAILED /// "service download failed" /// Will be raised when a service download from the central repository failed. @@ -1830,11 +1733,6 @@ constexpr int TRI_ERROR_CLUSTER_REPAIRS_JOB_DISAPPEARED /// executing it. constexpr int TRI_ERROR_CLUSTER_REPAIRS_OPERATION_FAILED = 5010; -/// 20001: ERROR_AGENCY_INQUIRY_SYNTAX -/// "Illegal inquiry syntax" -/// Inquiry handles a list of string clientIds: [,...]. -constexpr int TRI_ERROR_AGENCY_INQUIRY_SYNTAX = 20001; - /// 20011: ERROR_AGENCY_INFORM_MUST_BE_OBJECT /// "Inform message must be an object." /// The inform message in the agency must be an object. @@ -1875,11 +1773,6 @@ constexpr int TRI_ERROR_AGENCY_INFORM_MUST_CONTAIN_MAX_PING /// The inform message in the agency must contain an object 'timeoutMult'. constexpr int TRI_ERROR_AGENCY_INFORM_MUST_CONTAIN_TIMEOUT_MULT = 20018; -/// 20020: ERROR_AGENCY_INQUIRE_CLIENT_ID_MUST_BE_STRING -/// "Inquiry failed" -/// Inquiry by clientId failed -constexpr int TRI_ERROR_AGENCY_INQUIRE_CLIENT_ID_MUST_BE_STRING = 20020; - /// 20021: ERROR_AGENCY_CANNOT_REBUILD_DBS /// "Cannot rebuild readDB and spearHead" /// Will be raised if the readDB or the spearHead cannot be rebuilt from the @@ -1891,41 +1784,16 @@ constexpr int TRI_ERROR_AGENCY_CANNOT_REBUILD_DBS /// General supervision failure. constexpr int TRI_ERROR_SUPERVISION_GENERAL_FAILURE = 20501; -/// 21001: ERROR_DISPATCHER_IS_STOPPING -/// "dispatcher stopped" -/// Will be returned if a shutdown is in progress. -constexpr int TRI_ERROR_DISPATCHER_IS_STOPPING = 21001; - -/// 21002: ERROR_QUEUE_UNKNOWN -/// "named queue does not exist" -/// Will be returned if a queue with this name does not exist. -constexpr int TRI_ERROR_QUEUE_UNKNOWN = 21002; - /// 21003: ERROR_QUEUE_FULL /// "named queue is full" /// Will be returned if a queue with this name is full. constexpr int TRI_ERROR_QUEUE_FULL = 21003; -/// 6001: ERROR_ACTION_ALREADY_REGISTERED -/// "maintenance action already registered" -/// Action with this description has been registered already -constexpr int TRI_ERROR_ACTION_ALREADY_REGISTERED = 6001; - /// 6002: ERROR_ACTION_OPERATION_UNABORTABLE /// "this maintenance action cannot be stopped" /// This maintenance action cannot be stopped once it is started constexpr int TRI_ERROR_ACTION_OPERATION_UNABORTABLE = 6002; -/// 6003: ERROR_ACTION_UNFINISHED -/// "maintenance action still processing" -/// This maintenance action is still processing -constexpr int TRI_ERROR_ACTION_UNFINISHED = 6003; - -/// 6004: ERROR_NO_SUCH_ACTION -/// "no such maintenance action" -/// No such maintenance action exists -constexpr int TRI_ERROR_NO_SUCH_ACTION = 6004; - /// register all errors for ArangoDB void TRI_InitializeErrorMessages(); diff --git a/lib/Rest/GeneralResponse.cpp b/lib/Rest/GeneralResponse.cpp index 03ad4e55da..a44803080d 100644 --- a/lib/Rest/GeneralResponse.cpp +++ b/lib/Rest/GeneralResponse.cpp @@ -315,11 +315,9 @@ rest::ResponseCode GeneralResponse::responseCode(int code) { case TRI_ERROR_REPLICATION_NO_START_TICK: case TRI_ERROR_ARANGO_INVALID_KEY_GENERATOR: case TRI_ERROR_ARANGO_INVALID_EDGE_ATTRIBUTE: - case TRI_ERROR_ARANGO_INDEX_DOCUMENT_ATTRIBUTE_MISSING: case TRI_ERROR_ARANGO_INDEX_CREATION_FAILED: case TRI_ERROR_ARANGO_COLLECTION_TYPE_MISMATCH: case TRI_ERROR_ARANGO_COLLECTION_TYPE_INVALID: - case TRI_ERROR_ARANGO_VALIDATION_FAILED: case TRI_ERROR_ARANGO_ATTRIBUTE_PARSER_FAILED: case TRI_ERROR_ARANGO_CROSS_COLLECTION_REQUEST: case TRI_ERROR_ARANGO_ILLEGAL_NAME: @@ -331,7 +329,6 @@ rest::ResponseCode GeneralResponse::responseCode(int code) { case TRI_ERROR_TRANSACTION_UNREGISTERED_COLLECTION: case TRI_ERROR_TRANSACTION_DISALLOWED_OPERATION: case TRI_ERROR_USER_INVALID_NAME: - case TRI_ERROR_USER_INVALID_PASSWORD: case TRI_ERROR_TASK_INVALID_ID: case TRI_ERROR_GRAPH_INVALID_GRAPH: case TRI_ERROR_GRAPH_COULD_NOT_CREATE_GRAPH: @@ -368,7 +365,6 @@ rest::ResponseCode GeneralResponse::responseCode(int code) { case TRI_ERROR_ARANGO_DATA_SOURCE_NOT_FOUND: case TRI_ERROR_ARANGO_COLLECTION_NOT_LOADED: case TRI_ERROR_ARANGO_DOCUMENT_NOT_FOUND: - case TRI_ERROR_ARANGO_ENDPOINT_NOT_FOUND: case TRI_ERROR_ARANGO_INDEX_NOT_FOUND: case TRI_ERROR_CURSOR_NOT_FOUND: case TRI_ERROR_QUERY_FUNCTION_NOT_FOUND: @@ -380,7 +376,6 @@ rest::ResponseCode GeneralResponse::responseCode(int code) { case TRI_ERROR_GRAPH_NOT_FOUND: case TRI_ERROR_GRAPH_VERTEX_COL_DOES_NOT_EXIST: case TRI_ERROR_GRAPH_NO_GRAPH_COLLECTION: - case TRI_ERROR_QUEUE_UNKNOWN: case TRI_ERROR_GRAPH_EDGE_COLLECTION_NOT_USED: return ResponseCode::NOT_FOUND;