format

include/libs/monitorfw/taos_counter.h

@@ -99,7 +99,7 @@ int taos_counter_inc(taos_counter_t *self, const char **label_values);
  */
 int taos_counter_add(taos_counter_t *self, double r_value, const char **label_values);
 
-int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys,int32_t **vgroup_ids);
+int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys, int32_t **vgroup_ids);
 int taos_counter_get_keys_size(taos_counter_t *self);
 int taos_counter_delete(taos_counter_t *self, char *key);
 #endif  // TAOS_COUNTER_H

source/dnode/mgmt/mgmt_vnode/src/vmHandle.c

@@ -14,8 +14,8 @@
  */
 
 #define _DEFAULT_SOURCE
-#include "vmInt.h"
 #include "taos_monitor.h"
+#include "vmInt.h"
 
 extern taos_counter_t *tsInsertCounter;
 
@@ -125,10 +125,10 @@ int vmCleanExpriedSamples(SVnodeMgmt *pMgmt) {
   if (list_size == 0) return 0;
   int32_t *vgroup_ids;
   char   **keys;
-  taos_counter_get_vgroup_ids(tsInsertCounter,&keys,&vgroup_ids);
+  taos_counter_get_vgroup_ids(tsInsertCounter, &keys, &vgroup_ids);
   int r = 0;
   (void)taosThreadRwlockWrlock(&pMgmt->lock);
-  for (int i = 0; i<list_size; i++) {
+  for (int i = 0; i < list_size; i++) {
     int32_t vgroup_id = vgroup_ids[i];
     void   *vnode = taosHashGet(pMgmt->hash, &vgroup_id, sizeof(int32_t));
     if (vnode == NULL) {

source/dnode/mgmt/node_mgmt/src/dmMonitor.c

@@ -14,9 +14,9 @@
  */
 
 #define _DEFAULT_SOURCE
+#include "audit.h"
 #include "dmMgmt.h"
 #include "dmNodes.h"
-#include "audit.h"
 
 static void dmGetMonitorBasicInfo(SDnode *pDnode, SMonBasicInfo *pInfo) {
   pInfo->protocol = 1;
@@ -33,8 +33,8 @@ static void dmGetMonitorBasicInfoBasic(SDnode *pDnode, SMonBasicInfo *pInfo) {
 }
 
 static void dmGetMonitorDnodeInfo(SDnode *pDnode, SMonDnodeInfo *pInfo) {
-  //pInfo->uptime = (taosGetTimestampMs() - pDnode->data.rebootTime) / (86400000.0f);
+  // pInfo->uptime = (taosGetTimestampMs() - pDnode->data.rebootTime) / (86400000.0f);
-  pInfo->uptime = (taosGetTimestampMs() - pDnode->data.rebootTime) /1000.0f;
+  pInfo->uptime = (taosGetTimestampMs() - pDnode->data.rebootTime) / 1000.0f;
   pInfo->has_mnode = pDnode->wrappers[MNODE].required;
   pInfo->has_qnode = pDnode->wrappers[QNODE].required;
   pInfo->has_snode = pDnode->wrappers[SNODE].required;
@@ -141,10 +141,8 @@ void dmMonitorCleanExpiredSamples() {
   (void)dmCleanExpriedSamples(pDnode);
 }
 
-//Todo: put this in seperate file in the future
+// Todo: put this in seperate file in the future
-void dmSendAuditRecords() {
+void dmSendAuditRecords() { auditSendRecordsInBatch(); }
-  auditSendRecordsInBatch();
-}
 
 void dmGetVnodeLoads(SMonVloadInfo *pInfo) {
   SDnode       *pDnode = dmInstance();

source/libs/monitorfw/inc/taos_metric_formatter_i.h

@@ -57,8 +57,8 @@ int taos_metric_formatter_load_l_value(taos_metric_formatter_t *metric_formatter
 /**
  * @brief API PRIVATE Loads the formatter with a metric sample
  */
-int taos_metric_formatter_load_sample(taos_metric_formatter_t *metric_formatter, taos_metric_sample_t *sample, 
+int taos_metric_formatter_load_sample(taos_metric_formatter_t *metric_formatter, taos_metric_sample_t *sample, char *ts,
-                                        char *ts, char *format);
+                                      char *format);
 
 /**
  * @brief API PRIVATE Loads a metric in the string exposition format

source/libs/monitorfw/src/taos_counter.c

@@ -20,14 +20,14 @@
 #include "taos_alloc.h"
 
 // Private
-#include "taos_test.h"
 #include "taos_errors.h"
 #include "taos_log.h"
+#include "taos_metric_formatter_i.h"
 #include "taos_metric_i.h"
 #include "taos_metric_sample_i.h"
 #include "taos_metric_sample_t.h"
 #include "taos_metric_t.h"
-#include "taos_metric_formatter_i.h"
+#include "taos_test.h"
 
 taos_counter_t *taos_counter_new(const char *name, const char *help, size_t label_key_count, const char **label_keys) {
   return (taos_counter_t *)taos_metric_new(TAOS_COUNTER, name, help, label_key_count, label_keys);
@@ -66,11 +66,9 @@ int taos_counter_add(taos_counter_t *self, double r_value, const char **label_va
   return taos_metric_sample_add(sample, r_value);
 }
 
-int taos_counter_get_keys_size(taos_counter_t *self) {
+int taos_counter_get_keys_size(taos_counter_t *self) { return self->samples->keys->size; }
-  return self->samples->keys->size;
-}
 
-int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys,int32_t **vgroup_ids) {
+int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys, int32_t **vgroup_ids) {
   TAOS_TEST_PARA(self != NULL);
   if (self == NULL) return 1;
   if (self->type != TAOS_COUNTER) {
@@ -80,10 +78,10 @@ int taos_counter_get_vgroup_ids(taos_counter_t *self, char ***keys,int32_t **vgr
   if (self->samples == NULL) return 1;
   taos_linked_list_t *key_list = self->samples->keys;
   int                 r = 0;
-  *vgroup_ids = (int32_t *)taos_malloc(key_list->size*sizeof(int32_t));
+  *vgroup_ids = (int32_t *)taos_malloc(key_list->size * sizeof(int32_t));
-  *keys = (char **)taos_malloc(key_list->size*sizeof(char *));
+  *keys = (char **)taos_malloc(key_list->size * sizeof(char *));
   int index = 0;
-  for (taos_linked_list_node_t *current_key = key_list->head; current_key != NULL;current_key = current_key->next) {
+  for (taos_linked_list_node_t *current_key = key_list->head; current_key != NULL; current_key = current_key->next) {
     char   *key = (char *)current_key->item;
     int32_t vgroup_id = taos_metric_formatter_get_vgroup_id(key);
     (*vgroup_ids)[index] = vgroup_id;

source/libs/monitorfw/src/taos_metric_formatter.c

@@ -157,7 +157,7 @@ int taos_metric_formatter_load_l_value(taos_metric_formatter_t *self, const char
   return 0;
 }
 int32_t taos_metric_formatter_get_vgroup_id(char *key) {
-  char *start,*end;
+  char *start, *end;
   char  vgroupid[10];
   start = strstr(key, "vgroup_id=\"");
   if (start) {