fix count

jsteemann · jsteemann · commit cf04966abaf7 · 2016-12-14T10:30:46.000+01:00
diff --git a/arangod/Utils/Transaction.cpp b/arangod/Utils/Transaction.cpp
@@ -2821,22 +2821,7 @@ OperationResult Transaction::countCoordinator(std::string const& collectionName,
     return OperationResult(res);
   }
 
-  VPackBuilder resultBuilder;
-  if (aggregate) {
-    uint64_t result = 0;
-    for (auto const& it : count) {
-      result += it.second;
-    }
-    resultBuilder.add(VPackValue(result));
-  } else {
-    resultBuilder.openObject();
-    for (auto const& it : count) {
-      resultBuilder.add(it.first, VPackValue(it.second));
-    }
-    resultBuilder.close();
-  }
-
-  return OperationResult(resultBuilder.steal(), nullptr, "", TRI_ERROR_NO_ERROR, false);
+  return buildCountResult(count, aggregate);
 }
 #endif
 
@@ -3611,6 +3596,25 @@ int Transaction::resolveId(char const* handle, size_t length,
 
   return TRI_ERROR_NO_ERROR;
 }
+  
+OperationResult Transaction::buildCountResult(std::vector<std::pair<std::string, uint64_t>> const& count, bool aggregate) {
+  VPackBuilder resultBuilder;
+
+  if (aggregate) {
+    uint64_t result = 0;
+    for (auto const& it : count) {
+      result += it.second;
+    }
+    resultBuilder.add(VPackValue(result));
+  } else {
+    resultBuilder.openObject();
+    for (auto const& it : count) {
+      resultBuilder.add(it.first, VPackValue(it.second));
+    }
+    resultBuilder.close();
+  }
+  return OperationResult(resultBuilder.steal(), nullptr, "", TRI_ERROR_NO_ERROR, false);
+}
 
 //////////////////////////////////////////////////////////////////////////////
 /// @brief constructor, leases a StringBuffer
diff --git a/arangod/Utils/Transaction.h b/arangod/Utils/Transaction.h
@@ -754,6 +754,8 @@ class Transaction {
   
  protected:
 
+  static OperationResult buildCountResult(std::vector<std::pair<std::string, uint64_t>> const& count, bool aggregate);
+
   //////////////////////////////////////////////////////////////////////////////
   /// @brief return the transaction collection for a document collection
   //////////////////////////////////////////////////////////////////////////////
