Skip to content

perf: move the hourly estate reconcile 45 minutes off the shared hourly tick #41

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
XxFran10xX merged 1 commit into from
Nov 6, 2026
Merged

perf: move the hourly estate reconcile 45 minutes off the shared hourly tick #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion src/main/java/net/tfminecraft/recycler/ownership/CharacterQueueEstate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,17 @@
public final class CharacterQueueEstate implements EstateParticipant {
private final Recycler plugin;
private final Map<UUID, Map.Entry<Long, Outcome>> reported = new java.util.HashMap<>();
static final long HOUR_TICKS = 72_000L;
/** 45 minutes: keeps the hourly pass off the tick other plugins' hourly jobs share (enable + 1 h). */
static final long HOURLY_OFFSET_TICKS = 54_000L;
public CharacterQueueEstate(Recycler plugin) { this.plugin = plugin; }
public static void start(Recycler plugin) {
CharacterQueueEstate participant = new CharacterQueueEstate(plugin);
plugin.getServer().getServicesManager().register(EstateParticipant.class, participant, plugin, ServicePriority.Normal);
plugin.getServer().getScheduler().runTaskTimer(plugin, participant::reconcile, 1L, 72_000L);
var scheduler = plugin.getServer().getScheduler();
// Boot pass on the first tick as before; the hourly passes then run 45 minutes later than they did.
scheduler.runTaskLater(plugin, participant::reconcile, 1L);
scheduler.runTaskTimer(plugin, participant::reconcile, 1L + HOUR_TICKS + HOURLY_OFFSET_TICKS, HOUR_TICKS);
}
public String id() { return "recycler"; }
public Outcome settle(EstateDecision decision) {
Expand Down
6 changes: 5 additions & 1 deletion src/test/java/net/tfminecraft/recycler/ownership/QueueEstateTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ class QueueEstateTest {
}
var server=mock(org.bukkit.Server.class);var services=mock(org.bukkit.plugin.ServicesManager.class);var scheduler=mock(org.bukkit.scheduler.BukkitScheduler.class);
when(plugin.getServer()).thenReturn(server);when(server.getServicesManager()).thenReturn(services);when(server.getScheduler()).thenReturn(scheduler);
QueueEstate.start(plugin);verify(services).register(eq(EstateParticipant.class),any(CharacterQueueEstate.class),eq(plugin),eq(org.bukkit.plugin.ServicePriority.Normal));verify(scheduler).runTaskTimer(eq(plugin),any(Runnable.class),eq(1L),eq(72_000L));
QueueEstate.start(plugin);verify(services).register(eq(EstateParticipant.class),any(CharacterQueueEstate.class),eq(plugin),eq(org.bukkit.plugin.ServicePriority.Normal));
// Boot pass on the first tick; hourly passes 45 minutes off the enable + 1 h tick other plugins use.
var boot=org.mockito.ArgumentCaptor.forClass(Runnable.class);var hourly=org.mockito.ArgumentCaptor.forClass(Runnable.class);
verify(scheduler).runTaskLater(eq(plugin),boot.capture(),eq(1L));verify(scheduler).runTaskTimer(eq(plugin),hourly.capture(),eq(1L+72_000L+54_000L),eq(72_000L));verifyNoMoreInteractions(scheduler);
try(var estates=mockStatic(Estates.class)){boot.getValue().run();hourly.getValue().run();estates.verify(Estates::decided,times(2));}
}
}
Loading