From 035d736fc063910db9cd1d7189f8b7bb10085eda Mon Sep 17 00:00:00 2001 From: Jan Christoph Uhde Date: Fri, 9 Sep 2016 12:59:25 +0200 Subject: [PATCH 1/4] Revert "fix bug with missing agents" This reverts commit e230e3e2c500365b73ede60a813dcf04cac174d5. --- arangod/GeneralServer/VppCommTask.cpp | 9 ++++++--- arangod/RestServer/VocbaseContext.cpp | 18 +++++++++--------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/arangod/GeneralServer/VppCommTask.cpp b/arangod/GeneralServer/VppCommTask.cpp index f29aa77073..6d80a47087 100644 --- a/arangod/GeneralServer/VppCommTask.cpp +++ b/arangod/GeneralServer/VppCommTask.cpp @@ -185,9 +185,6 @@ bool VppCommTask::processRead() { bool read_maybe_only_part_of_buffer = false; VppInputMessage message; // filled in CASE 1 or CASE 2b - _agents.emplace( - std::make_pair(chunkHeader._messageID, RequestStatisticsAgent(true))); - if (chunkHeader._isFirst && chunkHeader._chunk == 1) { // CASE 1: message is in one chunk if (auto rv = getMessageFromSingleChunk(chunkHeader, message, doExecute, @@ -370,6 +367,9 @@ void VppCommTask::handleSimpleError(rest::ResponseCode responseCode, boost::optional VppCommTask::getMessageFromSingleChunk( ChunkHeader const& chunkHeader, VppInputMessage& message, bool& doExecute, char const* vpackBegin, char const* chunkEnd) { + _agents.emplace( + std::make_pair(chunkHeader._messageID, RequestStatisticsAgent(true))); + auto agent = getAgent(chunkHeader._messageID); agent->acquire(); agent->requestStatisticsAgentSetReadStart(); @@ -414,6 +414,9 @@ boost::optional VppCommTask::getMessageFromMultiChunks( // CASE 2a: chunk starts new message if (chunkHeader._isFirst) { // first chunk of multi chunk message + _agents.emplace( + std::make_pair(chunkHeader._messageID, RequestStatisticsAgent(true))); + auto agent = getAgent(chunkHeader._messageID); agent->acquire(); agent->requestStatisticsAgentSetReadStart(); diff --git a/arangod/RestServer/VocbaseContext.cpp b/arangod/RestServer/VocbaseContext.cpp index 4e7215c4de..c9ba1cd548 100644 --- a/arangod/RestServer/VocbaseContext.cpp +++ b/arangod/RestServer/VocbaseContext.cpp @@ -82,9 +82,7 @@ bool VocbaseContext::useClusterAuthentication() const { rest::ResponseCode VocbaseContext::authenticate() { TRI_ASSERT(_vocbase != nullptr); - auto restServer = - application_features::ApplicationServer::getFeature( - "GeneralServer"); + auto restServer = application_features::ApplicationServer::getFeature("GeneralServer"); if (!restServer->authentication()) { // no authentication required at all @@ -128,10 +126,10 @@ rest::ResponseCode VocbaseContext::authenticate() { return result; } -rest::ResponseCode VocbaseContext::authenticateRequest(bool* forceOpen) { - auto restServer = - application_features::ApplicationServer::getFeature( - "GeneralServer"); +rest::ResponseCode VocbaseContext::authenticateRequest( + bool* forceOpen) { + + auto restServer = application_features::ApplicationServer::getFeature("GeneralServer"); #ifdef ARANGODB_HAVE_DOMAIN_SOCKETS // check if we need to run authentication for this type of // endpoint @@ -202,7 +200,8 @@ rest::ResponseCode VocbaseContext::authenticateRequest(bool* forceOpen) { /// @brief checks the authentication via basic //////////////////////////////////////////////////////////////////////////////// -rest::ResponseCode VocbaseContext::basicAuthentication(const char* auth) { +rest::ResponseCode VocbaseContext::basicAuthentication( + const char* auth) { if (useClusterAuthentication()) { std::string const expected = ServerState::instance()->getAuthentication(); @@ -252,7 +251,8 @@ rest::ResponseCode VocbaseContext::basicAuthentication(const char* auth) { /// @brief checks the authentication via jwt //////////////////////////////////////////////////////////////////////////////// -rest::ResponseCode VocbaseContext::jwtAuthentication(std::string const& auth) { +rest::ResponseCode VocbaseContext::jwtAuthentication( + std::string const& auth) { AuthResult result = GeneralServerFeature::AUTH_INFO.checkAuthentication( AuthInfo::AuthType::JWT, auth); From c8923c102112d6a18909d4c08f1c438087c99ac3 Mon Sep 17 00:00:00 2001 From: hkernbach Date: Fri, 9 Sep 2016 13:16:57 +0200 Subject: [PATCH 2/4] improved gv --- .../_admin/aardvark/APP/frontend/js/views/graphViewer2.js | 5 ++++- .../_admin/aardvark/APP/frontend/scss/_graphViewer2.scss | 3 +-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/graphViewer2.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/graphViewer2.js index da7bded52b..1040cb39a1 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/graphViewer2.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/graphViewer2.js @@ -1133,6 +1133,8 @@ arangoHelper.arangoError('Graph', 'Could not expand node: ' + id + '.'); } }); + + self.removeHelp(); }, checkExpand: function (data, origin) { @@ -1671,13 +1673,14 @@ e.color = e.originalColor; }); + $('.nodeInfoDiv').remove(); s.refresh({ skipIndexation: true }); } }; s.bind('rightClickStage', function (e) { - unhighlightNodes(); self.nodeHighlighted = 'undefinedid'; + unhighlightNodes(); }); s.bind('rightClickNode', function (e) { diff --git a/js/apps/system/_admin/aardvark/APP/frontend/scss/_graphViewer2.scss b/js/apps/system/_admin/aardvark/APP/frontend/scss/_graphViewer2.scss index 5ba46f6020..decabba558 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/scss/_graphViewer2.scss +++ b/js/apps/system/_admin/aardvark/APP/frontend/scss/_graphViewer2.scss @@ -258,7 +258,6 @@ background-color: $c-bluegrey-dark; border-radius: 2px; color: $c-white; - padding: 10px; - padding-left: 150px; + padding: 10px 20px; } } From ee65a1a375208246e2b0b202e6e0bf1b6b281a12 Mon Sep 17 00:00:00 2001 From: hkernbach Date: Fri, 9 Sep 2016 13:39:15 +0200 Subject: [PATCH 3/4] fixed issue #2005 --- .../_admin/aardvark/APP/frontend/js/views/documentsView.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js index 4e21f08f2e..200ef8b91d 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/documentsView.js @@ -414,6 +414,8 @@ // add those filters also to the collection self.collection.addFilter(f.attribute, f.operator, f.value); }); + + self.rerender(); }, addFilterItem: function () { From a3ffd9e59dadcfdeedf9bd616084c44ae7e95988 Mon Sep 17 00:00:00 2001 From: hkernbach Date: Fri, 9 Sep 2016 13:41:29 +0200 Subject: [PATCH 4/4] changelog --- CHANGELOG | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index fb8e354d7c..a34f9b925f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -76,6 +76,8 @@ devel v3.0.8 (XXXX-XX-XX) ------------------- +* fixed issue #2005 + * fixed issue #2039