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

fixed error messages

This commit is contained in:
Jan Steemann 2015-11-11 14:43:28 +01:00
parent aa38f5d036
commit 25fa71187d
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arangod/Aql/Functions.cpp
View File

@ -2292,7 +2292,7 @@ AqlValue Functions::Neighbors (triagens::aql::Query* query,
std::string const collectionName = vertexId.substr(0, split); std::string const collectionName = vertexId.substr(0, split);
if (collectionName.compare(vColName) != 0) { if (collectionName.compare(vColName) != 0) {
THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_GRAPH_INVALID_PARAMETER, THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_GRAPH_INVALID_PARAMETER,
"specified vertex collection `%s` does not match start vertex collection `%s`", "specified vertex collection '%s' does not match start vertex collection '%s'",
vColName.c_str(), vColName.c_str(),
collectionName.c_str()); collectionName.c_str());
} }
@ -2300,7 +2300,7 @@ AqlValue Functions::Neighbors (triagens::aql::Query* query,
if (coli == nullptr) { if (coli == nullptr) {
THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND, THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND,
"`%s`", "'%s'",
collectionName.c_str()); collectionName.c_str());
} }
@ -2327,7 +2327,7 @@ AqlValue Functions::Neighbors (triagens::aql::Query* query,
std::string const collectionName = vertexId.substr(0, split); std::string const collectionName = vertexId.substr(0, split);
if (collectionName.compare(vColName) != 0) { if (collectionName.compare(vColName) != 0) {
THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_GRAPH_INVALID_PARAMETER, THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_GRAPH_INVALID_PARAMETER,
"specified vertex collection `%s` does not match start vertex collection `%s`", "specified vertex collection '%s' does not match start vertex collection '%s'",
vColName.c_str(), vColName.c_str(),
collectionName.c_str()); collectionName.c_str());
} }
@ -2335,7 +2335,7 @@ AqlValue Functions::Neighbors (triagens::aql::Query* query,
if (coli == nullptr) { if (coli == nullptr) {
THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND, THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND,
"`%s`", "'%s'",
collectionName.c_str()); collectionName.c_str());
} }
@ -2525,7 +2525,7 @@ AqlValue Functions::Near (triagens::aql::Query* query,
true, true,
true); true);
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
THROW_ARANGO_EXCEPTION_FORMAT(res, "`%s`", colName.c_str()); THROW_ARANGO_EXCEPTION_FORMAT(res, "'%s'", colName.c_str());
} }
TRI_EnsureCollectionsTransaction(trx->getInternals()); TRI_EnsureCollectionsTransaction(trx->getInternals());
@ -2533,7 +2533,7 @@ AqlValue Functions::Near (triagens::aql::Query* query,
if (collection == nullptr) { if (collection == nullptr) {
THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND, THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND,
"`%s`", "'%s'",
colName.c_str()); colName.c_str());
} }
} }
@ -2541,9 +2541,9 @@ AqlValue Functions::Near (triagens::aql::Query* query,
auto document = trx->documentCollection(cid); auto document = trx->documentCollection(cid);
if (document == nullptr) { if (document == nullptr) {
THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND, THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND,
"`%s`", "'%s'",
colName.c_str()); colName.c_str());
} }
triagens::arango::Index* index = nullptr; triagens::arango::Index* index = nullptr;
@ -2695,7 +2695,7 @@ AqlValue Functions::Within (triagens::aql::Query* query,
true, true,
true); true);
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
THROW_ARANGO_EXCEPTION_FORMAT(res, "`%s`", colName.c_str()); THROW_ARANGO_EXCEPTION_FORMAT(res, "'%s'", colName.c_str());
} }
TRI_EnsureCollectionsTransaction(trx->getInternals()); TRI_EnsureCollectionsTransaction(trx->getInternals());
@ -2703,7 +2703,7 @@ AqlValue Functions::Within (triagens::aql::Query* query,
if (collection == nullptr) { if (collection == nullptr) {
THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND, THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND,
"`%s`", "'%s'",
colName.c_str()); colName.c_str());
} }
} }
@ -2985,7 +2985,7 @@ static void RegisterCollectionInTransaction (triagens::arango::AqlTransaction* t
cid = trx->resolver()->getCollectionId(collectionName); cid = trx->resolver()->getCollectionId(collectionName);
if (cid == 0) { if (cid == 0) {
THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND, THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND,
"`%s`", "'%s'",
collectionName.c_str()); collectionName.c_str());
} }
// ensure the collection is loaded // ensure the collection is loaded
@ -2999,7 +2999,7 @@ static void RegisterCollectionInTransaction (triagens::arango::AqlTransaction* t
true, true,
true); true);
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
THROW_ARANGO_EXCEPTION_FORMAT(res, "`%s`", collectionName.c_str()); THROW_ARANGO_EXCEPTION_FORMAT(res, "'%s'", collectionName.c_str());
} }
TRI_EnsureCollectionsTransaction(trx->getInternals()); TRI_EnsureCollectionsTransaction(trx->getInternals());
collection = trx->trxCollection(cid); collection = trx->trxCollection(cid);
@ -3241,7 +3241,7 @@ AqlValue Functions::Edges (triagens::aql::Query* query,
TRI_voc_cid_t startCid = resolver->getCollectionId(parts[0]); TRI_voc_cid_t startCid = resolver->getCollectionId(parts[0]);
if (startCid == 0) { if (startCid == 0) {
THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND, THROW_ARANGO_EXCEPTION_FORMAT(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND,
"`%s`", "'%s'",
parts[0].c_str()); parts[0].c_str());
} }