From 46efcff7d728fbf8e20ec56b08c1e0045d45509d Mon Sep 17 00:00:00 2001
From: Jan <jsteemann@users.noreply.github.com>
Date: Fri, 5 Oct 2018 10:25:13 +0200
Subject: [PATCH] micro improvements (#6674)

---
 arangod/Aql/AqlItemBlock.cpp                   |  2 +-
 arangod/Aql/ExecutionNode.h                    | 10 ----------
 arangod/Cluster/HeartbeatThread.cpp            | 13 ++++++-------
 arangod/RestHandler/RestReplicationHandler.cpp |  1 -
 js/common/modules/@arangodb/aql/explainer.js   |  3 +++
 5 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/arangod/Aql/AqlItemBlock.cpp b/arangod/Aql/AqlItemBlock.cpp
index eb82f5bc26..c8c7027832 100644
--- a/arangod/Aql/AqlItemBlock.cpp
+++ b/arangod/Aql/AqlItemBlock.cpp
@@ -113,10 +113,10 @@ AqlItemBlock::AqlItemBlock(ResourceMonitor* resourceMonitor, VPackSlice const sl
   };
     
   int64_t runLength = 0;
-  size_t tablePos = 0;
   RunType runType = NoRun;
   
   try {
+    size_t tablePos = 0;
     // skip the first two records
     rawIterator.next();
     rawIterator.next();
diff --git a/arangod/Aql/ExecutionNode.h b/arangod/Aql/ExecutionNode.h
index d28f6f2acd..c72806bc7b 100644
--- a/arangod/Aql/ExecutionNode.h
+++ b/arangod/Aql/ExecutionNode.h
@@ -777,7 +777,6 @@ class LimitNode : public ExecutionNode {
   friend class ExecutionBlock;
   friend class LimitBlock;
 
-  /// @brief constructors for various arguments, always with offset and limit
  public:
   LimitNode(ExecutionPlan* plan, size_t id, size_t offset, size_t limit)
       : ExecutionNode(plan, id),
@@ -785,9 +784,6 @@ class LimitNode : public ExecutionNode {
         _limit(limit),
         _fullCount(false) {}
 
-  LimitNode(ExecutionPlan* plan, size_t id, size_t limit)
-      : LimitNode(plan, id, 0, limit) {}
-
   LimitNode(ExecutionPlan*, arangodb::velocypack::Slice const& base);
 
   /// @brief return the type of the node
@@ -824,15 +820,9 @@ class LimitNode : public ExecutionNode {
   /// @brief return the offset value
   size_t offset() const { return _offset; }
 
-  /// @brief set the offset value
-  void setOffset(size_t offset) { _offset = offset; }
-
   /// @brief return the limit value
   size_t limit() const { return _limit; }
 
-  /// @brief set the limit value
-  void setLimit(size_t limit) { _limit = limit; }
-
  private:
   /// @brief the offset
   size_t _offset;
diff --git a/arangod/Cluster/HeartbeatThread.cpp b/arangod/Cluster/HeartbeatThread.cpp
index f9102a1f8f..c6b09b2963 100644
--- a/arangod/Cluster/HeartbeatThread.cpp
+++ b/arangod/Cluster/HeartbeatThread.cpp
@@ -79,13 +79,12 @@ namespace arangodb {
 class HeartbeatBackgroundJobThread : public Thread {
 
 public:
-  HeartbeatBackgroundJobThread(HeartbeatThread *heartbeatThread) :
-    Thread("Maintenance"),
-    _heartbeatThread(heartbeatThread),
-    _stop(false),
-    _sleeping(false),
-    _backgroundJobsLaunched(0)
-  {}
+  explicit HeartbeatBackgroundJobThread(HeartbeatThread* heartbeatThread) 
+      : Thread("Maintenance"),
+        _heartbeatThread(heartbeatThread),
+        _stop(false),
+        _sleeping(false),
+        _backgroundJobsLaunched(0) {}
 
   ~HeartbeatBackgroundJobThread() { shutdown(); }
 
diff --git a/arangod/RestHandler/RestReplicationHandler.cpp b/arangod/RestHandler/RestReplicationHandler.cpp
index bc7ffe6a55..0f8198b900 100644
--- a/arangod/RestHandler/RestReplicationHandler.cpp
+++ b/arangod/RestHandler/RestReplicationHandler.cpp
@@ -2127,7 +2127,6 @@ void RestReplicationHandler::handleCommandAddFollower() {
   TRI_ASSERT(checksumSlice.isString() && readLockIdSlice.isString());
 
   const std::string readLockId = readLockIdSlice.copyString();
-  const std::string checksum = checksumSlice.copyString();
 
   std::string referenceChecksum;
   {
diff --git a/js/common/modules/@arangodb/aql/explainer.js b/js/common/modules/@arangodb/aql/explainer.js
index 2d822c41f3..afc72f1755 100644
--- a/js/common/modules/@arangodb/aql/explainer.js
+++ b/js/common/modules/@arangodb/aql/explainer.js
@@ -877,6 +877,9 @@ function processQuery (query, explain) {
           return bracketize(node, node.subNodes.map(function (sub) { return buildExpression(sub); }).join(' && '));
         }
         return '';
+      case 'parameter':
+      case 'datasource parameter':
+        return value('@' + node.name);
       default:
         return 'unhandled node type (' + node.type + ')';
     }