Skip to content

perf(render): cache stable ray proxy identities #117

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
Arbousier1 merged 3 commits into from
Jul 20, 2026
Merged

perf(render): cache stable ray proxy identities #117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
774d0a9
perf(render): cache stable ray proxy identities
Arbousier1 Jul 19, 2026
14c879c
perf(render): bypass redundant viewer lookups
Arbousier1 Jul 19, 2026
ef9ec5e
perf(render): isolate the viewer lookup fast path
Arbousier1 Jul 19, 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: 11 additions & 17 deletions src/main/java/top/ellan/mahjong/table/render/SparrowRayInteractionProxyCoordinator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,23 +75,21 @@ synchronized void replace(
if (viewerId == null || interactions == null || interactions.isEmpty()) {
continue;
}
Player viewer = this.session.onlinePlayer(viewerId);
if (viewer == null || !viewer.isOnline()) {
continue;
}
ActiveProxies current = previous.get(viewerId);
if (this.canReuse(viewerId, viewer, current, interactions)) {
if (current != null
&& current.viewer().isOnline()
&& this.canReuse(viewerId, current, interactions)) {
next.put(viewerId, current);
continue;
}
Player viewer = this.session.onlinePlayer(viewerId);
if (viewer == null || !viewer.isOnline()) {
continue;
}
List<InteractionGeometry> geometry = interactionGeometry(interactions);
List<ClientProxy> proxies = this.backend.create(viewer, interactions);
if (!proxies.isEmpty()) {
ActiveProxies created = new ActiveProxies(
viewer,
List.copyOf(proxies),
geometry
);
ActiveProxies created = new ActiveProxies(viewer, List.copyOf(proxies), geometry);
next.put(viewerId, created);
pendingSpawns.add(new PendingSpawn(viewerId, created));
}
Expand Down Expand Up @@ -147,12 +145,10 @@ private boolean canReuseRegion(
if (viewerId == null || interactions == null || interactions.isEmpty()) {
continue;
}
Player viewer = this.session.onlinePlayer(viewerId);
if (viewer == null || !viewer.isOnline()) {
continue;
}
ActiveProxies active = previous.get(viewerId);
if (!this.canReuse(viewerId, viewer, active, interactions)) {
if (active == null
|| !active.viewer().isOnline()
|| !this.canReuse(viewerId, active, interactions)) {
return false;
}
reusableViewers++;
Expand All @@ -162,12 +158,10 @@ private boolean canReuseRegion(

private boolean canReuse(
UUID viewerId,
Player viewer,
ActiveProxies active,
List<DisplayInteractionRayRegistry.RayInteraction> interactions
) {
if (active == null
|| active.viewer() != viewer
|| !sameGeometry(active.geometry(), interactions)
|| active.proxies().isEmpty()) {
return false;
Expand Down
52 changes: 51 additions & 1 deletion src/test/java/top/ellan/mahjong/table/render/SparrowRayInteractionProxyCoordinatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ void clearedViewerOwnershipMakesAnUnchangedRegionStaleForReconnect() {
}

@Test
void unchangedGeometryReusesClientProxyWithoutMorePackets() {
void unchangedGeometryReusesClientProxyWithoutMorePacketsOrViewerLookups() {
TableSessionContext session = mock(TableSessionContext.class);
SparrowRayInteractionProxyCoordinator.Backend backend = mock(
SparrowRayInteractionProxyCoordinator.Backend.class
Expand Down Expand Up @@ -153,6 +153,56 @@ void unchangedGeometryReusesClientProxyWithoutMorePackets() {
verify(backend, times(1)).create(eq(viewer), any());
verify(backend, times(1)).spawn(viewer, List.of(proxy));
verify(backend, never()).destroy(viewer, List.of(proxy));
verify(session, times(1)).onlinePlayer(VIEWER_ID);
assertEquals(1, coordinator.entityCount());
}

@Test
void offlineCachedViewerUsesFreshSessionPlayer() {
TableSessionContext session = mock(TableSessionContext.class);
SparrowRayInteractionProxyCoordinator.Backend backend = mock(
SparrowRayInteractionProxyCoordinator.Backend.class
);
SparrowRayInteractionProxyCoordinator.ClientProxy firstProxy = mock(
SparrowRayInteractionProxyCoordinator.ClientProxy.class
);
SparrowRayInteractionProxyCoordinator.ClientProxy reconnectedProxy = mock(
SparrowRayInteractionProxyCoordinator.ClientProxy.class
);
Player firstViewer = mock(Player.class);
Player reconnectedViewer = mock(Player.class);
when(session.id()).thenReturn("table-a");
when(session.onlinePlayer(VIEWER_ID)).thenReturn(firstViewer).thenReturn(reconnectedViewer);
when(firstViewer.isOnline()).thenReturn(true);
when(reconnectedViewer.isOnline()).thenReturn(true);
when(backend.available()).thenReturn(true);
when(backend.create(eq(firstViewer), any())).thenReturn(List.of(firstProxy));
when(backend.create(eq(reconnectedViewer), any())).thenReturn(List.of(reconnectedProxy));
when(firstProxy.entityId()).thenReturn(1205);
when(reconnectedProxy.entityId()).thenReturn(1206);
doAnswer(invocation -> {
invocation.<Runnable>getArgument(1).run();
return null;
}).when(session).runForViewer(any(Player.class), any(Runnable.class));
SparrowRayInteractionProxyCoordinator coordinator = new SparrowRayInteractionProxyCoordinator(
session,
backend
);
Map<UUID, List<DisplayInteractionRayRegistry.RayInteraction>> interactions = Map.of(
VIEWER_ID,
List.of(interaction())
);

coordinator.replace("actions", interactions);
when(firstViewer.isOnline()).thenReturn(false);
coordinator.replace("actions", interactions);

verify(backend).spawn(firstViewer, List.of(firstProxy));
verify(backend).spawn(reconnectedViewer, List.of(reconnectedProxy));
verify(backend, never()).destroy(firstViewer, List.of(firstProxy));
verify(session, times(2)).onlinePlayer(VIEWER_ID);
assertNull(ClientInteractionProxyRegistry.tableIdFor(1205, VIEWER_ID));
assertEquals("table-a", ClientInteractionProxyRegistry.tableIdFor(1206, VIEWER_ID));
assertEquals(1, coordinator.entityCount());
}

Expand Down
Loading