From 2cc3ae2c895000c0ade02cb34bdd0fc3681cdf4d Mon Sep 17 00:00:00 2001
From: fengzero <fengzero@fengzero.com>
Date: Fri, 15 Apr 2022 09:12:53 +0000
Subject: [PATCH] refactor(adapter): remove node_id in adapter

---
 src/adapter/adapter.c          | 15 +++------------
 src/adapter/adapter_internal.h | 14 +++++++-------
 src/adapter/driver/driver.c    |  4 ++--
 3 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/adapter/adapter.c b/src/adapter/adapter.c
index 27cc463c..a94d6a8b 100644
--- a/src/adapter/adapter.c
+++ b/src/adapter/adapter.c
@@ -740,15 +740,7 @@ neu_adapter_state_to_plugin_state(neu_adapter_t *adapter)
 
 static uint32_t adapter_get_req_id(neu_adapter_t *adapter)
 {
-    uint32_t req_id;
-
-    adapter->new_req_id++;
-    if (adapter->new_req_id == 0) {
-        adapter->new_req_id = 1;
-    }
-
-    req_id = adapter->new_req_id;
-    return req_id;
+    return adapter->req_id += 2;
 }
 
 static int adapter_command(neu_adapter_t *adapter, neu_request_t *cmd,
@@ -1404,13 +1396,12 @@ neu_adapter_t *neu_adapter_create(neu_adapter_info_t *info,
     adapter->id               = info->id;
     adapter->name             = strdup(info->name);
     adapter->state            = ADAPTER_STATE_IDLE;
-    adapter->new_req_id       = 1;
+    adapter->req_id           = 1;
     adapter->plugin_info.id   = info->plugin_id;
     adapter->plugin_info.kind = info->plugin_kind;
     adapter->manager          = manager;
     adapter->trans_kind       = NEURON_TRANS_DATAVAL;
-    adapter->node_id = neu_manager_adapter_id_to_node_id(manager, info->id);
-    adapter->cb_funs = callback_funs;
+    adapter->cb_funs          = callback_funs;
 
     rv = nng_mtx_alloc(&adapter->nng.mtx);
     assert(rv == 0);
diff --git a/src/adapter/adapter_internal.h b/src/adapter/adapter_internal.h
index 2e57d68b..856a9d9d 100644
--- a/src/adapter/adapter_internal.h
+++ b/src/adapter/adapter_internal.h
@@ -43,14 +43,13 @@ typedef enum adapter_state {
 } adapter_state_e;
 
 struct neu_adapter {
-    adapter_id_t     id;
-    neu_adapter_id_t node_id;
-    adapter_state_e  state;
-    char *           name;
-    neu_manager_t *  manager;
+    adapter_id_t    id;
+    adapter_state_e state;
+    char *          name;
+    neu_manager_t * manager;
+
+    uint32_t req_id;
 
-    int                 recv_fd;
-    uint32_t            new_req_id;
     neu_trans_kind_e    trans_kind;
     adapter_callbacks_t cb_funs;
     neu_config_t        node_setting;
@@ -73,6 +72,7 @@ struct neu_adapter {
 
     neu_events_t *  events;
     neu_event_io_t *nng_io;
+    int             recv_fd;
 };
 
 neu_adapter_t *neu_adapter_create(neu_adapter_info_t *info,
diff --git a/src/adapter/driver/driver.c b/src/adapter/driver/driver.c
index e2871add..9bd1a0d4 100644
--- a/src/adapter/driver/driver.c
+++ b/src/adapter/driver/driver.c
@@ -143,7 +143,7 @@ int neu_adapter_driver_stop(neu_adapter_driver_t *driver)
 int neu_adapter_driver_init(neu_adapter_driver_t *driver)
 {
     driver->tag_table = neu_manager_get_datatag_tbl(driver->adapter.manager,
-                                                    driver->adapter.node_id);
+                                                    driver->adapter.id);
 
     return 0;
 }
@@ -319,7 +319,7 @@ static int read_callback(void *usr_data)
             sg->driver->adapter.plugin_info.plugin, &sg->grp);
     } else {
         neu_taggrp_config_t *new_config = neu_system_find_group_config(
-            sg->driver->adapter.plugin_info.plugin, sg->driver->adapter.node_id,
+            sg->driver->adapter.plugin_info.plugin, sg->driver->adapter.id,
             neu_taggrp_cfg_get_name(sg->group));
         assert(new_config != NULL);