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

make more efficient use of setPayload

This commit is contained in:
Jan Christoph Uhde 2016-08-31 18:22:13 +02:00
parent 63fa20fb42
commit 59ad47d717
3 changed files with 50 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
arangod/RestHandler/RestBaseHandler.cpp
View File

@ -51,31 +51,34 @@ void RestBaseHandler::handleError(Exception const& ex) {
/// @brief generates a result from VelocyPack
////////////////////////////////////////////////////////////////////////////////
template<typename Payload>
void RestBaseHandler::generateResult(rest::ResponseCode code,
VPackSlice const& slice) {
Payload&& payload) {
resetResponse(code);
VPackOptions options(VPackOptions::Defaults);
options.escapeUnicode = true;
writeResult(slice, options);
writeResult(std::forward<Payload>(payload), options);
}
template<typename Payload>
void RestBaseHandler::generateResult(rest::ResponseCode code,
VPackSlice const& slice,
Payload&& payload,
VPackOptions const* options) {
resetResponse(code);
VPackOptions tmpoptions(*options);
tmpoptions.escapeUnicode = true;
writeResult(slice, tmpoptions);
writeResult(std::forward<Payload>(payload), tmpoptions);
}
////////////////////////////////////////////////////////////////////////////////
/// @brief generates a result from VelocyPack
////////////////////////////////////////////////////////////////////////////////
template<typename Payload>
void RestBaseHandler::generateResult(
rest::ResponseCode code, VPackSlice const& slice,
rest::ResponseCode code, Payload&& payload,
std::shared_ptr<TransactionContext> context) {
resetResponse(code);
writeResult(slice, *(context->getVPackOptionsForDump()));
writeResult(std::forward<Payload>(payload), *(context->getVPackOptionsForDump()));
}
////////////////////////////////////////////////////////////////////////////////
@ -100,7 +103,8 @@ void RestBaseHandler::generateError(rest::ResponseCode code, int errorCode,
std::string const& message) {
resetResponse(code);
VPackBuilder builder;
VPackBuffer<uint8_t> buffer;
VPackBuilder builder(buffer);
try {
builder.add(VPackValue(VPackValueType::Object));
builder.add("error", VPackValue(true));
@ -116,7 +120,7 @@ void RestBaseHandler::generateError(rest::ResponseCode code, int errorCode,
VPackOptions options(VPackOptions::Defaults);
options.escapeUnicode = true;
writeResult(builder.slice(), options);
writeResult(std::move(buffer), options);
} catch (...) {
// Building the error response failed
}
@ -142,14 +146,15 @@ void RestBaseHandler::generateCanceled() {
/// @brief writes volocypack or json to response
//////////////////////////////////////////////////////////////////////////////
void RestBaseHandler::writeResult(arangodb::velocypack::Slice const& slice,
template<typename Payload>
void RestBaseHandler::writeResult(Payload&& payload,
VPackOptions const& options) {
try {
TRI_ASSERT(options.escapeUnicode);
if (_request != nullptr) {
_response->setContentType(_request->contentTypeResponse());
}
_response->setPayload(slice, true, options);
_response->setPayload(std::forward<Payload>(payload), true, options);
} catch (std::exception const& ex) {
generateError(rest::ResponseCode::SERVER_ERROR, TRI_ERROR_INTERNAL,
ex.what());
@ -158,3 +163,21 @@ void RestBaseHandler::writeResult(arangodb::velocypack::Slice const& slice,
"cannot generate output");
}
}
//TODO -- rather move code to header (slower linking) or remove templates
template void RestBaseHandler::generateResult<VPackBuffer<uint8_t>>(rest::ResponseCode, VPackBuffer<uint8_t>&&);
template void RestBaseHandler::generateResult<VPackSlice>(rest::ResponseCode, VPackSlice&&);
template void RestBaseHandler::generateResult<VPackSlice&>(rest::ResponseCode, VPackSlice&);
template void RestBaseHandler::generateResult<VPackBuffer<uint8_t>>(rest::ResponseCode, VPackBuffer<uint8_t>&&, VPackOptions const*);
template void RestBaseHandler::generateResult<VPackSlice>(rest::ResponseCode, VPackSlice&&, VPackOptions const*);
template void RestBaseHandler::generateResult<VPackSlice&>(rest::ResponseCode, VPackSlice&, VPackOptions const*);
template void RestBaseHandler::generateResult<VPackBuffer<uint8_t>>(rest::ResponseCode, VPackBuffer<uint8_t>&&, std::shared_ptr<arangodb::TransactionContext>);
template void RestBaseHandler::generateResult<VPackSlice>(rest::ResponseCode, VPackSlice&&, std::shared_ptr<arangodb::TransactionContext>);
template void RestBaseHandler::generateResult<VPackSlice&>(rest::ResponseCode, VPackSlice&, std::shared_ptr<arangodb::TransactionContext>);
template void RestBaseHandler::writeResult<VPackBuffer<uint8_t>>(VPackBuffer<uint8_t>&& payload, VPackOptions const&);
template void RestBaseHandler::writeResult<VPackSlice>(VPackSlice&& payload, VPackOptions const&);
template void RestBaseHandler::writeResult<VPackSlice&>(VPackSlice& payload, VPackOptions const&);
template void RestBaseHandler::writeResult<VPackSlice const&>(VPackSlice const& payload, VPackOptions const&);

18
arangod/RestHandler/RestBaseHandler.h
View File

@ -44,17 +44,16 @@ class RestBaseHandler : public rest::RestHandler {
public:
// generates a result from VelocyPack
void generateResult(rest::ResponseCode,
arangodb::velocypack::Slice const& slice);
template <typename Payload>
void generateResult(rest::ResponseCode, Payload&&);
// generates a result from VelocyPack
void generateResult(rest::ResponseCode,
arangodb::velocypack::Slice const& slice,
VPackOptions const*);
template <typename Payload>
void generateResult(rest::ResponseCode, Payload&&, VPackOptions const*);
// generates a result from VelocyPack
void generateResult(rest::ResponseCode,
arangodb::velocypack::Slice const& slice,
template <typename Payload>
void generateResult(rest::ResponseCode, Payload&&,
std::shared_ptr<arangodb::TransactionContext> context);
// generates an error
@ -70,9 +69,8 @@ class RestBaseHandler : public rest::RestHandler {
void generateCanceled();
protected:
// write result back to client
void writeResult(arangodb::velocypack::Slice const& slice,
arangodb::velocypack::Options const& options);
template <typename Payload>
void writeResult(Payload&&, arangodb::velocypack::Options const& options);
};
}

10
lib/Rest/GeneralResponse.h
View File

@ -125,8 +125,16 @@ class GeneralResponse {
// generates the response body, sets the content type; this might
// throw an error
template <typename Payload> // Payload needs to be of type: VPackSlice const&
void setPayload(VPackSlice&& slice, bool generateBody,
VPackOptions const& options = VPackOptions::Options::Defaults,
bool resolveExternals = true) {
_generateBody = generateBody;
auto tmp = std::move(slice);
addPayload(tmp, &options, resolveExternals);
}
// Payload needs to be of type: VPackSlice const&
// or VPackBuffer<uint8_t>&&
template <typename Payload>
void setPayload(Payload&& payload, bool generateBody,
VPackOptions const& options = VPackOptions::Options::Defaults,
bool resolveExternals = true) {