mirror of https://gitee.com/bigwinds/arangodb
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
This commit is contained in:
commit
feef5140a7
|
@ -343,29 +343,6 @@ void RestAqlHandler::createQueryFromString () {
|
||||||
_response->body().appendText(answerBody.toString());
|
_response->body().appendText(answerBody.toString());
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
/// @brief DELETE method for /_api/aql/<queryId>
|
|
||||||
/// The query specified by <queryId> is deleted.
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
void RestAqlHandler::deleteQuery (std::string const& idString) {
|
|
||||||
// the DELETE verb
|
|
||||||
Query* query = nullptr;
|
|
||||||
if (findQuery(idString, query)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
TRI_ASSERT(_qId > 0);
|
|
||||||
_queryRegistry->destroy(_vocbase, _qId);
|
|
||||||
|
|
||||||
_response = createResponse(triagens::rest::HttpResponse::OK);
|
|
||||||
_response->setContentType("application/json; charset=utf-8");
|
|
||||||
Json answerBody(Json::Array, 2);
|
|
||||||
answerBody("error", Json(false))
|
|
||||||
("queryId", Json(idString));
|
|
||||||
_response->body().appendText(answerBody.toString());
|
|
||||||
}
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
/// @brief PUT method for /_api/aql/<operation>/<queryId>, this is using
|
/// @brief PUT method for /_api/aql/<operation>/<queryId>, this is using
|
||||||
/// the part of the cursor API with side effects.
|
/// the part of the cursor API with side effects.
|
||||||
|
@ -624,15 +601,6 @@ triagens::rest::HttpHandler::status_t RestAqlHandler::execute () {
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case HttpRequest::HTTP_REQUEST_DELETE: {
|
|
||||||
if (suffix.size() != 1) {
|
|
||||||
generateError(HttpResponse::NOT_FOUND, TRI_ERROR_HTTP_NOT_FOUND);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
deleteQuery(suffix[0]);
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case HttpRequest::HTTP_REQUEST_PUT: {
|
case HttpRequest::HTTP_REQUEST_PUT: {
|
||||||
if (suffix.size() != 2) {
|
if (suffix.size() != 2) {
|
||||||
generateError(HttpResponse::NOT_FOUND, TRI_ERROR_HTTP_NOT_FOUND);
|
generateError(HttpResponse::NOT_FOUND, TRI_ERROR_HTTP_NOT_FOUND);
|
||||||
|
@ -651,6 +619,7 @@ triagens::rest::HttpHandler::status_t RestAqlHandler::execute () {
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
case HttpRequest::HTTP_REQUEST_DELETE:
|
||||||
case HttpRequest::HTTP_REQUEST_HEAD:
|
case HttpRequest::HTTP_REQUEST_HEAD:
|
||||||
case HttpRequest::HTTP_REQUEST_PATCH:
|
case HttpRequest::HTTP_REQUEST_PATCH:
|
||||||
case HttpRequest::HTTP_REQUEST_OPTIONS:
|
case HttpRequest::HTTP_REQUEST_OPTIONS:
|
||||||
|
|
|
@ -133,13 +133,6 @@ namespace triagens {
|
||||||
|
|
||||||
void createQueryFromString ();
|
void createQueryFromString ();
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
/// @brief DELETE method for /_api/aql/<queryId>
|
|
||||||
/// The query specified by <queryId> is deleted.
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
|
||||||
|
|
||||||
void deleteQuery (std::string const& idString);
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
/// @brief PUT method for /_api/aql/<operation>/<queryId>, this is using
|
/// @brief PUT method for /_api/aql/<operation>/<queryId>, this is using
|
||||||
/// the part of the cursor API with side effects.
|
/// the part of the cursor API with side effects.
|
||||||
|
|
Loading…
Reference in New Issue