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

Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into engine-vs-velocystream

This commit is contained in:
jsteemann 2016-08-25 10:41:09 +02:00
parent 3175c1a84f c64ebd6660
commit 22d3a1eb9a
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arangod/Statistics/statistics.h
View File

@ -76,11 +76,11 @@ struct TRI_request_statistics_t {
#endif #endif
} }
double _readStart; double _readStart; // CommTask::processRead - read first byte of message
double _readEnd; double _readEnd; // CommTask::processRead - message complete
double _queueStart; double _queueStart; // addJob to queue GeneralServer::handleRequest
double _queueEnd; double _queueEnd; // exit queue DispatcherThread::handleJob
double _requestStart; double _requestStart; // GeneralServerJob::work
double _requestEnd; double _requestEnd;
double _writeStart; double _writeStart;
double _writeEnd; double _writeEnd;

10
lib/Rest/VppMessage.h
View File

@ -24,12 +24,12 @@
#ifndef ARANGODB_REST_VPP_MESSAGE_H #ifndef ARANGODB_REST_VPP_MESSAGE_H
#define ARANGODB_REST_VPP_MESSAGE_H 1 #define ARANGODB_REST_VPP_MESSAGE_H 1
#include "Basics/StringBuffer.h"
#include <velocypack/Options.h>
#include <velocypack/Buffer.h> #include <velocypack/Buffer.h>
#include <velocypack/Options.h>
#include <velocypack/Slice.h> #include <velocypack/Slice.h>
#include <velocypack/velocypack-aliases.h> #include <velocypack/velocypack-aliases.h>
#include <iterator> #include <iterator>
#include "Basics/StringBuffer.h"
namespace arangodb { namespace arangodb {
namespace rest { namespace rest {
@ -71,11 +71,7 @@ struct VppInputMessage {
return VPackSlice{}; return VPackSlice{};
} }
std::vector<VPackSlice> const& payloads() const { std::vector<VPackSlice> const& payloads() const { return _payload; }
if (!_payload.empty()) {
return _payload;
}
}
private: private:
VPackBuffer<uint8_t> _buffer; VPackBuffer<uint8_t> _buffer;