From 1ff2bc068e2905c40c9d9bbe427d4dbde2e09a9a Mon Sep 17 00:00:00 2001 From: Jan Christoph Uhde Date: Thu, 27 Oct 2016 09:26:18 +0200 Subject: [PATCH] Squashed commit of the following: commit a72b49c416dd2c78dbd0d9a67b503bdac49e342d Author: Jan Christoph Uhde Date: Thu Oct 27 09:21:25 2016 +0200 remove description that is now in a google docs document commit 19274465ced67796b166b24bbacc79189b5ee24d Merge: 09e67e1 5b818c3 Author: Jan Christoph Uhde Date: Thu Oct 27 09:14:29 2016 +0200 Merge branch 'devel' of github.com:arangodb/arangodb into request_statistics * 'devel' of github.com:arangodb/arangodb: (36 commits) enable switching from http to vst fix vst authentication Fix failing swagger test Foxx release notes Implement inline middleware comment out install targets since we don't want to ship curl binaries don't log velocypack output by default, as it may have side-effects fix sanitation of externals attempt to use less memory Do not build curl exec remove useless semicolons fixed windows compile errors Add chapter on Foxx testing Don't load mocha QUnit interface No more demeter chains...canUseDatabase implemented on AuthenticationFeature level allow working with empty bodies performance optimization Adding new examples Added agency to feature list Add scripts route to Foxx API cause of occasional aardvard not starting up still unclear ... commit 09e67e1fea153388eb81153d735473991d34b12f Author: Jan Christoph Uhde Date: Wed Oct 26 09:39:16 2016 +0200 start to add documentation commit 747fc3a6905bf4460a40db9322c6dbd3336552c7 Author: Jan Christoph Uhde Date: Tue Oct 25 14:30:03 2016 +0200 avoid negaitve statistics --- arangod/GeneralServer/RestHandler.cpp | 3 ++- arangod/Statistics/statistics.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arangod/GeneralServer/RestHandler.cpp b/arangod/GeneralServer/RestHandler.cpp index 726fd6600d..9062ce7c14 100644 --- a/arangod/GeneralServer/RestHandler.cpp +++ b/arangod/GeneralServer/RestHandler.cpp @@ -64,7 +64,8 @@ RestHandler::RestHandler(GeneralRequest* request, GeneralResponse* response) int RestHandler::prepareEngine() { requestStatisticsAgentSetRequestStart(); - + requestStatisticsAgentSetRequestEnd(); // set end immeadiately so we + // do not get netative statistics #ifdef USE_DEV_TIMERS TRI_request_statistics_t::STATS = _statistics; #endif diff --git a/arangod/Statistics/statistics.h b/arangod/Statistics/statistics.h index a4dbcd29ff..40923a0493 100644 --- a/arangod/Statistics/statistics.h +++ b/arangod/Statistics/statistics.h @@ -82,9 +82,10 @@ struct TRI_request_statistics_t { std::string to_string() { std::stringstream ss; - ss << std::boolalpha << std::setprecision(10) << "statistics " + ss << std::boolalpha << std::setprecision(20) << "statistics " << std::endl << "_readStart " << _readStart << std::endl + << "_readEnd " << _readEnd << std::endl << "_queueStart " << _queueStart << std::endl << "_queueEnd " << _queueEnd << std::endl << "_requestStart " << _requestStart << std::endl