Skip to content

disjoint prefetch returns incorrect data [failing tests] #624

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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

disjoint prefetch returns incorrect data [failing tests] #624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff9449f
Fix NPE in ConcurrentLinkedHashMap
johnthuss Oct 3, 2022
a35c7d5
disjoint and disjointById prefetches over 2 hops with both hops prefe…
johnthuss Oct 17, 2024
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
1 change: 1 addition & 0 deletions ...rc/main/java/org/apache/cayenne/util/concurrentlinkedhashmap/ConcurrentLinkedHashMap.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,6 +788,7 @@ else if (onlyIfAbsent) {

@Override
public V remove(Object key) {
if (key == null) return null; // this class does allow null to be used as a key or value (returning here prevents an NPE).
final Node node = data.remove(key);
if (node == null) {
return null;
Expand Down
63 changes: 63 additions & 0 deletions cayenne/src/test/java/org/apache/cayenne/access/DataContextPrefetchMultistepIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.apache.cayenne.query.ObjectSelect;
import org.apache.cayenne.test.jdbc.DBHelper;
import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.testmap.Artist;
import org.apache.cayenne.testdo.testmap.ArtistExhibit;
import org.apache.cayenne.testdo.testmap.Exhibit;
import org.apache.cayenne.testdo.testmap.Gallery;
Expand Down Expand Up @@ -286,4 +287,66 @@ public void testToManyToOne_EmptyToMany_NoRootQualifier() throws Exception {
assertFalse(((ValueHolder) exhibits).isFault());
assertEquals(0, exhibits.size());
}

private Gallery createArtistWithPaintingInGallery() {
Artist artist = context.newObject(Artist.class);
artist.setArtistName("Picasso");

Painting painting = context.newObject(Painting.class);
painting.setPaintingTitle("Guernica");
artist.addToPaintingArray(painting);

Gallery gallery = context.newObject(Gallery.class);
gallery.setGalleryName("MOMA");
painting.setToGallery(gallery);

context.commitChanges();
return gallery;
}

@Test
public void testPrefetchAcross2RelationshipsKeepingBoth_Joint() {
Gallery gallery = createArtistWithPaintingInGallery();

assertNotNull(gallery.getPaintingArray().get(0).getToArtist());

// Prefetch the artist through the two relationships
ObjectSelect.query(Gallery.class)
.prefetch(Gallery.PAINTING_ARRAY.joint())
.prefetch(Gallery.PAINTING_ARRAY.dot(Painting.TO_ARTIST).joint())
.select(context);

assertNotNull(gallery.getPaintingArray().get(0).getToArtist());
}

@Test
public void testPrefetchAcross2RelationshipsKeepingBoth_Disjoint() {
Gallery gallery = createArtistWithPaintingInGallery();

assertNotNull(gallery.getPaintingArray().get(0).getToArtist());

// Prefetch the artist through the two relationships
ObjectSelect.query(Gallery.class)
.prefetch(Gallery.PAINTING_ARRAY.joint())
.prefetch(Gallery.PAINTING_ARRAY.dot(Painting.TO_ARTIST).disjoint())
.select(context);

assertNotNull(gallery.getPaintingArray().get(0).getToArtist());
}

@Test
public void testPrefetchAcross2RelationshipsKeepingBoth_DisjointById() {
Gallery gallery = createArtistWithPaintingInGallery();

assertNotNull(gallery.getPaintingArray().get(0).getToArtist());

// Prefetch the artist through the two relationships
ObjectSelect.query(Gallery.class)
.prefetch(Gallery.PAINTING_ARRAY.joint())
.prefetch(Gallery.PAINTING_ARRAY.dot(Painting.TO_ARTIST).disjointById())
.select(context);

assertNotNull(gallery.getPaintingArray().get(0).getToArtist());
}

}
Loading