Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 RELEASE-NOTES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Bug Fixes:

CAY-3071 DataNodeSQLAction could lose update count info
CAY-3073 AI plugin / MCP db import schema description inconsistencies
CAY-3078 Disjoint to-one prefetch doesn't attach parents over binary keys
CAY-3080 ObjectId.toString() prints binary key values as object identity

----------------------------------
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.map.ObjRelationship;

import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -88,11 +89,11 @@ public void linkToParent(DataRow row, Persistent object) {
if (joins.length > 1) {
List<Object> values = new ArrayList<>(joins.length);
for (int i = 0; i < joins.length; i++) {
values.add(targetReader.get(row, i));
values.add(key(targetReader.get(row, i)));
}
key = values;
} else {
key = targetReader.get(row, 0);
key = key(targetReader.get(row, 0));
}

List<Persistent> parents = partitionByChild.get(key);
Expand Down Expand Up @@ -134,15 +135,23 @@ private void indexParents() {
if (joins.length > 1) {
List<Object> values = new ArrayList<>(joins.length);
for (int j = 0; j < joins.length; j++) {
values.add(sourceReader.get(row, j));
values.add(key(sourceReader.get(row, j)));
}
key = values;
} else {
key = sourceReader.get(row, 0);
key = key(sourceReader.get(row, 0));
}

List<Persistent> parents = partitionByChild.computeIfAbsent(key, k -> new ArrayList<>());
parents.add(objects.get(i));
}
}

/**
* Converts a join value to a map key. A byte[] (e.g. a binary PK) has identity equals/hashCode, so it is wrapped
* in a ByteBuffer that compares by content.
*/
private static Object key(Object value) {
return value instanceof byte[] bytes ? ByteBuffer.wrap(bytes) : value;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,20 @@

import org.apache.cayenne.PersistenceState;
import org.apache.cayenne.query.ObjectSelect;
import org.apache.cayenne.test.jdbc.TableHelper;
import org.apache.cayenne.testdo.binary_pk.BinaryPKTest1;
import org.apache.cayenne.testdo.binary_pk.BinaryPKTest2;
import org.apache.cayenne.unit.CayenneProjects;
import org.apache.cayenne.unit.CayenneTestsEnv;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

import java.sql.SQLException;
import java.sql.Types;
import java.util.List;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertInstanceOf;
import static org.junit.jupiter.api.Assertions.assertNotNull;

public class DataContextBinaryPKIT {
Expand Down Expand Up @@ -80,4 +86,63 @@ public void fetchRelationshipBinaryPK() {
assertEquals(PersistenceState.HOLLOW, fetchedMaster.getPersistenceState());
assertEquals("master1", fetchedMaster.getName());
}

@Test
public void disjointPrefetchToOneBinaryPK() throws SQLException {
if (!env.testDbAdapter().supportsBinaryPK()) {
return;
}

TableHelper tMaster = masterTable();
TableHelper tDetail = detailTable();
tMaster.insert(new byte[]{1, 2, 3}, "master1");
tMaster.insert(new byte[]{4, 5, 6}, "master2");
tDetail.insert(1, new byte[]{1, 2, 3}, "detail1");
tDetail.insert(2, new byte[]{4, 5, 6}, "detail2");

List<BinaryPKTest2> details = ObjectSelect.query(BinaryPKTest2.class)
.prefetch(BinaryPKTest2.TO_BINARY_PKMASTER.disjoint())
.orderBy(BinaryPKTest2.DETAIL_NAME.asc())
.select(env.context());
assertEquals(2, details.size());

env.runWithQueriesBlocked(() -> {
assertPrefetchedMaster("master1", details.get(0));
assertPrefetchedMaster("master2", details.get(1));
});
}

@Test
public void disjointByIdPrefetchToOneBinaryPK() throws SQLException {
if (!env.testDbAdapter().supportsBinaryPK()) {
return;
}

// a single key, so that the prefetch query is a plain "=" and not an IN list
masterTable().insert(new byte[]{1, 2, 3}, "master1");
detailTable().insert(1, new byte[]{1, 2, 3}, "detail1");

List<BinaryPKTest2> details = ObjectSelect.query(BinaryPKTest2.class)
.prefetch(BinaryPKTest2.TO_BINARY_PKMASTER.disjointById())
.select(env.context());
assertEquals(1, details.size());

env.runWithQueriesBlocked(() -> assertPrefetchedMaster("master1", details.get(0)));
}

private TableHelper masterTable() {
return env.table("BINARY_PK_TEST1").setColumns("BIN_ID", "NAME")
.setColumnTypes(Types.VARBINARY, Types.VARCHAR);
}

private TableHelper detailTable() {
return env.table("BINARY_PK_TEST2").setColumns("ID", "FK_ID", "DETAIL_NAME")
.setColumnTypes(Types.INTEGER, Types.VARBINARY, Types.VARCHAR);
}

private static void assertPrefetchedMaster(String expectedName, BinaryPKTest2 detail) {
BinaryPKTest1 master = assertInstanceOf(BinaryPKTest1.class, detail.readPropertyDirectly("toBinaryPKMaster"));
assertEquals(PersistenceState.COMMITTED, master.getPersistenceState());
assertEquals(expectedName, master.getName());
}
}
Loading