fix(db): use INSERT ... ON CONFLICT instead of INSERT OR REPLACE for nodes table
INSERT OR REPLACE deletes the old row and inserts a new one, resetting unspecified columns (online, update_ts) to DEFAULT 0. This was wiping online=1 set by cs_on_peer_status_changed/member_sync_set_online. Replaced 5 INSERT OR REPLACE INTO nodes with INSERT INTO ... ON CONFLICT DO UPDATE SET — only updates the specified columns, preserving online status. Files: - chat_core.c:638 (invite flow) - chat_sync.c:1045 (CHANNEL_INFO_RESP), 1193 (JOIN), 1449 (PEER_UPSERT) - topo_node_sqlite.c:121 (BGP node_put)
This commit is contained in:
1 parent
da08c675c3
commit
b67fbf6f2f
3 files changed
+22
-6
No files matched your search
@@ -118,8 +118,12 @@ int topo_node_sqlite_node_put(sqlite3* db, struct TOPO_NODEQ* nq) {
|
||||
|
||||
sqlite3_stmt* stmt = NULL;
|
||||
if (sqlite3_prepare_v2(db,
|
||||
"INSERT OR REPLACE INTO nodes(node_id, name, x25519_pubkey, ed25519_pubkey, last_seen_at)"
|
||||
" VALUES(?,?,?,?,unixepoch())", -1, &stmt, NULL) == SQLITE_OK) {
|
||||
"INSERT INTO nodes(node_id, name, x25519_pubkey, ed25519_pubkey, last_seen_at)"
|
||||
" VALUES(?,?,?,?,unixepoch())"
|
||||
" ON CONFLICT(node_id) DO UPDATE SET"
|
||||
" name=excluded.name, x25519_pubkey=excluded.x25519_pubkey,"
|
||||
" ed25519_pubkey=excluded.ed25519_pubkey, last_seen_at=excluded.last_seen_at",
|
||||
-1, &stmt, NULL) == SQLITE_OK) {
|
||||
sqlite3_bind_int64(stmt, 1, (sqlite3_int64)ni->node_id);
|
||||
sqlite3_bind_text(stmt, 2, ni->node_name ? ni->node_name : "", -1, SQLITE_STATIC);
|
||||
sqlite3_bind_blob(stmt, 3, ni->public_key, 32, SQLITE_STATIC);
|
||||
|
||||
@@ -635,7 +635,7 @@ void chat_core_connect_from_invite(struct chat_invite* inv) {
|
||||
/* save pubkey to nodes table */
|
||||
sqlite3_stmt* st = NULL;
|
||||
if (sqlite3_prepare_v2(g_cc.db,
|
||||
"INSERT OR REPLACE INTO nodes(node_id, x25519_pubkey) VALUES(?,?)",
|
||||
"INSERT INTO nodes(node_id, x25519_pubkey) VALUES(?,?) ON CONFLICT(node_id) DO UPDATE SET x25519_pubkey=excluded.x25519_pubkey",
|
||||
-1, &st, NULL) == SQLITE_OK) {
|
||||
sqlite3_bind_int64(st, 1, (sqlite3_int64)node_id);
|
||||
sqlite3_bind_blob(st, 2, inv->pubkey, 32, SQLITE_STATIC);
|
||||
|
||||
@@ -1042,7 +1042,11 @@ static void cs_handle_channel_info_resp(struct chat_sync* cs, uint64_t peer,
|
||||
sqlite3* vdb = cs->inst->topo_sqlite_db;
|
||||
if (vdb && inv_name[0]) {
|
||||
sqlite3_stmt* ns = NULL;
|
||||
sqlite3_prepare_v2(vdb, "INSERT OR REPLACE INTO nodes(node_id,name,x25519_pubkey,ed25519_pubkey) VALUES(?,?,?,?)", -1, &ns, NULL);
|
||||
sqlite3_prepare_v2(vdb,
|
||||
"INSERT INTO nodes(node_id,name,x25519_pubkey,ed25519_pubkey) VALUES(?,?,?,?)"
|
||||
" ON CONFLICT(node_id) DO UPDATE SET"
|
||||
" name=excluded.name, x25519_pubkey=excluded.x25519_pubkey, ed25519_pubkey=excluded.ed25519_pubkey",
|
||||
-1, &ns, NULL);
|
||||
if (ns) { sqlite3_bind_int64(ns, 1, (sqlite3_int64)peer);
|
||||
sqlite3_bind_text(ns, 2, inv_name, -1, SQLITE_STATIC);
|
||||
sqlite3_bind_blob(ns, 3, inv_x25519, 32, SQLITE_STATIC);
|
||||
@@ -1190,7 +1194,11 @@ static void cs_handle_channel_join(struct chat_sync* cs, uint64_t peer,
|
||||
/* save joiner node_info to local DB */
|
||||
if (db && joiner_name[0]) {
|
||||
sqlite3_stmt* ns = NULL;
|
||||
sqlite3_prepare_v2(db, "INSERT OR REPLACE INTO nodes(node_id,name,x25519_pubkey,ed25519_pubkey) VALUES(?,?,?,?)", -1, &ns, NULL);
|
||||
sqlite3_prepare_v2(db,
|
||||
"INSERT INTO nodes(node_id,name,x25519_pubkey,ed25519_pubkey) VALUES(?,?,?,?)"
|
||||
" ON CONFLICT(node_id) DO UPDATE SET"
|
||||
" name=excluded.name, x25519_pubkey=excluded.x25519_pubkey, ed25519_pubkey=excluded.ed25519_pubkey",
|
||||
-1, &ns, NULL);
|
||||
if (ns) { sqlite3_bind_int64(ns, 1, (sqlite3_int64)node_id);
|
||||
sqlite3_bind_text(ns, 2, joiner_name, -1, SQLITE_STATIC);
|
||||
sqlite3_bind_blob(ns, 3, x25519, 32, SQLITE_STATIC);
|
||||
@@ -1446,7 +1454,11 @@ static void cs_handle_peer_upsert(struct chat_sync* cs, uint64_t peer,
|
||||
topo_node_sqlite_node_update_verified(db, node_id, peer_name, x25519, ed_pub, join_ts);
|
||||
if (db && peer_name[0]) {
|
||||
sqlite3_stmt* ns = NULL;
|
||||
sqlite3_prepare_v2(db, "INSERT OR REPLACE INTO nodes(node_id,name,x25519_pubkey,ed25519_pubkey) VALUES(?,?,?,?)", -1, &ns, NULL);
|
||||
sqlite3_prepare_v2(db,
|
||||
"INSERT INTO nodes(node_id,name,x25519_pubkey,ed25519_pubkey) VALUES(?,?,?,?)"
|
||||
" ON CONFLICT(node_id) DO UPDATE SET"
|
||||
" name=excluded.name, x25519_pubkey=excluded.x25519_pubkey, ed25519_pubkey=excluded.ed25519_pubkey",
|
||||
-1, &ns, NULL);
|
||||
if (ns) { sqlite3_bind_int64(ns, 1, (sqlite3_int64)node_id);
|
||||
sqlite3_bind_text(ns, 2, peer_name, -1, SQLITE_STATIC);
|
||||
sqlite3_bind_blob(ns, 3, x25519, 32, SQLITE_STATIC);
|
||||
|
||||
Reference in new issue
Block a user