Move the parallelized mapping outside db transaction

google · Nov 8, 2024 · ffed82a · ffed82a
1 parent 11ed6f0
commit ffed82a
Showing 1 changed file with 35 additions and 30 deletions.
diff --git a/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt b/engine/src/main/java/com/google/android/fhir/db/impl/DatabaseImpl.kt
@@ -229,49 +229,54 @@ internal class DatabaseImpl(
   override suspend fun <R : Resource> search(
     query: SearchQuery,
   ): List<ResourceWithUUID<R>> {
-    return db.withTransaction {
-      resourceDao.getResources(SimpleSQLiteQuery(query.query, query.args.toTypedArray())).pmap(
-        Dispatchers.Default,
-      ) {
-        ResourceWithUUID(
-          it.uuid,
-          FhirContext.forR4Cached().newJsonParser().parseResource(it.serializedResource) as R,
-        )
+    val dbResult =
+      db.withTransaction {
+        resourceDao.getResources(SimpleSQLiteQuery(query.query, query.args.toTypedArray()))
       }
+
+    return dbResult.pmap(
+      Dispatchers.Default,
+    ) {
+      ResourceWithUUID(
+        it.uuid,
+        FhirContext.forR4Cached().newJsonParser().parseResource(it.serializedResource) as R,
+      )
     }
   }
 
   override suspend fun searchForwardReferencedResources(
     query: SearchQuery,
   ): List<ForwardIncludeSearchResult> {
-    return db.withTransaction {
-      resourceDao
-        .getForwardReferencedResources(SimpleSQLiteQuery(query.query, query.args.toTypedArray()))
-        .pmap(Dispatchers.Default) {
-          ForwardIncludeSearchResult(
-            it.matchingIndex,
-            it.baseResourceUUID,
-            FhirContext.forR4Cached().newJsonParser().parseResource(it.serializedResource)
-              as Resource,
-          )
-        }
+    val dbResult =
+      db.withTransaction {
+        resourceDao.getForwardReferencedResources(
+          SimpleSQLiteQuery(query.query, query.args.toTypedArray()),
+        )
+      }
+    return dbResult.pmap(Dispatchers.Default) {
+      ForwardIncludeSearchResult(
+        it.matchingIndex,
+        it.baseResourceUUID,
+        FhirContext.forR4Cached().newJsonParser().parseResource(it.serializedResource) as Resource,
+      )
     }
   }
 
   override suspend fun searchReverseReferencedResources(
     query: SearchQuery,
   ): List<ReverseIncludeSearchResult> {
-    return db.withTransaction {
-      resourceDao
-        .getReverseReferencedResources(SimpleSQLiteQuery(query.query, query.args.toTypedArray()))
-        .pmap(Dispatchers.Default) {
-          ReverseIncludeSearchResult(
-            it.matchingIndex,
-            it.baseResourceTypeAndId,
-            FhirContext.forR4Cached().newJsonParser().parseResource(it.serializedResource)
-              as Resource,
-          )
-        }
+    val dbResult =
+      db.withTransaction {
+        resourceDao.getReverseReferencedResources(
+          SimpleSQLiteQuery(query.query, query.args.toTypedArray()),
+        )
+      }
+    return dbResult.pmap(Dispatchers.Default) {
+      ReverseIncludeSearchResult(
+        it.matchingIndex,
+        it.baseResourceTypeAndId,
+        FhirContext.forR4Cached().newJsonParser().parseResource(it.serializedResource) as Resource,
+      )
     }
   }