HSEARCH-4228 Use id as a second key to order events

This will mitigate (but not completely solve) the issue of having a low moment time resolution
hibernate · Jul 22, 2021 · 136d8ae · 136d8ae
1 parent 4e5e0ec
commit 136d8ae
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...egrationtest/mapper/orm/automaticindexing/strategy/outbox/FilteringOutboxEventFinder.java b/...egrationtest/mapper/orm/automaticindexing/strategy/outbox/FilteringOutboxEventFinder.java
@@ -37,7 +37,7 @@ public synchronized List<OutboxEvent> findOutboxEvents(Session session, int maxR
 		}
 
 		Query<OutboxEvent> query = session.createQuery(
-				"select e from OutboxEvent e where e.id in :ids order by e.moment", OutboxEvent.class );
+				"select e from OutboxEvent e where e.id in :ids order by e.moment, e.id", OutboxEvent.class );
 		query.setMaxResults( maxResults );
 		query.setParameter( "ids", allowedIds );
 		List<OutboxEvent> returned = query.list();
@@ -73,7 +73,7 @@ public synchronized void hideAllEvents() {
 	public List<OutboxEvent> findOutboxEventsNoFilter(Session session) {
 		checkFiltering();
 		Query<OutboxEvent> query = session.createQuery(
-				"select e from OutboxEvent e order by e.moment", OutboxEvent.class );
+				"select e from OutboxEvent e order by e.moment, e.id", OutboxEvent.class );
 		return query.list();
 	}
 
@@ -87,7 +87,7 @@ public List<OutboxEvent> findOutboxEventsNoFilterById(Session session) {
 	public List<Long> findOutboxEventIdsNoFilter(Session session) {
 		checkFiltering();
 		Query<Long> query = session.createQuery(
-				"select e.id from OutboxEvent e order by e.moment", Long.class );
+				"select e.id from OutboxEvent e order by e.moment, e.id", Long.class );
 		return query.list();
 	}
 

diff --git a/...m/src/main/java/org/hibernate/search/mapper/orm/outbox/impl/DefaultOutboxEventFinder.java b/...m/src/main/java/org/hibernate/search/mapper/orm/outbox/impl/DefaultOutboxEventFinder.java
@@ -15,7 +15,7 @@ public final class DefaultOutboxEventFinder implements OutboxEventFinder {
 	@Override
 	public List<OutboxEvent> findOutboxEvents(Session session, int maxResults) {
 		Query<OutboxEvent> query = session.createQuery(
-				"select e from OutboxEvent e order by e.moment", OutboxEvent.class );
+				"select e from OutboxEvent e order by e.moment, e.id", OutboxEvent.class );
 		query.setMaxResults( maxResults );
 		return query.list();
 	}