Misc code cleanup (netdata#15665)

* Cleanup code

* Add SQLITE3_COLUMN_STRDUPZ_OR_NULL for readability

* Bind unique id properly

* Cleanup with is_claimed parameter to decide which cleanup to use
Unify cleanup function sql_health_alarm_log_cleanup
Add SQLITE3_BIND_STRING_OR_NULL and SQLITE3_COLUMN_STRINGDUP_OR_NULL
sql_health_alarm_log_count returns number of rows instead of updating host->health.health_log_entries_written
Reformat queries for clarity

* Try to fix codacy issue

* Try to fix codacy issue -- issue small warning

* Change label from fail to done

* Drop index on unique_id and health_log_id and create one on both

* Update database/sqlite/sqlite_aclk_alert.c

Co-authored-by: Emmanuel Vasilakis <[email protected]>

* Fix double bind

---------

Co-authored-by: Emmanuel Vasilakis <[email protected]>

Author: 2 people

database/rrd.h

@@ -716,13 +716,6 @@ STORAGE_ENGINE* storage_engine_find(const char* name);
 
 #define rrddim_foreach_read(rd, st) \
     dfe_start_read((st)->rrddim_root_index, rd)
-
-#define rrddim_foreach_write(rd, st) \
-    dfe_start_write((st)->rrddim_root_index, rd)
-
-#define rrddim_foreach_reentrant(rd, st) \
-    dfe_start_reentrant((st)->rrddim_root_index, rd)
-
 #define rrddim_foreach_done(rd) \
     dfe_done(rd)
 
@@ -1094,8 +1087,6 @@ struct alarm_entry {
 #define ae_chart_context(ae) string2str((ae)->chart_context)
 #define ae_family(ae) string2str((ae)->family)
 #define ae_classification(ae) string2str((ae)->classification)
-#define ae_component(ae) string2str((ae)->component)
-#define ae_type(ae) string2str((ae)->type)
 #define ae_exec(ae) string2str((ae)->exec)
 #define ae_recipient(ae) string2str((ae)->recipient)
 #define ae_source(ae) string2str((ae)->source)
@@ -1115,13 +1106,13 @@ typedef struct alarm_log {
 } ALARM_LOG;
 
 typedef struct health {
-    unsigned int health_enabled;                   // 1 when this host has health enabled
     time_t health_delay_up_to;                     // a timestamp to delay alarms processing up to
     STRING *health_default_exec;                   // the full path of the alarms notifications program
     STRING *health_default_recipient;              // the default recipient for all alarms
-    size_t health_log_entries_written;             // the number of alarm events written to the alarms event log
+    int health_log_entries_written;                // the number of alarm events written to the alarms event log
     uint32_t health_default_warn_repeat_every;     // the default value for the interval between repeating warning notifications
     uint32_t health_default_crit_repeat_every;     // the default value for the interval between repeating critical notifications
+    unsigned int health_enabled;                   // 1 when this host has health enabled
 } HEALTH;
 
 // ----------------------------------------------------------------------------

database/sqlite/sqlite_aclk_alert.c

@@ -15,7 +15,6 @@ struct proto_alert_status {
     uint64_t last_submitted_sequence_id;
 };
 
-int aclk_add_alert_event(struct aclk_sync_host_config *wc, struct aclk_database_cmd cmd);
 void aclk_push_alert_event(struct aclk_sync_host_config *wc);
 void aclk_send_alarm_configuration (char *config_hash);
 int aclk_push_alert_config_event(char *node_id, char *config_hash);
@@ -28,8 +27,7 @@ void aclk_push_alarm_checkpoint(RRDHOST *host);
 void aclk_push_alert_snapshot_event(char *node_id);
 void aclk_process_send_alarm_snapshot(char *node_id, char *claim_id, char *snapshot_uuid);
 int get_proto_alert_status(RRDHOST *host, struct proto_alert_status *proto_alert_status);
-int sql_queue_alarm_to_aclk(RRDHOST *host, ALARM_ENTRY *ae, int skip_filter);
+void sql_queue_alarm_to_aclk(RRDHOST *host, ALARM_ENTRY *ae, bool skip_filter);
 void aclk_push_alert_events_for_all_hosts(void);
 
-
 #endif //NETDATA_SQLITE_ACLK_ALERT_H

database/sqlite/sqlite_aclk_alert.h

@@ -55,10 +55,9 @@ const char *database_config[] = {
     "info text, exec_code int, new_status real, old_status real, delay int, "
     "new_value double, old_value double, last_repeat int, transition_id blob, global_id int);",
 
-    "CREATE INDEX IF NOT EXISTS health_log_d_ind_1 ON health_log_detail (unique_id);",
     "CREATE INDEX IF NOT EXISTS health_log_d_ind_2 ON health_log_detail (global_id);",
     "CREATE INDEX IF NOT EXISTS health_log_d_ind_3 ON health_log_detail (transition_id);",
-    "CREATE INDEX IF NOT EXISTS health_log_d_ind_4 ON health_log_detail (health_log_id);",
+    "CREATE INDEX IF NOT EXISTS health_log_d_ind_5 ON health_log_detail (health_log_id, unique_id DESC);",
 
     NULL
 };
@@ -74,6 +73,8 @@ const char *database_cleanup[] = {
     "DROP INDEX IF EXISTS ind_c1;",
     "DROP INDEX IF EXISTS ind_c2;",
     "DROP INDEX IF EXISTS alert_hash_index;",
+    "DROP INDEX IF EXISTS health_log_d_ind_4;",
+    "DROP INDEX IF EXISTS health_log_d_ind_1;",
     NULL
 };