Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

removed error 1520, replaced with standard error 1203

This commit is contained in:
Jan Steemann 2013-02-04 23:04:37 +01:00
parent d17628e28b
commit 3fd6373c2f
7 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@ -1,6 +1,12 @@
v1.2.alpha (XXXX-XX-XX)
-----------------------
* replaced redundant error return code 1520 (Unable to open collection) with error code
1203 (Collection not found). These error codes have the same meanings, but one of
them was returned from AQL queries only, the other got thrown by other parts of
ArangoDB. Now, error 1203 (Collection not found) is used in AQL too in case a
non-existing collection is used.
* fixed issue #382: [Documentation error] Maschine... should be Machine...
* unified history file locations for arangod, arangosh, and arangoirb.

2
arangod/Ahuacatl/ahuacatl-ast-node.c
View File

@ -398,7 +398,7 @@ TRI_aql_node_t* TRI_CreateNodeCollectionAql (TRI_aql_context_t* const context,
}
if (strlen(name) == 0) {
TRI_SetErrorContextAql(context, TRI_ERROR_QUERY_COLLECTION_NOT_FOUND, name);
TRI_SetErrorContextAql(context, TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND, name);
return NULL;
}

2
arangod/Ahuacatl/ahuacatl-collections.c
View File

@ -159,7 +159,7 @@ bool OpenCollections (TRI_aql_context_t* const context) {
LOG_TRACE("locking collection '%s'", collection->_name);
collection->_collection = TRI_UseCollectionByNameVocBase(context->_vocbase, collection->_name);
if (collection->_collection == NULL) {
TRI_SetErrorContextAql(context, TRI_ERROR_QUERY_COLLECTION_NOT_FOUND, collection->_name);
TRI_SetErrorContextAql(context, TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND, collection->_name);
return false;
}

1
js/common/bootstrap/errors.js
View File

@ -87,7 +87,6 @@
"ERROR_QUERY_VARIABLE_NAME_INVALID" : { "code" : 1510, "message" : "variable name '%s' has an invalid format" },
"ERROR_QUERY_VARIABLE_REDECLARED" : { "code" : 1511, "message" : "variable '%s' is assigned multiple times" },
"ERROR_QUERY_VARIABLE_NAME_UNKNOWN" : { "code" : 1512, "message" : "unknown variable '%s'" },
"ERROR_QUERY_COLLECTION_NOT_FOUND" : { "code" : 1520, "message" : "unable to open collection '%s'" },
"ERROR_QUERY_COLLECTION_LOCK_FAILED" : { "code" : 1521, "message" : "unable to read-lock collection %s" },
"ERROR_QUERY_TOO_MANY_COLLECTIONS" : { "code" : 1522, "message" : "too many collections" },
"ERROR_QUERY_DOCUMENT_ATTRIBUTE_REDECLARED" : { "code" : 1530, "message" : "document attribute '%s' is assigned multiple times" },

1
lib/BasicsC/errors.dat
View File

@ -117,7 +117,6 @@ ERROR_QUERY_NUMBER_OUT_OF_RANGE,1504,"number out of range","Will be raised when
ERROR_QUERY_VARIABLE_NAME_INVALID,1510,"variable name '%s' has an invalid format","Will be raised when an invalid variable name is used."
ERROR_QUERY_VARIABLE_REDECLARED,1511,"variable '%s' is assigned multiple times","Will be raised when a variable gets re-assigned in a query."
ERROR_QUERY_VARIABLE_NAME_UNKNOWN,1512,"unknown variable '%s'","Will be raised when an unknown variable is used or the variable is undefined the context it is used."
ERROR_QUERY_COLLECTION_NOT_FOUND,1520,"unable to open collection '%s'","Will be raised when one of the collections referenced in the query was not found."
ERROR_QUERY_COLLECTION_LOCK_FAILED,1521,"unable to read-lock collection %s","Will be raised when a read lock on the collection cannot be acquired."
ERROR_QUERY_TOO_MANY_COLLECTIONS,1522,"too many collections","Will be raised when the number of collections in a query is beyond the allowed value."
ERROR_QUERY_DOCUMENT_ATTRIBUTE_REDECLARED,1530,"document attribute '%s' is assigned multiple times","Will be raised when a document attribute is re-assigned."

1
lib/BasicsC/voc-errors.c
View File

@ -83,7 +83,6 @@ void TRI_InitialiseErrorMessages (void) {
REG_ERROR(ERROR_QUERY_VARIABLE_NAME_INVALID, "variable name '%s' has an invalid format");
REG_ERROR(ERROR_QUERY_VARIABLE_REDECLARED, "variable '%s' is assigned multiple times");
REG_ERROR(ERROR_QUERY_VARIABLE_NAME_UNKNOWN, "unknown variable '%s'");
REG_ERROR(ERROR_QUERY_COLLECTION_NOT_FOUND, "unable to open collection '%s'");
REG_ERROR(ERROR_QUERY_COLLECTION_LOCK_FAILED, "unable to read-lock collection %s");
REG_ERROR(ERROR_QUERY_TOO_MANY_COLLECTIONS, "too many collections");
REG_ERROR(ERROR_QUERY_DOCUMENT_ATTRIBUTE_REDECLARED, "document attribute '%s' is assigned multiple times");

14
lib/BasicsC/voc-errors.h
View File

@ -173,9 +173,6 @@ extern "C" {
/// - 1512: @LIT{unknown variable '\%s'}
/// Will be raised when an unknown variable is used or the variable is
/// undefined the context it is used.
/// - 1520: @LIT{unable to open collection '\%s'}
/// Will be raised when one of the collections referenced in the query was
/// not found.
/// - 1521: @LIT{unable to read-lock collection \%s}
/// Will be raised when a read lock on the collection cannot be acquired.
/// - 1522: @LIT{too many collections}
@ -1096,17 +1093,6 @@ void TRI_InitialiseErrorMessages (void);
#define TRI_ERROR_QUERY_VARIABLE_NAME_UNKNOWN (1512)
////////////////////////////////////////////////////////////////////////////////
/// @brief 1520: ERROR_QUERY_COLLECTION_NOT_FOUND
///
/// unable to open collection '%s'
///
/// Will be raised when one of the collections referenced in the query was not
/// found.
////////////////////////////////////////////////////////////////////////////////
#define TRI_ERROR_QUERY_COLLECTION_NOT_FOUND (1520)
////////////////////////////////////////////////////////////////////////////////
/// @brief 1521: ERROR_QUERY_COLLECTION_LOCK_FAILED
///