sqlite: Add node id to data use metadata

Author: kristrev

metadata_writer_inventory_conn.c

@@ -249,29 +249,30 @@ static int32_t md_inventory_execute_insert_usage(struct md_writer_sqlite *mws,
     //For modems we need both IMEI and ICCID. ICCID is currently stored in the
     //interface_id variable, so some special handling is needed for now
     if (mce->imei) {
-        if (sqlite3_bind_text(stmt, 1, mce->imei, strlen(mce->imei), SQLITE_STATIC) ||
-            sqlite3_bind_text(stmt, 6, mce->imsi, strlen(mce->imsi), SQLITE_STATIC)) {
+        if (sqlite3_bind_text(stmt, 2, mce->imei, strlen(mce->imei), SQLITE_STATIC) ||
+            sqlite3_bind_text(stmt, 7, mce->imsi, strlen(mce->imsi), SQLITE_STATIC)) {
             META_PRINT_SYSLOG(mws->parent, LOG_ERR, "Failed to bind IMEI/IMSI\n");
             return SQLITE_ERROR;
         }
 
-        interface_id_idx = 5;
+        interface_id_idx = 6;
     } else {
-        if (sqlite3_bind_text(stmt, 5, no_iccid_str, strlen(no_iccid_str), SQLITE_STATIC) ||
-            sqlite3_bind_text(stmt, 6, no_iccid_str, strlen(no_iccid_str), SQLITE_STATIC)) {
+        if (sqlite3_bind_text(stmt, 6, no_iccid_str, strlen(no_iccid_str), SQLITE_STATIC) ||
+            sqlite3_bind_text(stmt, 7, no_iccid_str, strlen(no_iccid_str), SQLITE_STATIC)) {
             META_PRINT_SYSLOG(mws->parent, LOG_ERR, "Failed to bind empty IMEI/IMSI\n");
             return SQLITE_ERROR;
         }
     }
 
-    if (sqlite3_bind_text(stmt, interface_id_idx, mce->interface_id,
+    if (sqlite3_bind_int(stmt, 1, mws->node_id) ||
+        sqlite3_bind_text(stmt, interface_id_idx, mce->interface_id,
             strlen(mce->interface_id), SQLITE_STATIC) ||
-        sqlite3_bind_int(stmt, 2, mce->network_address_family) ||
-        sqlite3_bind_int(stmt, 3, mce->event_type) ||
-        sqlite3_bind_int(stmt, 4, mce->event_param) ||
-        sqlite3_bind_int64(stmt, 7, date_start) ||
-        sqlite3_bind_int64(stmt, 8, mce->rx_bytes) ||
-        sqlite3_bind_int64(stmt, 9, mce->tx_bytes)) {
+        sqlite3_bind_int(stmt, 3, mce->network_address_family) ||
+        sqlite3_bind_int(stmt, 4, mce->event_type) ||
+        sqlite3_bind_int(stmt, 5, mce->event_param) ||
+        sqlite3_bind_int64(stmt, 8, date_start) ||
+        sqlite3_bind_int64(stmt, 9, mce->rx_bytes) ||
+        sqlite3_bind_int64(stmt, 10, mce->tx_bytes)) {
         META_PRINT_SYSLOG(mws->parent, LOG_ERR, "Failed to bind values to INSERT usage query\n");
         return SQLITE_ERROR;
     }

metadata_writer_sqlite.c

@@ -481,6 +481,7 @@ static int md_sqlite_configure(struct md_writer_sqlite *mws,
     if (mws->node_id && (md_sqlite_update_nodeid_db(mws, UPDATE_EVENT_ID) ||
         md_sqlite_update_nodeid_db(mws, UPDATE_UPDATES_ID) ||
         md_sqlite_update_nodeid_db(mws, UPDATE_GPS_ID) ||
+        md_sqlite_update_nodeid_db(mws, UPDATE_USAGE_ID) ||
         md_sqlite_update_nodeid_db(mws, UPDATE_SYSTEM_ID))) {
         META_PRINT_SYSLOG(mws->parent, LOG_ERR, "Could not update old ements with id 0\n");
         return RETVAL_FAILURE;
@@ -769,6 +770,7 @@ static void md_sqlite_handle_timeout(void *ptr)
         if (md_sqlite_update_nodeid_db(mws, UPDATE_EVENT_ID) ||
             md_sqlite_update_nodeid_db(mws, UPDATE_UPDATES_ID) ||
             md_sqlite_update_nodeid_db(mws, UPDATE_GPS_ID) ||
+            md_sqlite_update_nodeid_db(mws, UPDATE_USAGE_ID) ||
             md_sqlite_update_nodeid_db(mws, UPDATE_SYSTEM_ID)) {
             META_PRINT_SYSLOG(mws->parent, LOG_ERR, "Could not update node id in database\n");
 

metadata_writer_sqlite.h

@@ -107,6 +107,7 @@
                             "PRIMARY KEY(NodeId,Timestamp,Sequence))"
 
 #define CREATE_USAGE_SQL    "CREATE TABLE IF NOT EXISTS DataUse(" \
+                            "NodeId INTEGER NOT NULL," \
                             "DeviceId TEXT NOT NULL," \
                             "NetworkAddressFamily INTEGER NOT NULL," \
                             "EventType INTEGER NOT NULL," \
@@ -152,10 +153,10 @@
                              ",Sequence,Boottime) " \
                              "VALUES (?,?,?,?)"
 
-#define INSERT_USAGE        "INSERT INTO DataUse(DeviceId,NetworkAddressFamily,EventType,EventParam" \
+#define INSERT_USAGE        "INSERT INTO DataUse(NodeId, DeviceId,NetworkAddressFamily,EventType,EventParam" \
                             ",SimCardIccid" \
                             ",SimCardImsi,Timestamp,RxData,TxData) " \
-                            "VALUES (?,?,?,?,?,?,?,?,?)"
+                            "VALUES (?, ?,?,?,?,?,?,?,?,?)"
 
 #define INSERT_REBOOT_EVENT "INSERT INTO RebootEvent(NodeId, BootCount," \
                             "BootMultiplier, Timestamp, Sequence, EventType, DeviceId)"\
@@ -205,6 +206,10 @@
                             "NodeId=? "\
                             "WHERE NodeId=0"
 
+#define UPDATE_USAGE_ID "UPDATE DataUse SET " \
+                            "NodeId=? " \
+                            "WHERE NodeId=0"
+
 #define UPDATE_EVENT_TSTAMP "UPDATE NetworkEvent SET " \
                             "Timestamp = (Timestamp - ?) + ? "\
                             "WHERE Timestamp < ?"