Merge pull request #144 from sbesson/image_format_fetch

Use left outer join fetch when retrieving the image.format
glencoesoftware · May 20, 2024 · 42f3845 · 42f3845
2 parents 9bba457 + 3eba52f
commit 42f3845
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/build.gradle b/build.gradle
@@ -62,7 +62,7 @@ dependencies {
     implementation 'io.zipkin.reporter2:zipkin-sender-okhttp3:2.10.0'
     implementation 'ch.qos.logback:logback-classic:1.3.14'
     implementation 'org.slf4j:log4j-over-slf4j:1.7.32'
-    implementation 'com.glencoesoftware.omero:omero-zarr-pixel-buffer:0.4.0'
+    implementation 'com.glencoesoftware.omero:omero-zarr-pixel-buffer:0.4.1'
     implementation 'com.glencoesoftware.omero:omero-ms-core:0.9.0'
     implementation 'io.vertx:vertx-web:3.8.1'
     implementation 'io.vertx:vertx-config:3.8.1'

diff --git a/src/main/java/com/glencoesoftware/omero/ms/image/region/ImageDataRequestHandler.java b/src/main/java/com/glencoesoftware/omero/ms/image/region/ImageDataRequestHandler.java
@@ -629,7 +629,7 @@ protected Image queryImageData(IQueryPrx iQuery, Long imageId)
                     .findByQuery("select i from Image as i"
                             + " left outer join fetch i.details.externalInfo "
                             + " join fetch i.pixels as p"
-                            + " join fetch i.format"
+                            + " left outer join fetch i.format"
                             + " left outer JOIN FETCH i.datasetLinks as links "
                             + " left outer join fetch links.parent as dataset "
                             + " left outer join fetch dataset.projectLinks as plinks "

diff --git a/src/main/java/com/glencoesoftware/omero/ms/image/region/ImageRegionRequestHandler.java b/src/main/java/com/glencoesoftware/omero/ms/image/region/ImageRegionRequestHandler.java
@@ -152,7 +152,7 @@ protected Map<Long, Pixels> retrievePixDescription(
                     iQuery.findAllByQuery(
                         "select p from Pixels as p "
                         + "join fetch p.image as i "
-                        + "join fetch i.format "
+                        + "left outer join fetch i.format "
                         + "left outer join fetch i.details.externalInfo "
                         + "left outer join fetch i.wellSamples as ws "
                         + "left outer join fetch ws.well as w "