Small fixes prior to release (#709)

* Update some cali-query help text

* Use avg() for region.stats option

Author: daboehme

src/caliper/controllers/controllers.cpp

@@ -254,8 +254,8 @@ const char* builtin_base_option_specs = R"json(
  },
  "query":
  {
-  "local": "select sum(sum#region.count) as Visits unit count,min(min#time.inclusive.duration.ns) as \"Nsec/visit (min)\" unit nsec,ratio(sum#time.inclusive.duration.ns,sum#region.count) as \"Nsec/visit (avg)\" unit nsec,max(max#time.inclusive.duration.ns) as \"Nsec/visit (max)\" unit nsec",
-  "cross": "select sum(sum#sum#region.count) as Visits unit count,min(min#min#time.inclusive.duration.ns) as \"Nsec/visit (min)\" unit nsec,ratio(sum#sum#time.inclusive.duration.ns,sum#sum#region.count) as \"Nsec/visit (avg)\" unit nsec,max(max#max#time.inclusive.duration.ns) as \"Nsec/visit (max)\" unit nsec"
+  "local": "select sum(sum#region.count) as Visits unit count,min(min#time.inclusive.duration.ns) as \"Nsec/visit (min)\" unit nsec,avg(avg#time.inclusive.duration.ns) as \"Nsec/visit (avg)\" unit nsec,max(max#time.inclusive.duration.ns) as \"Nsec/visit (max)\" unit nsec",
+  "cross": "select sum(sum#sum#region.count) as Visits unit count,min(min#min#time.inclusive.duration.ns) as \"Nsec/visit (min)\" unit nsec,avg(avg#avg#time.inclusive.duration.ns) as \"Nsec/visit (avg)\" unit nsec,max(max#max#time.inclusive.duration.ns) as \"Nsec/visit (max)\" unit nsec"
  }
 },{
  "name": "loop.stats",

src/tools/cali-query/query_common.cpp

@@ -118,7 +118,7 @@ ORDER BY
 
 All of the statements are optional; by default cali-query will pass the input
 records through as-is, without any aggregations, and output .cali data.
-statements are case-insensitive and can be provided in any order.
+Statements are case-insensitive and can be provided in any order.
 
 Run "--help [let, select, groupby, where, format]" for more information about
 each CalQL statement.
@@ -148,7 +148,7 @@ The general structure is
 
 The aggregations in the SELECT statement specify how attributes are
 aggregated. Use the GROUP BY statement to specify the output set. Use AS
-to specify an optional custom label/header.
+to specify an optional human-readable label.
 
 Available aggregation operations:
 
@@ -163,7 +163,7 @@ structure is
 
     GROUP BY path | attribute name [, ...]
 
-The "path" value selects all region name attributes for grouping.
+The "path" value selects all region attributes for grouping.
 )helpstr";
 
 const char* s_calql_where_helpstr = R"helpstr(