Skip to content

perf(render): reuse serialized viewer ids #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TypeThe0ry merged 2 commits into from
Jul 16, 2026
Merged

perf(render): reuse serialized viewer ids #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46b486b
perf(render): reuse serialized viewer ids
Arbousier1 Jul 16, 2026
cf0d497
style(render): satisfy Kotlin formatting gate
Arbousier1 Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions src/main/java/top/ellan/mahjong/table/render/TableRenderSnapshotFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import top.ellan.mahjong.render.TableRenderSubject;
import top.ellan.mahjong.render.snapshot.TableRenderSnapshot;
import top.ellan.mahjong.render.snapshot.TableSeatRenderSnapshot;
import java.util.Comparator;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.HashSet;
Expand All @@ -12,24 +13,31 @@
import java.util.Objects;
import java.util.Set;
import java.util.UUID;
import java.util.Comparator;
import org.bukkit.Location;
import org.bukkit.entity.Player;

public final class TableRenderSnapshotFactory {
public TableRenderSnapshot create(TableRenderSubject session, long version, long cancellationNonce) {
Location tableCenter = session.center();
boolean started = session.isStarted();
List<UUID> onlineViewerIds = session.viewers().stream()
List<SerializedViewerId> serializedOnlineViewerIds = session.viewers().stream()
.map(Player::getUniqueId)
.distinct()
.sorted(Comparator.comparing(UUID::toString))
.map(viewerId -> new SerializedViewerId(viewerId, viewerId.toString()))
.sorted(Comparator.comparing(SerializedViewerId::serializedId))
.toList();
List<UUID> onlineViewerIds = serializedOnlineViewerIds.stream()
.map(SerializedViewerId::id)
.toList();
Set<UUID> onlineViewerIdSet = new HashSet<>(onlineViewerIds);
Map<UUID, String> viewerMembershipSignatures = new HashMap<>();
Map<UUID, List<UUID>> viewerIdsExcluding = new HashMap<>();
for (UUID viewerId : onlineViewerIds) {
viewerMembershipSignatures.put(viewerId, this.viewerMembershipSignature(onlineViewerIds, viewerId));
for (SerializedViewerId viewer : serializedOnlineViewerIds) {
UUID viewerId = viewer.id();
viewerMembershipSignatures.put(
viewerId,
this.viewerMembershipSignature(serializedOnlineViewerIds, viewerId)
);
viewerIdsExcluding.put(viewerId, this.viewerIdsExcluding(onlineViewerIds, viewerId));
}
EnumMap<SeatWind, TableSeatRenderSnapshot> seats = new EnumMap<>(SeatWind.class);
Expand Down Expand Up @@ -130,11 +138,11 @@ private TableSeatRenderSnapshot captureSeatSnapshot(
);
}

private String viewerMembershipSignature(List<UUID> onlineViewerIds, UUID excludedPlayerId) {
private String viewerMembershipSignature(List<SerializedViewerId> onlineViewerIds, UUID excludedPlayerId) {
StringBuilder builder = new StringBuilder(onlineViewerIds.size() * 36);
for (UUID viewerId : onlineViewerIds) {
if (!viewerId.equals(excludedPlayerId)) {
builder.append(viewerId);
for (SerializedViewerId viewer : onlineViewerIds) {
if (!viewer.id().equals(excludedPlayerId)) {
builder.append(viewer.serializedId());
}
}
return builder.toString();
Expand All @@ -145,4 +153,6 @@ private List<UUID> viewerIdsExcluding(List<UUID> onlineViewerIds, UUID excludedP
.filter(viewerId -> !viewerId.equals(excludedPlayerId))
.toList();
}

private record SerializedViewerId(UUID id, String serializedId) {}
}
60 changes: 46 additions & 14 deletions src/test/kotlin/top/ellan/mahjong/table/render/TableRenderSnapshotFactoryTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
package top.ellan.mahjong.table.render

import top.ellan.mahjong.model.SeatWind
import top.ellan.mahjong.render.scene.MeldView
import top.ellan.mahjong.table.core.MahjongTableSession
import org.bukkit.Location
import org.bukkit.entity.Player
import org.mockito.ArgumentMatchers
Expand All @@ -11,26 +8,39 @@ import org.mockito.Mockito.mock
import org.mockito.Mockito.never
import org.mockito.Mockito.verify
import org.mockito.Mockito.`when`
import top.ellan.mahjong.model.SeatWind
import top.ellan.mahjong.render.scene.MeldView
import top.ellan.mahjong.table.core.MahjongTableSession
import java.util.UUID
import kotlin.test.Test
import kotlin.test.assertEquals
import kotlin.test.assertTrue

class TableRenderSnapshotFactoryTest {
@Test
fun `render snapshot reuses precomputed online viewers`() {
fun `render snapshot preserves serialized viewer ordering and membership`() {
val session = mock(MahjongTableSession::class.java)
val factory = TableRenderSnapshotFactory()

val eastId = UUID.fromString("00000000-0000-0000-0000-000000000011")
val southId = UUID.fromString("00000000-0000-0000-0000-000000000012")
val southId = UUID.fromString("80000000-0000-0000-0000-000000000012")
val westId = UUID.fromString("7fffffff-ffff-ffff-ffff-ffffffffffff")
val northId = UUID.fromString("00000000-0000-0000-0000-000000000014")
val eastViewer = mock(Player::class.java)
val duplicateEastViewer = mock(Player::class.java)
val southViewer = mock(Player::class.java)
val westViewer = mock(Player::class.java)

assertTrue(southId.compareTo(eastId) < 0)
assertTrue(southId.toString().compareTo(eastId.toString()) > 0)
`when`(eastViewer.uniqueId).thenReturn(eastId)
`when`(duplicateEastViewer.uniqueId).thenReturn(eastId)
`when`(southViewer.uniqueId).thenReturn(southId)
`when`(westViewer.uniqueId).thenReturn(westId)
`when`(session.center()).thenReturn(Location(null, 0.0, 64.0, 0.0))
`when`(session.viewers()).thenReturn(listOf(eastViewer, southViewer))
`when`(session.viewers()).thenReturn(
listOf(southViewer, westViewer, duplicateEastViewer, eastViewer),
)
`when`(session.isStarted()).thenReturn(false)
`when`(session.isRoundFinished()).thenReturn(false)
`when`(session.remainingWallCount()).thenReturn(0)
Expand All @@ -49,8 +59,8 @@ class TableRenderSnapshotFactoryTest {
`when`(session.doraIndicators()).thenReturn(emptyList())
`when`(session.playerAt(SeatWind.EAST)).thenReturn(eastId)
`when`(session.playerAt(SeatWind.SOUTH)).thenReturn(southId)
`when`(session.playerAt(SeatWind.WEST)).thenReturn(null)
`when`(session.playerAt(SeatWind.NORTH)).thenReturn(null)
`when`(session.playerAt(SeatWind.WEST)).thenReturn(westId)
`when`(session.playerAt(SeatWind.NORTH)).thenReturn(northId)

doAnswer { invocation ->
(invocation.arguments[0] as UUID?)?.toString() ?: ""
Expand All @@ -61,7 +71,7 @@ class TableRenderSnapshotFactoryTest {
`when`(session.stickLayoutCount(wind)).thenReturn(0)
`when`(session.cornerSticks(wind)).thenReturn(emptyList())
}
for (playerId in listOf(eastId, southId)) {
for (playerId in listOf(eastId, southId, westId, northId)) {
`when`(session.points(playerId)).thenReturn(25000)
`when`(session.isRiichi(playerId)).thenReturn(false)
`when`(session.isReady(playerId)).thenReturn(false)
Expand All @@ -77,13 +87,30 @@ class TableRenderSnapshotFactoryTest {
val snapshot = factory.create(session, 1L, 0L)
val eastSeat = snapshot.seat(SeatWind.EAST)
val southSeat = snapshot.seat(SeatWind.SOUTH)
val westSeat = snapshot.seat(SeatWind.WEST)
val northSeat = snapshot.seat(SeatWind.NORTH)

assertTrue(eastSeat.online())
assertTrue(southSeat.online())
assertEquals(listOf(southId), eastSeat.viewerIdsExcluding())
assertEquals(listOf(eastId), southSeat.viewerIdsExcluding())
assertEquals(southId.toString(), eastSeat.viewerMembershipSignature())
assertEquals(eastId.toString(), southSeat.viewerMembershipSignature())
assertTrue(westSeat.online())
assertTrue(!northSeat.online())
assertEquals(listOf(westId, southId), eastSeat.viewerIdsExcluding())
assertEquals(listOf(eastId, westId), southSeat.viewerIdsExcluding())
assertEquals(listOf(eastId, southId), westSeat.viewerIdsExcluding())
assertTrue(northSeat.viewerIdsExcluding().isEmpty())
assertEquals(
"7fffffff-ffff-ffff-ffff-ffffffffffff80000000-0000-0000-0000-000000000012",
eastSeat.viewerMembershipSignature(),
)
assertEquals(
"00000000-0000-0000-0000-0000000000117fffffff-ffff-ffff-ffff-ffffffffffff",
southSeat.viewerMembershipSignature(),
)
assertEquals(
"00000000-0000-0000-0000-00000000001180000000-0000-0000-0000-000000000012",
westSeat.viewerMembershipSignature(),
)
assertTrue(northSeat.viewerMembershipSignature().isEmpty())

verify(session, never()).onlinePlayer(ArgumentMatchers.any(UUID::class.java))
verify(session, never()).viewerIdsExcluding(ArgumentMatchers.any(UUID::class.java))
Expand Down Expand Up @@ -123,7 +150,12 @@ class TableRenderSnapshotFactoryTest {
val snapshot = factory.create(session, 1L, 0L)

assertTrue(snapshot.doraIndicators().isEmpty())
for (wind in SeatWind.values()) {
val seat = snapshot.seat(wind)
assertTrue(!seat.online())
assertTrue(seat.viewerIdsExcluding().isEmpty())
assertTrue(seat.viewerMembershipSignature().isEmpty())
}
verify(session, never()).doraIndicators()
}
}

Loading