More aggregator performance optimizations

include/caliper/reader/Aggregator.h

@@ -30,8 +30,6 @@ class Aggregator
 
     Aggregator(const QuerySpec& spec);
 
-    ~Aggregator();
-
     void add(CaliperMetadataAccessInterface&, const EntryList&);
 
     void operator() (CaliperMetadataAccessInterface& db, const EntryList& list) { add(db, list); }

include/caliper/reader/CaliWriter.h

@@ -26,11 +26,8 @@ class CaliWriter
 public:
 
     CaliWriter() {}
-
     CaliWriter(OutputStream& os);
 
-    ~CaliWriter();
-
     size_t num_written() const;
 
     void write_snapshot(const CaliperMetadataAccessInterface&, const std::vector<Entry>&);

include/caliper/reader/FormatProcessor.h

@@ -31,8 +31,6 @@ class FormatProcessor
     /// \brief Create formatter for given query spec and output stream.
     FormatProcessor(const QuerySpec&, OutputStream&);
 
-    ~FormatProcessor();
-
     /// \brief Add snapshot record to formatter.
     void process_record(CaliperMetadataAccessInterface&, const EntryList&);
 

include/caliper/reader/Preprocessor.h

@@ -30,8 +30,6 @@ class Preprocessor
 
     Preprocessor(const QuerySpec& spec);
 
-    ~Preprocessor();
-
     EntryList process(CaliperMetadataAccessInterface&, const EntryList&);
 
     void operator() (CaliperMetadataAccessInterface& db, const EntryList& rec, SnapshotProcessFn push)

include/caliper/reader/QueryProcessor.h

@@ -29,8 +29,6 @@ class QueryProcessor
 
     QueryProcessor(const QuerySpec&, OutputStream& stream);
 
-    ~QueryProcessor();
-
     void process_record(CaliperMetadataAccessInterface&, const EntryList&);
     void flush(CaliperMetadataAccessInterface&);
 

include/caliper/reader/RecordSelector.h

@@ -31,8 +31,6 @@ class RecordSelector
     RecordSelector(const QuerySpec& spec);
     RecordSelector(const QuerySpec::Condition& cond);
 
-    ~RecordSelector();
-
     bool pass(const CaliperMetadataAccessInterface&, const EntryList&);
 
     void operator() (CaliperMetadataAccessInterface&, const EntryList&, SnapshotProcessFn) const;

src/caliper/controllers/HatchetRegionProfileController.cpp

@@ -140,12 +140,9 @@ const char* controller_spec = R"json(
    "category": "metric",
    "description": "Add inclusive time metric",
    "query":
-   [
-    {
-     "level"  : "local",
-     "select" : [ "inclusive_scale(sum#time.duration.ns,1e-9) as \"time (inc)\" unit sec" ]
-    }
-   ]
+   {
+    "local": "select inclusive_scale(sum#time.duration.ns,1e-9) as \"time (inc)\" unit sec"
+   }
   }
  ]
 }

src/caliper/controllers/HatchetSampleProfileController.cpp

@@ -83,7 +83,7 @@ class HatchetSampleProfileController : public cali::ChannelController
         } else {
             config()["CALI_SERVICES_ENABLE"].append(",report");
             config()["CALI_REPORT_FILENAME"] = output;
-            config()["CALI_REPORT_CONFIG"]   = opts.build_query("local", query); 
+            config()["CALI_REPORT_CONFIG"]   = opts.build_query("local", query);
         }
 
         opts.update_channel_config(config());
@@ -143,7 +143,7 @@ const char* controller_spec = R"json(
  "services"    : [ "sampler", "trace" ],
  "categories"  : [ "adiak", "metadata", "sampling", "output" ],
  "config"      : { "CALI_CHANNEL_FLUSH_ON_EXIT": "false" },
- "defaults"    : { "callpath": "true", "source.module": "true" },
+ "defaults"    : { "callpath": "false", "source.module": "true", "source.function": "true" },
  "options":
  [
   {
@@ -160,11 +160,9 @@ const char* controller_spec = R"json(
    "description": "Perform call-stack unwinding",
    "services": [ "callpath", "symbollookup" ],
    "query":
-   [
-    { "level": "local", "group by": "source.function#callpath.address",
-      "select": [ "source.function#callpath.address" ]
-    }
-   ]
+   {
+    "local": "select source.function#callpath.address group by source.function#callpath.address"
+   }
   },{
    "name": "use.mpi",
    "type": "bool",

src/caliper/controllers/RuntimeReportController.cpp

@@ -143,16 +143,10 @@ const char* runtime_report_spec = R"json(
    "type": "bool",
    "description": "Order tree branches by highest exclusive runtime",
    "query":
-   [
-    {
-     "level": "local",
-     "order by": [ "sum#report.time\ desc" ]
-    },{
-     "level": "cross",
-     "aggregate": "sum(sum#report.time)",
-     "order by" : [ "sum#sum#report.time\ desc" ]
-    }
-   ]
+   {
+    "local": "order by sum#report.time desc",
+    "cross": "aggregate sum(sum#report.time) order by sum#sum#report.time desc"
+   }
   },{
    "name": "output.append",
    "type": "bool",

src/caliper/controllers/controllers.cpp

@@ -593,11 +593,11 @@ const char* builtin_gotcha_option_specs = R"json(
     max(max#alloc.size) as \"Max Bytes/alloc\"",
   "cross":
   "select
-    max(max#alloc.region.highwatermark) as \"Mem HWM\",
+    max(max#max#alloc.region.highwatermark) as \"Mem HWM\",
     max(max#alloc.tally) as \"Alloc tMax\",
     sum(sum#alloc.count) as \"Alloc count\",
-    avg(avg#alloc.size) as \"Avg Bytes/alloc\",
-    max(max#alloc.size) as \"Max Bytes/alloc\""
+    avg(avg#avg#alloc.size) as \"Avg Bytes/alloc\",
+    max(max#max#alloc.size) as \"Max Bytes/alloc\""
  }
 },{
  "name": "mem.pages",