From 50186fdaca4ccf9cf4f297d0209c83152696fc96 Mon Sep 17 00:00:00 2001 From: Sankalpa Sarkar Date: Mon, 23 Feb 2026 20:52:12 +0530 Subject: [PATCH 1/2] O3-5445 AbstractBaseQueueDaoImpl#get(String uuid) executes duplicate SQL query on every UUID lookup --- .../module/queue/api/dao/impl/AbstractBaseQueueDaoImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/org/openmrs/module/queue/api/dao/impl/AbstractBaseQueueDaoImpl.java b/api/src/main/java/org/openmrs/module/queue/api/dao/impl/AbstractBaseQueueDaoImpl.java index a5319a09..71e5f14b 100644 --- a/api/src/main/java/org/openmrs/module/queue/api/dao/impl/AbstractBaseQueueDaoImpl.java +++ b/api/src/main/java/org/openmrs/module/queue/api/dao/impl/AbstractBaseQueueDaoImpl.java @@ -60,8 +60,8 @@ public Optional get(int id) { public Optional get(@NotNull String uuid) { Criteria criteria = getCurrentSession().createCriteria(getClazz()); includeVoidedObjects(criteria, false); - criteria.add(eq("uuid", uuid)).uniqueResult(); - return Optional.ofNullable((Q) criteria.add(eq("uuid", uuid)).uniqueResult()); + criteria.add(eq("uuid", uuid)); + return Optional.ofNullable((Q) criteria.uniqueResult()); } @Override From ce81c6782664e54a8b76231667dbcf9b135a0aad Mon Sep 17 00:00:00 2001 From: Sankalpa Sarkar Date: Mon, 23 Feb 2026 20:52:12 +0530 Subject: [PATCH 2/2] O3-5445 AbstractBaseQueueDaoImpl#get(String uuid) executes duplicate SQL query on every UUID lookup --- .../module/queue/api/dao/impl/AbstractBaseQueueDaoImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/org/openmrs/module/queue/api/dao/impl/AbstractBaseQueueDaoImpl.java b/api/src/main/java/org/openmrs/module/queue/api/dao/impl/AbstractBaseQueueDaoImpl.java index a5319a09..71e5f14b 100644 --- a/api/src/main/java/org/openmrs/module/queue/api/dao/impl/AbstractBaseQueueDaoImpl.java +++ b/api/src/main/java/org/openmrs/module/queue/api/dao/impl/AbstractBaseQueueDaoImpl.java @@ -60,8 +60,8 @@ public Optional get(int id) { public Optional get(@NotNull String uuid) { Criteria criteria = getCurrentSession().createCriteria(getClazz()); includeVoidedObjects(criteria, false); - criteria.add(eq("uuid", uuid)).uniqueResult(); - return Optional.ofNullable((Q) criteria.add(eq("uuid", uuid)).uniqueResult()); + criteria.add(eq("uuid", uuid)); + return Optional.ofNullable((Q) criteria.uniqueResult()); } @Override