fix query and health.hql

aerospike · Oct 17, 2023 · a7794b8 · a7794b8
1 parent 7278162
commit a7794b8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/lib/health/query.py b/lib/health/query.py
@@ -1503,8 +1503,7 @@
 // Secondary Index Aggregation Query Statistics, fromally Query Agg statistics
 s = select "si_query_aggr_complete" as "val" from NAMESPACE.STATISTICS save;
 e = select "si_query_aggr_error" as "val" from NAMESPACE.STATISTICS save;
-total_transactions = do s + e; 
-total_transaction = do total_transactions + a save as "total sindex query aggregations";
+total_transactions = do s + e save as "total sindex query aggregations";
 total_transactions_per_sec = do total_transactions/u;
 total_transactions_per_sec = group by CLUSTER, NAMESPACE, NODE do MAX(total_transactions_per_sec);
 
@@ -1620,7 +1619,7 @@
     
 // Scan Basic statistics
 s = select "scan_basic_complete" as "cnt" from NAMESPACE.STATISTICS;
-e = select "scan_basic_error", as "cnt" from NAMESPACE.STATISTICS;
+e = select "scan_basic_error" as "cnt" from NAMESPACE.STATISTICS;
 total_transactions = do s + e save as "total basic scans";
 total_transactions_per_sec = do total_transactions/u;
 total_transactions_per_sec = group by CLUSTER, NAMESPACE, NODE do MAX(total_transactions_per_sec);

diff --git a/lib/health/query/health.hql b/lib/health/query/health.hql
@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-QUERIES = """
 /***************************************************
 * System Resource                                  *
 ****************************************************/
@@ -1503,8 +1502,7 @@ ASSERT(r, True, "Non-zero sindex basic short query errors", "OPERATIONS", INFO,
 // Secondary Index Aggregation Query Statistics, fromally Query Agg statistics
 s = select "si_query_aggr_complete" as "val" from NAMESPACE.STATISTICS save;
 e = select "si_query_aggr_error" as "val" from NAMESPACE.STATISTICS save;
-total_transactions = do s + e; 
-total_transaction = do total_transactions + a save as "total sindex query aggregations";
+total_transactions = do s + e save as "total sindex query aggregations";
 total_transactions_per_sec = do total_transactions/u;
 total_transactions_per_sec = group by CLUSTER, NAMESPACE, NODE do MAX(total_transactions_per_sec);
 
@@ -1620,7 +1618,7 @@ ASSERT(r, True, "Non-zero scan aggregation errors", "OPERATIONS", INFO,
 
 // Scan Basic statistics
 s = select "scan_basic_complete" as "cnt" from NAMESPACE.STATISTICS;
-e = select "scan_basic_error", as "cnt" from NAMESPACE.STATISTICS;
+e = select "scan_basic_error" as "cnt" from NAMESPACE.STATISTICS;
 total_transactions = do s + e save as "total basic scans";
 total_transactions_per_sec = do total_transactions/u;
 total_transactions_per_sec = group by CLUSTER, NAMESPACE, NODE do MAX(total_transactions_per_sec);
@@ -2154,5 +2152,3 @@ ASSERT(m, False, "Outlier[s] detected by the server health check.", "OPERATIONS"
 			    "Server health check outlier detection. Run command 'asinfo -v health-outliers' to see list of outliers");
 
 SET CONSTRAINT VERSION ALL;
-
-"""