Fix recording of performance data

came · Nov 7, 2013 · c280f3e · c280f3e
1 parent 77a1ade
commit c280f3e
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 5 deletions.
diff --git a/src/lib/access/system/RequestParseTask.cpp b/src/lib/access/system/RequestParseTask.cpp
@@ -19,7 +19,7 @@
 #include "helper/numerical_converter.h"
 #include "helper/PapiTracer.h"
 #include "helper/sha1.h"
-
+#include "helper/vector_helpers.h"
 #include "io/TransactionManager.h"
 #include "net/Router.h"
 #include "net/AbstractConnection.h"
@@ -72,8 +72,6 @@ void RequestParseTask::operator()() {
 
   performance_vector_t& performance_data = _responseTask->getPerformanceData();
 
-
-
   bool recordPerformance = false;
   std::vector<std::shared_ptr<Task> > tasks;
 
@@ -109,7 +107,7 @@ void RequestParseTask::operator()() {
 
     if (ctx && reader.parse(query_string, request_data)) {
       _responseTask->setTxContext(*ctx);
-      recordPerformance = request_data["performance"].asBool();
+      recordPerformance = getOrDefault(body_data, "performance", "false") == "true";
 
       // the performance attribute for this operation (at [0])
       if (recordPerformance) {
@@ -127,6 +125,7 @@ void RequestParseTask::operator()() {
         sessionId = request_data["sessionId"].asInt();
       _responseTask->setPriority(priority);
       _responseTask->setSessionId(sessionId);
+      _responseTask->setRecordPerformanceData(recordPerformance);
       try {
         tasks = QueryParser::instance().deserialize(
                   QueryTransformationEngine::getInstance()->transform(request_data),

diff --git a/src/lib/helper/vector_helpers.h b/src/lib/helper/vector_helpers.h
@@ -63,4 +63,14 @@ bool allValid(Input values) {
   return std::all_of(std::begin(values), std::end(values), [] (decltype(*begin(values)) v) { return v != nullptr; });
 }
 
+template <typename MapType>
+auto getOrDefault(const MapType& map, typename MapType::key_type key, typename MapType::mapped_type def) -> typename MapType::mapped_type {
+  auto f = map.find(key);
+  if (f != std::end(map)) {
+    return f->second;
+  }
+  return def;
+}
+
+
 #endif
diff --git a/tools/test_server.py b/tools/test_server.py
@@ -45,6 +45,12 @@ def test_urls(port):
     assert("/static/" in op)
     assert("/operations/" in op)
 
+def test_perf_flag(port):
+    op = subprocess.check_output("curl -X POST -s --data performance=true --data-urlencode query@test/autojson/NoOp.json localhost:{0}/query/".format(port).split(" "))
+    assert "performanceData" in op
+    op = subprocess.check_output("curl -X POST -s --data performance=false --data-urlencode query@test/autojson/NoOp.json localhost:{0}/query/".format(port).split(" "))
+    assert "performanceData" not in op
+
 def test_sockets(port, pid):
     i = get_num_sockets(pid)
     c = Connection(port=port)
@@ -73,7 +79,7 @@ def main():
 
         test_tx(c)
         test_sockets(port, p.pid)
-
+        test_perf_flag(port)
         send_query_and_terminate_before_response(port)
         time.sleep(2)
         send_query_and_terminate_before_response(port)