arangodb · jsteemann · Mar 21, 2020 · Mar 20, 2020 · Mar 20, 2020 · Mar 20, 2020
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,15 +1,18 @@
 devel
 -----
 
+* Compilation issues with wrong cv-qualifiers and unnecessary
+  temporary copying.
+
 * Add DTRACE points to track a request through the infrastructure.
 
 * Fixed issue #11275: indexes backward compatibility broken in 3.5+.
 
 * Updated snowball dependency to the latest version.
-  More stemmers are available. Built-in analyzer list is unchanged.  
+  More stemmers are available. Built-in analyzer list is unchanged.
 
 * Reactive REST API endpoint at `/_admin/auth/reload`, as it is called by DC2DC.
- 
+
 * Fix an endless loop in FollowerInfo::persistInAgency which could trigger
   a hanger if a collection was dropped at the wrong time.
 
@@ -57,7 +60,7 @@ devel
 
 * Allow to override the detected total amount of memory via an environment
   variable ARANGODB_OVERRIDE_DETECTED_TOTAL_MEMORY.
- 
+
 * `splice-subqueries` optimization is not limited by any type of operation within the
   subquery any more. It can now be applied on every subquery and will be by default.
   However they may be a performance impact on some queries where splice-subqueries

diff --git a/arangod/Agency/FailedLeader.cpp b/arangod/Agency/FailedLeader.cpp
@@ -118,7 +118,7 @@ void FailedLeader::rollback() {
       VPackArrayBuilder a(payload.get());
       { // opers
         VPackObjectBuilder b(payload.get());
-        for (auto const c : cs) {
+        for (auto const& c : cs) {
           payload->add(planColPrefix + _database + "/" + c.collection +
                            "/shards/" + c.shard,
                        rb.slice());

diff --git a/arangod/Cluster/ClusterMethods.cpp b/arangod/Cluster/ClusterMethods.cpp
@@ -2294,7 +2294,7 @@ Future<OperationResult> modifyDocumentOnCoordinator(
     VPackBuffer<uint8_t> buffer;
     buffer.append(slice.begin(), slice.byteSize());
 
-    for (std::pair<ShardID, std::vector<ServerID>> const& shardServers : *shardIds) {
+    for (auto const& shardServers : *shardIds) {
       ShardID const& shard = shardServers.first;
       network::Headers headers;
       addTransactionHeaderForShard(trx, *shardIds, shard, headers);

diff --git a/arangod/Pregel/Algos/DMID/DMID.cpp b/arangod/Pregel/Algos/DMID/DMID.cpp
@@ -511,7 +511,7 @@ struct DMIDComputation : public VertexComputation<DMIDValue, float, DMIDMessage>
       int64_t const* iterationCounter = getAggregatedValue<int64_t>(ITERATION_AGG);
 
       size_t m = std::min(getEdgeCount(), messages.size());
-      for (std::pair<PregelID, float> const& pair : membershipCounter) {
+      for (auto const& pair : membershipCounter) {
         // FIXME
         // float const ttt = pair.second / getEdges().size();
         float const ttt = pair.second / m;
@@ -615,7 +615,7 @@ struct DMIDGraphFormat : public GraphFormat<DMIDValue, float> {
       } else {
         // Output for DMID modularity calculator
         b.add(_resultField, VPackValue(VPackValueType::Array));
-        for (std::pair<PregelID, float> const& pair : ptr->membershipDegree) {
+        for (auto const& pair : ptr->membershipDegree) {
           size_t i = arangodb::basics::StringUtils::uint64_trusted(pair.first.key.data(),
                                                                    pair.first.key.size());
           b.openArray();

diff --git a/arangod/Pregel/Algos/DMID/VertexSumAggregator.h b/arangod/Pregel/Algos/DMID/VertexSumAggregator.h
@@ -43,7 +43,7 @@ struct VertexSumAggregator : public IAggregator {
   // if you use this from a vertex I will end you
   void aggregate(void const* valuePtr) override {
     VertexMap const* map = (VertexMap const*)valuePtr;
-    for (MyPair const& pair1 : *map) {
+    for (auto const& pair1 : *map) {
       for (auto const& pair2 : pair1.second) {
         _entries[pair1.first][pair2.first] += pair2.second;
       }
@@ -129,7 +129,7 @@ struct VertexSumAggregator : public IAggregator {
     for (auto const& pair : _entries) {
       PregelShard shard = pair.first;
       std::unordered_map<std::string, double> const& vertexMap = pair.second;
-      for (std::pair<std::string, double> const& vertexMessage : vertexMap) {
+      for (auto const& vertexMessage : vertexMap) {
         func(PregelID(shard, vertexMessage.first), vertexMessage.second);
       }
     }

diff --git a/arangod/Pregel/Algos/SLPA.cpp b/arangod/Pregel/Algos/SLPA.cpp
@@ -114,7 +114,7 @@ struct SLPAComputation : public VertexComputation<SLPAValue, int8_t, uint64_t> {
     uint64_t cumulativeSum = 0;
     // Randomly select a label with probability proportional to the
     // occurrence frequency of this label in its memory
-    for (std::pair<uint64_t, uint64_t> const& e : val->memory) {
+    for (auto const& e : val->memory) {
       cumulativeSum += e.second;
       if (cumulativeSum >= random) {
         sendMessageToAllNeighbours(e.first);
@@ -159,7 +159,7 @@ struct SLPAGraphFormat : public GraphFormat<SLPAValue, int8_t> {
       return false;
     } else {
       std::vector<std::pair<uint64_t, double>> vec;
-      for (std::pair<uint64_t, uint64_t> pair : ptr->memory) {
+      for (auto const& pair : ptr->memory) {
         double t = (double)pair.second / ptr->numCommunities;
         if (t >= threshold) {
           vec.emplace_back(pair.first, t);

diff --git a/arangod/RestServer/Metrics.cpp b/arangod/RestServer/Metrics.cpp
@@ -101,9 +101,9 @@ void Counter::store(uint64_t const& n) {
 
 void Counter::toPrometheus(std::string& result) const {
   _b.push();
-  result += "#TYPE " + name() + " counter\n";
+  result += "\n#TYPE " + name() + " counter\n";
   result += "#HELP " + name() + " " + help() + "\n";
-  result += name() + "{" + labels() + "} " + std::to_string(load()) + "\n";
+  result += name() + "{" + labels() + "} " + std::to_string(load());
 }
 
 Counter::Counter(

diff --git a/arangod/RestServer/Metrics.h b/arangod/RestServer/Metrics.h
@@ -125,7 +125,7 @@ template<typename T> class Gauge : public Metric {
     return _g.load();
   };
   virtual void toPrometheus(std::string& result) const override {
-    result += "#TYPE " + name() + " gauge\n";
+    result += "\n#TYPE " + name() + " gauge\n";
     result += "#HELP " + name() + " " + help() + "\n";
     result += name() + "{" + labels() + "} " + std::to_string(load()) + "\n";
   };
@@ -396,7 +396,7 @@ template<typename Scale> class Histogram : public Metric {
   size_t size() const { return _c.size(); }
 
   virtual void toPrometheus(std::string& result) const override {
-    result += "#TYPE " + name() + " histogram\n";
+    result += "\n#TYPE " + name() + " histogram\n";
     result += "#HELP " + name() + " " + help() + "\n";
     std::string lbs = labels();
     auto const haveLabels = !lbs.empty();

diff --git a/arangod/RestServer/counter.h b/arangod/RestServer/counter.h
@@ -534,7 +534,7 @@ template< typename Integral > class strong_duplex
 private:
     void insert( broker_type* child );
     void erase( broker_type* child, Integral by );
-    std::mutex serializer_;
+    mutable std::mutex serializer_;
     typedef std::unordered_set< broker_type* > set_type;
     set_type children_;
 };
@@ -640,7 +640,7 @@ template< typename Integral > class weak_duplex
 private:
     void insert( broker_type* child );
     void erase( broker_type* child, Integral by );
-    std::mutex serializer_;
+    mutable std::mutex serializer_;
     typedef std::unordered_set< broker_type* > set_type;
     set_type children_;
 };
@@ -821,7 +821,7 @@ template< typename Integral > class strong_duplex_array
 private:
     void insert( broker_type* child );
     void erase( broker_type* child, Integral by );
-    std::mutex serializer_;
+    mutable std::mutex serializer_;
     typedef std::unordered_set< broker_type* > set_type;
     set_type children_;
 };
@@ -894,7 +894,7 @@ template< typename Integral > class weak_duplex_array
 private:
     void insert( broker_type* child );
     void erase( broker_type* child, Integral by );
-    std::mutex serializer_;
+    mutable std::mutex serializer_;
     typedef std::unordered_set< broker_type* > set_type;
     set_type children_;
 };