From 790740cd5687a27e8d4059723c3217db0ee9e899b3107806e6f511d80aede8dc Mon Sep 17 00:00:00 2001 From: AidarKC Date: Sat, 21 Nov 2026 19:57:13 +0300 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BE=D1=81=D1=81=D1=82=D0=B0=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D0=B8=D1=82=D1=8C=20=D1=81=D0=BE=D0=BE=D0=B1=D1=89?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B4=D1=83=D0=B1=D0=BB=D0=B8=D1=80?= =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BA=D0=B0?= =?UTF-8?q?=D0=BD=D0=B0=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shine/db/dao/ChannelNameStateDAO.java | 16 ++++++ .../ChannelNamesStateBootstrapper.java | 52 +++++++++++++++---- VERSION.properties | 2 +- 3 files changed, 58 insertions(+), 12 deletions(-) diff --git a/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/ChannelNameStateDAO.java b/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/ChannelNameStateDAO.java index 802a19af..28025fef 100644 --- a/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/ChannelNameStateDAO.java +++ b/SHiNE-server/shine-server-db/src/main/java/shine/db/dao/ChannelNameStateDAO.java @@ -71,6 +71,22 @@ public final class ChannelNameStateDAO { ava_size, meta_updated_at_ms ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?) + ON CONFLICT (owner_bch_name, channel_type_code, slug) DO UPDATE SET + display_name = EXCLUDED.display_name, + channel_description = EXCLUDED.channel_description, + owner_login = EXCLUDED.owner_login, + channel_type_version = EXCLUDED.channel_type_version, + channel_root_block_number = EXCLUDED.channel_root_block_number, + channel_root_block_hash = EXCLUDED.channel_root_block_hash, + created_at_ms = EXCLUDED.created_at_ms, + ava_ar = EXCLUDED.ava_ar, + ava_pr = EXCLUDED.ava_pr, + ava_size = EXCLUDED.ava_size, + meta_updated_at_ms = EXCLUDED.meta_updated_at_ms, + is_deleted = FALSE, + deleted_at_ms = 0, + deleted_block_number = NULL + WHERE EXCLUDED.channel_root_block_number > channel_names_state.channel_root_block_number """; try (PreparedStatement ps = c.prepareStatement(sql)) { ps.setString(1, entry.getSlug()); diff --git a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelNamesStateBootstrapper.java b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelNamesStateBootstrapper.java index fdfdbf14..5e43d5d1 100644 --- a/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelNamesStateBootstrapper.java +++ b/SHiNE-server/shine-server-net-protocol/src/main/java/server/logic/ws_protocol/JSON/handlers/channels/ChannelNamesStateBootstrapper.java @@ -41,7 +41,8 @@ public final class ChannelNamesStateBootstrapper { private static void rebuildFromBlocksOrThrow() { ChannelNameStateDAO dao = ChannelNameStateDAO.getInstance(); List entries = new ArrayList<>(); - Map slugToIdentity = new LinkedHashMap<>(); + Map entriesByOwnerTypeSlug = new LinkedHashMap<>(); + Map replacedRoots = new LinkedHashMap<>(); List conflicts = new ArrayList<>(); List skipped = new ArrayList<>(); @@ -108,14 +109,6 @@ public final class ChannelNamesStateBootstrapper { continue; } - String identity = ownerBch + "#" + blockNumber; - String ownerTypeSlug = ownerLogin.toLowerCase(Locale.ROOT) + "|" + channelTypeCode + "|" + slug; - String existing = slugToIdentity.putIfAbsent(ownerTypeSlug, identity); - if (existing != null && !existing.equals(identity)) { - conflicts.add("owner/type/slug=\"" + ownerTypeSlug + "\" conflicts: " + existing + " vs " + identity); - continue; - } - ChannelNameStateEntry entry = new ChannelNameStateEntry(); entry.setSlug(slug); entry.setDisplayName(displayName); @@ -131,13 +124,23 @@ public final class ChannelNamesStateBootstrapper { entry.setChannelRootBlockNumber(blockNumber); entry.setChannelRootBlockHash(blockHash); entry.setCreatedAtMs(parsed.timestamp * 1000L); - entries.add(entry); + String ownerTypeSlug = ownerLogin.toLowerCase(Locale.ROOT) + "|" + channelTypeCode + "|" + slug; + ChannelNameStateEntry previous = entriesByOwnerTypeSlug.put(ownerTypeSlug, entry); + if (previous != null) { + replacedRoots.put(new ChannelRoot(previous.getOwnerBlockchainName(), previous.getChannelRootBlockNumber(), previous.getChannelRootBlockHash()), entry); + conflicts.add("owner/type/slug=\"" + ownerTypeSlug + "\" conflicts: " + + previous.getOwnerBlockchainName() + "#" + previous.getChannelRootBlockNumber() + + " vs " + ownerBch + "#" + blockNumber + "; kept newest root"); + } } } } + entries.addAll(entriesByOwnerTypeSlug.values()); + dao.clearAll(c); dao.insertAll(c, entries); + redirectFollowedChannelRoots(c, replacedRoots); applyMetaUpdates(c, dao, entries, skipped); applyDeletionStates(c, dao, skipped); @@ -155,7 +158,7 @@ public final class ChannelNamesStateBootstrapper { c.commit(); log.info("channel_names_state bootstrapped: {}", entries.size()); if (!conflicts.isEmpty()) { - log.warn("channel_names_state bootstrap detected {} slug conflicts (kept first occurrence)", conflicts.size()); + log.warn("channel_names_state bootstrap detected {} slug conflicts (kept newest root)", conflicts.size()); int preview = Math.min(conflicts.size(), 10); for (int i = 0; i < preview; i++) { log.warn("channel_names_state conflict: {}", conflicts.get(i)); @@ -185,6 +188,31 @@ public final class ChannelNamesStateBootstrapper { } } + /** Connections are a mutable projection. Keep follows on the current root when a legacy duplicate is replaced. */ + private static void redirectFollowedChannelRoots(Connection c, + Map replacedRoots) throws Exception { + String sql = """ + UPDATE connections_state + SET to_block_number = ?, to_block_hash = ? + WHERE LOWER(to_login) = LOWER(?) + AND to_block_number = ? + AND to_block_hash = ? + """; + try (PreparedStatement ps = c.prepareStatement(sql)) { + for (Map.Entry replacement : replacedRoots.entrySet()) { + ChannelRoot oldRoot = replacement.getKey(); + ChannelNameStateEntry current = replacement.getValue(); + ps.setInt(1, current.getChannelRootBlockNumber()); + ps.setBytes(2, current.getChannelRootBlockHash()); + ps.setString(3, current.getOwnerLogin()); + ps.setInt(4, oldRoot.blockNumber()); + ps.setBytes(5, oldRoot.blockHash()); + ps.addBatch(); + } + ps.executeBatch(); + } + } + private static void applyDeletionStates(Connection c, ChannelNameStateDAO dao, List skipped) throws Exception { String sql = """ SELECT bch_name, block_number, block_bytes, msg_sub_type @@ -219,6 +247,8 @@ public final class ChannelNamesStateBootstrapper { } } + private record ChannelRoot(String ownerBlockchainName, int blockNumber, byte[] blockHash) {} + private static void applyMetaUpdates(Connection c, ChannelNameStateDAO dao, List entries, diff --git a/VERSION.properties b/VERSION.properties index 89c07a16..b1920bff 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ client.version=1.20.67 -server.version=1.16.34 +server.version=1.16.36