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

Merge branch 'obi-velocystream' of github.com:arangodb/arangodb into obi-velocystream 

* 'obi-velocystream' of github.com:arangodb/arangodb:
  renamed method
This commit is contained in:
Jan Christoph Uhde 2016-08-30 14:20:27 +02:00
parent b340546023 2134afaa83
commit add0a26228
20 changed files with 55 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Agency/RestAgencyHandler.cpp
View File

@ -76,7 +76,7 @@ void RestAgencyHandler::redirectRequest(std::string const& leaderId) {
std::string url =
Endpoint::uriForm(_agent->config().poolAt(leaderId)) +
_request->requestPath();
setResponseCode(rest::ResponseCode::TEMPORARY_REDIRECT);
resetResponse(rest::ResponseCode::TEMPORARY_REDIRECT);
_response->setHeaderNC(StaticStrings::Location, url);
} catch (std::exception const& e) {
LOG_TOPIC(WARN, Logger::AGENCY) << e.what() << " " << __FILE__ << __LINE__;

2
arangod/Aql/RestAqlHandler.cpp
View File

@ -916,6 +916,6 @@ std::shared_ptr<VPackBuilder> RestAqlHandler::parseVelocyPackBody() {
void RestAqlHandler::sendResponse(
rest::ResponseCode code, VPackSlice const slice,
arangodb::TransactionContext* transactionContext) {
setResponseCode(code);
resetResponse(code);
writeResult(slice, *(transactionContext->getVPackOptionsForDump()));
}

4
arangod/Cluster/RestAgencyCallbacksHandler.cpp
View File

@ -74,10 +74,10 @@ RestHandler::status RestAgencyCallbacksHandler::execute() {
auto callback = _agencyCallbackRegistry->getCallback(index);
LOG(DEBUG) << "Agency callback has been triggered. refetching!";
callback->refetchAndUpdate(true);
setResponseCode(arangodb::rest::ResponseCode::ACCEPTED);
resetResponse(arangodb::rest::ResponseCode::ACCEPTED);
} catch (arangodb::basics::Exception const&) {
// mop: not found...expected
setResponseCode(arangodb::rest::ResponseCode::NOT_FOUND);
resetResponse(arangodb::rest::ResponseCode::NOT_FOUND);
}
return status::DONE;
}

2
arangod/Cluster/RestShardHandler.cpp
View File

@ -55,7 +55,7 @@ RestHandler::status RestShardHandler::execute() {
ClusterComm::instance()->processAnswer(coordinatorHeader, stealRequest());
if (result == "") {
setResponseCode(arangodb::rest::ResponseCode::ACCEPTED);
resetResponse(arangodb::rest::ResponseCode::ACCEPTED);
} else {
generateError(arangodb::rest::ResponseCode::BAD,
(int)arangodb::rest::ResponseCode::BAD,

20
arangod/GeneralServer/PathHandler.cpp
View File

@ -85,7 +85,7 @@ RestHandler::status PathHandler::execute() {
}
url += defaultFile;
setResponseCode(rest::ResponseCode::MOVED_PERMANENTLY);
resetResponse(rest::ResponseCode::MOVED_PERMANENTLY);
response->setHeaderNC(StaticStrings::Location, url);
response->setContentType(rest::ContentType::HTML);
@ -108,7 +108,7 @@ RestHandler::status PathHandler::execute() {
if (next == ".") {
LOG(WARN) << "file '" << name << "' contains '.'";
setResponseCode(rest::ResponseCode::FORBIDDEN);
resetResponse(rest::ResponseCode::FORBIDDEN);
response->body().appendText("path contains '.'");
return status::DONE;
}
@ -116,7 +116,7 @@ RestHandler::status PathHandler::execute() {
if (next == "..") {
LOG(WARN) << "file '" << name << "' contains '..'";
setResponseCode(rest::ResponseCode::FORBIDDEN);
resetResponse(rest::ResponseCode::FORBIDDEN);
response->body().appendText("path contains '..'");
return status::DONE;
}
@ -126,7 +126,7 @@ RestHandler::status PathHandler::execute() {
if (sc != std::string::npos) {
LOG(WARN) << "file '" << name << "' contains illegal character";
setResponseCode(rest::ResponseCode::FORBIDDEN);
resetResponse(rest::ResponseCode::FORBIDDEN);
response->body().appendText("path contains illegal character '" +
std::string(1, next[sc]) + "'");
return status::DONE;
@ -136,7 +136,7 @@ RestHandler::status PathHandler::execute() {
if (!FileUtils::isDirectory(path)) {
LOG(WARN) << "file '" << name << "' not found";
setResponseCode(rest::ResponseCode::NOT_FOUND);
resetResponse(rest::ResponseCode::NOT_FOUND);
response->body().appendText("file not found");
return status::DONE;
}
@ -148,7 +148,7 @@ RestHandler::status PathHandler::execute() {
if (!allowSymbolicLink && FileUtils::isSymbolicLink(name)) {
LOG(WARN) << "file '" << name << "' contains symbolic link";
setResponseCode(rest::ResponseCode::FORBIDDEN);
resetResponse(rest::ResponseCode::FORBIDDEN);
response->body().appendText("symbolic links are not allowed");
return status::DONE;
}
@ -157,19 +157,19 @@ RestHandler::status PathHandler::execute() {
if (!FileUtils::isRegularFile(name)) {
LOG(WARN) << "file '" << name << "' not found";
setResponseCode(rest::ResponseCode::NOT_FOUND);
resetResponse(rest::ResponseCode::NOT_FOUND);
response->body().appendText("file not found");
return status::DONE;
}
setResponseCode(rest::ResponseCode::OK);
resetResponse(rest::ResponseCode::OK);
try {
FileUtils::slurp(name, response->body());
} catch (...) {
LOG(WARN) << "file '" << name << "' not readable";
setResponseCode(rest::ResponseCode::NOT_FOUND);
resetResponse(rest::ResponseCode::NOT_FOUND);
response->body().appendText("file not readable");
return status::DONE;
}
@ -208,7 +208,7 @@ RestHandler::status PathHandler::execute() {
}
void PathHandler::handleError(Exception const&) {
setResponseCode(rest::ResponseCode::SERVER_ERROR);
resetResponse(rest::ResponseCode::SERVER_ERROR);
}
}
}

2
arangod/GeneralServer/RestHandler.cpp
View File

@ -117,7 +117,7 @@ RestHandler::status RestHandler::executeFull() {
return result;
}
void RestHandler::setResponseCode(rest::ResponseCode code) {
void RestHandler::resetResponse(rest::ResponseCode code) {
TRI_ASSERT(_response != nullptr);
_response->reset(code);
}

4
arangod/GeneralServer/RestHandler.h
View File

@ -110,8 +110,8 @@ class RestHandler : public RequestStatisticsAgent, public arangodb::WorkItem {
}
protected:
// sets response Code
void setResponseCode(rest::ResponseCode);
// resets the request
void resetResponse(rest::ResponseCode);
protected:
// handler id

4
arangod/GeneralServer/RestHandlerFactory.cpp
View File

@ -46,13 +46,13 @@ class MaintenanceHandler : public RestHandler {
bool isDirect() const override { return true; };
status execute() override {
setResponseCode(rest::ResponseCode::SERVICE_UNAVAILABLE);
resetResponse(rest::ResponseCode::SERVICE_UNAVAILABLE);
return status::DONE;
};
void handleError(const Exception& error) override {
setResponseCode(rest::ResponseCode::SERVICE_UNAVAILABLE);
resetResponse(rest::ResponseCode::SERVICE_UNAVAILABLE);
};
};
}

8
arangod/RestHandler/RestBaseHandler.cpp
View File

@ -53,7 +53,7 @@ void RestBaseHandler::handleError(Exception const& ex) {
void RestBaseHandler::generateResult(rest::ResponseCode code,
VPackSlice const& slice) {
setResponseCode(code);
resetResponse(code);
VPackOptions options(VPackOptions::Defaults);
options.escapeUnicode = true;
writeResult(slice, options);
@ -62,7 +62,7 @@ void RestBaseHandler::generateResult(rest::ResponseCode code,
void RestBaseHandler::generateResult(rest::ResponseCode code,
VPackSlice const& slice,
VPackOptions const* options) {
setResponseCode(code);
resetResponse(code);
VPackOptions tmpoptions(*options);
tmpoptions.escapeUnicode = true;
writeResult(slice, tmpoptions);
@ -74,7 +74,7 @@ void RestBaseHandler::generateResult(rest::ResponseCode code,
void RestBaseHandler::generateResult(
rest::ResponseCode code, VPackSlice const& slice,
std::shared_ptr<TransactionContext> context) {
setResponseCode(code);
resetResponse(code);
writeResult(slice, *(context->getVPackOptionsForDump()));
}
@ -98,7 +98,7 @@ void RestBaseHandler::generateError(rest::ResponseCode code, int errorCode) {
void RestBaseHandler::generateError(rest::ResponseCode code, int errorCode,
std::string const& message) {
setResponseCode(code);
resetResponse(code);
VPackBuilder builder;
try {

2
arangod/RestHandler/RestBatchHandler.cpp
View File

@ -92,7 +92,7 @@ RestHandler::status RestBatchHandler::execute() {
_request->header(StaticStrings::Authorization);
// create the response
setResponseCode(rest::ResponseCode::OK);
resetResponse(rest::ResponseCode::OK);
_response->setContentType(_request->header(StaticStrings::ContentTypeHeader));
// http required here

2
arangod/RestHandler/RestCursorHandler.cpp
View File

@ -136,7 +136,7 @@ void RestCursorHandler::processQuery(VPackSlice const& slice) {
TRI_ASSERT(qResult.isArray());
{
setResponseCode(rest::ResponseCode::CREATED);
resetResponse(rest::ResponseCode::CREATED);
_response->setContentType(rest::ContentType::JSON);
std::shared_ptr<VPackBuilder> extra = buildExtra(queryResult);
VPackSlice opts = options->slice();

4
arangod/RestHandler/RestExportHandler.cpp
View File

@ -269,7 +269,7 @@ void RestExportHandler::createCursor() {
collectionExport.get(), batchSize, ttl, count);
collectionExport.release();
setResponseCode(rest::ResponseCode::CREATED);
resetResponse(rest::ResponseCode::CREATED);
try {
VPackBuffer<uint8_t> buffer;
@ -328,7 +328,7 @@ void RestExportHandler::modifyCursor() {
}
try {
setResponseCode(rest::ResponseCode::OK);
resetResponse(rest::ResponseCode::OK);
VPackBuffer<uint8_t> buffer;
VPackBuilder builder(buffer);

2
arangod/RestHandler/RestImportHandler.cpp
View File

@ -866,7 +866,7 @@ int RestImportHandler::performImport(SingleCollectionTransaction& trx,
void RestImportHandler::generateDocumentsCreated(
RestImportResult const& result) {
setResponseCode(rest::ResponseCode::CREATED);
resetResponse(rest::ResponseCode::CREATED);
try {
VPackBuilder json;

6
arangod/RestHandler/RestJobHandler.cpp
View File

@ -94,7 +94,7 @@ void RestJobHandler::putJob() {
if (status == AsyncJobResult::JOB_PENDING) {
// job is still pending
setResponseCode(rest::ResponseCode::NO_CONTENT);
resetResponse(rest::ResponseCode::NO_CONTENT);
return;
}
@ -194,11 +194,11 @@ void RestJobHandler::getJobById(std::string const& value) {
if (status == AsyncJobResult::JOB_PENDING) {
// job is still pending
setResponseCode(rest::ResponseCode::NO_CONTENT);
resetResponse(rest::ResponseCode::NO_CONTENT);
return;
}
setResponseCode(rest::ResponseCode::OK);
resetResponse(rest::ResponseCode::OK);
}
////////////////////////////////////////////////////////////////////////////////

2
arangod/RestHandler/RestPleaseUpgradeHandler.cpp
View File

@ -43,7 +43,7 @@ RestHandler::status RestPleaseUpgradeHandler::execute() {
THROW_ARANGO_EXCEPTION(TRI_ERROR_INTERNAL);
}
setResponseCode(rest::ResponseCode::OK);
resetResponse(rest::ResponseCode::OK);
response->setContentType(rest::ContentType::TEXT);
auto& buffer = response->body();

22
arangod/RestHandler/RestReplicationHandler.cpp
View File

@ -607,7 +607,7 @@ void RestReplicationHandler::handleCommandBatch() {
int res = engine->extendCompactionBlocker(_vocbase, id, expires);
if (res == TRI_ERROR_NO_ERROR) {
setResponseCode(rest::ResponseCode::NO_CONTENT);
resetResponse(rest::ResponseCode::NO_CONTENT);
} else {
generateError(GeneralResponse::responseCode(res), res);
}
@ -623,7 +623,7 @@ void RestReplicationHandler::handleCommandBatch() {
int res = engine->removeCompactionBlocker(_vocbase, id);
if (res == TRI_ERROR_NO_ERROR) {
setResponseCode(rest::ResponseCode::NO_CONTENT);
resetResponse(rest::ResponseCode::NO_CONTENT);
} else {
generateError(GeneralResponse::responseCode(res), res);
}
@ -724,7 +724,7 @@ void RestReplicationHandler::handleCommandBarrier() {
if (arangodb::wal::LogfileManager::instance()->extendLogfileBarrier(
id, ttl, minTick)) {
setResponseCode(rest::ResponseCode::NO_CONTENT);
resetResponse(rest::ResponseCode::NO_CONTENT);
} else {
int res = TRI_ERROR_ARANGO_DOCUMENT_NOT_FOUND;
generateError(GeneralResponse::responseCode(res), res);
@ -737,7 +737,7 @@ void RestReplicationHandler::handleCommandBarrier() {
TRI_voc_tick_t id = StringUtils::uint64(suffix[1]);
if (arangodb::wal::LogfileManager::instance()->removeLogfileBarrier(id)) {
setResponseCode(rest::ResponseCode::NO_CONTENT);
resetResponse(rest::ResponseCode::NO_CONTENT);
} else {
int res = TRI_ERROR_ARANGO_DOCUMENT_NOT_FOUND;
generateError(GeneralResponse::responseCode(res), res);
@ -845,7 +845,7 @@ void RestReplicationHandler::handleTrampolineCoordinator() {
}
bool dummy;
setResponseCode(static_cast<rest::ResponseCode>(
resetResponse(static_cast<rest::ResponseCode>(
res->result->getHttpReturnCode()));
HttpResponse* httpResponse = dynamic_cast<HttpResponse*>(_response.get());
@ -997,9 +997,9 @@ void RestReplicationHandler::handleCommandLoggerFollow() {
size_t const length = TRI_LengthStringBuffer(dump._buffer);
if (length == 0) {
setResponseCode(rest::ResponseCode::NO_CONTENT);
resetResponse(rest::ResponseCode::NO_CONTENT);
} else {
setResponseCode(rest::ResponseCode::OK);
resetResponse(rest::ResponseCode::OK);
}
HttpResponse* httpResponse = dynamic_cast<HttpResponse*>(_response.get());
@ -1099,9 +1099,9 @@ void RestReplicationHandler::handleCommandDetermineOpenTransactions() {
size_t const length = TRI_LengthStringBuffer(dump._buffer);
if (length == 0) {
setResponseCode(rest::ResponseCode::NO_CONTENT);
resetResponse(rest::ResponseCode::NO_CONTENT);
} else {
setResponseCode(rest::ResponseCode::OK);
resetResponse(rest::ResponseCode::OK);
}
HttpResponse* httpResponse = dynamic_cast<HttpResponse*>(_response.get());
@ -3207,9 +3207,9 @@ void RestReplicationHandler::handleCommandDump() {
size_t const length = TRI_LengthStringBuffer(dump._buffer);
if (length == 0) {
setResponseCode(rest::ResponseCode::NO_CONTENT);
resetResponse(rest::ResponseCode::NO_CONTENT);
} else {
setResponseCode(rest::ResponseCode::OK);
resetResponse(rest::ResponseCode::OK);
}
// TODO needs to generalized

2
arangod/RestHandler/RestSimpleHandler.cpp
View File

@ -358,7 +358,7 @@ void RestSimpleHandler::lookupByKeys(VPackSlice const& slice) {
VPackBuilder result;
{
VPackObjectBuilder guard(&result);
setResponseCode(rest::ResponseCode::OK);
resetResponse(rest::ResponseCode::OK);
// TODO this should be generalized
response->setContentType(rest::ContentType::JSON);

2
arangod/RestHandler/RestUploadHandler.cpp
View File

@ -112,7 +112,7 @@ RestHandler::status RestUploadHandler::execute() {
TRI_Free(TRI_CORE_MEM_ZONE, relative);
// create the response
setResponseCode(rest::ResponseCode::CREATED);
resetResponse(rest::ResponseCode::CREATED);
VPackBuilder b;

14
arangod/RestHandler/RestVocbaseBaseHandler.cpp
View File

@ -169,9 +169,9 @@ void RestVocbaseBaseHandler::generateSaved(
arangodb::OperationResult const& result, std::string const& collectionName,
TRI_col_type_e type, VPackOptions const* options, bool isMultiple) {
if (result.wasSynchronous) {
setResponseCode(rest::ResponseCode::CREATED);
resetResponse(rest::ResponseCode::CREATED);
} else {
setResponseCode(rest::ResponseCode::ACCEPTED);
resetResponse(rest::ResponseCode::ACCEPTED);
}
if (isMultiple && !result.countErrorCodes.empty()) {
@ -196,9 +196,9 @@ void RestVocbaseBaseHandler::generateDeleted(
arangodb::OperationResult const& result, std::string const& collectionName,
TRI_col_type_e type, VPackOptions const* options) {
if (result.wasSynchronous) {
setResponseCode(rest::ResponseCode::OK);
resetResponse(rest::ResponseCode::OK);
} else {
setResponseCode(rest::ResponseCode::ACCEPTED);
resetResponse(rest::ResponseCode::ACCEPTED);
}
generate20x(result, collectionName, type, options);
}
@ -257,7 +257,7 @@ void RestVocbaseBaseHandler::generateForbidden() {
void RestVocbaseBaseHandler::generatePreconditionFailed(
VPackSlice const& slice) {
setResponseCode(rest::ResponseCode::PRECONDITION_FAILED);
resetResponse(rest::ResponseCode::PRECONDITION_FAILED);
if (slice.isObject()) { // single document case
std::string const rev =
@ -310,7 +310,7 @@ void RestVocbaseBaseHandler::generatePreconditionFailed(
////////////////////////////////////////////////////////////////////////////////
void RestVocbaseBaseHandler::generateNotModified(TRI_voc_rid_t rid) {
setResponseCode(rest::ResponseCode::NOT_MODIFIED);
resetResponse(rest::ResponseCode::NOT_MODIFIED);
_response->setHeaderNC(StaticStrings::Etag,
"\"" + TRI_RidToString(rid) + "\"");
}
@ -331,7 +331,7 @@ void RestVocbaseBaseHandler::generateDocument(VPackSlice const& input,
}
// and generate a response
setResponseCode(rest::ResponseCode::OK);
resetResponse(rest::ResponseCode::OK);
// set ETAG header
if (!rev.empty()) {

4
arangod/RestHandler/RestVocbaseBaseHandler.h
View File

@ -154,14 +154,14 @@ class RestVocbaseBaseHandler : public RestBaseHandler {
//////////////////////////////////////////////////////////////////////////////
void generateOk() {
setResponseCode(rest::ResponseCode::NO_CONTENT);
resetResponse(rest::ResponseCode::NO_CONTENT);
}
//////////////////////////////////////////////////////////////////////////////
/// @brief generates ok message with no body but with certain status code
//////////////////////////////////////////////////////////////////////////////
void generateOk(rest::ResponseCode code) { setResponseCode(code); }
void generateOk(rest::ResponseCode code) { resetResponse(code); }
//////////////////////////////////////////////////////////////////////////////
/// @brief generates message for a saved document