From 11082c29d7a2e112e584be02b6e8560fa4a15a7c Mon Sep 17 00:00:00 2001 From: Michael Dick Date: Wed, 12 May 2010 19:36:22 +0000 Subject: [PATCH] OPENJPA-589: Can not retrieve M-to-M data when DataCache is on. Submitted By: Heath Thomann, merged from Fay's changes in trunk and 1.1.x git-svn-id: https://svn.apache.org/repos/asf/openjpa/branches/1.0.x@943647 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/openjpa/kernel/AbstractPCData.java | 22 +++--- .../datacache/TestM2MInDataCache.java | 77 +++++++++++++++++++ .../datacache/common/apps/M2MEntityE.java | 67 ++++++++++++++++ .../datacache/common/apps/M2MEntityF.java | 56 ++++++++++++++ 4 files changed, 213 insertions(+), 9 deletions(-) create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestM2MInDataCache.java create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityE.java create mode 100644 openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityF.java diff --git a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractPCData.java b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractPCData.java index 6bf11e427..17ad0a7cc 100644 --- a/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractPCData.java +++ b/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/AbstractPCData.java @@ -86,18 +86,22 @@ public abstract class AbstractPCData case JavaTypes.MAP: Map m = (Map) data; Map m2 = (Map) sm.newFieldProxy(fmd.getIndex()); - Collection keys = new ArrayList (m.size()); + Collection keys = new ArrayList(m.size()); + Collection values = new ArrayList(m.size()); + Map.Entry e; - for (Iterator mi = m.entrySet().iterator(); mi.hasNext();) - keys.add(mi.next()); + Iterator itr = m.entrySet().iterator(); + while (itr.hasNext()) { + e = (Map.Entry) itr.next(); + keys.add(e.getKey()); + values.add(e.getValue()); + } Object[] keyArray = keys.toArray(); - Object[] values = toNestedFields(sm, fmd.getElement(), - keys, fetch, context).toArray(); - int idx = 0; - for (Iterator mi = m.entrySet().iterator(); mi.hasNext(); idx++) - m2.put(keyArray[idx], values[idx]); - + Object[] valueArray = toNestedFields(sm, fmd.getElement(), values, fetch, context).toArray(); + for (int idx = 0; idx < keyArray.length; idx++) { + m2.put(keyArray[idx], valueArray[idx]); + } return m2; case JavaTypes.ARRAY: int length = Array.getLength(data); diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestM2MInDataCache.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestM2MInDataCache.java new file mode 100644 index 000000000..1f4b77ba6 --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/TestM2MInDataCache.java @@ -0,0 +1,77 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openjpa.persistence.datacache; + +import java.util.Map; + +import javax.persistence.EntityManager; + +import org.apache.openjpa.persistence.datacache.common.apps.M2MEntityE; +import org.apache.openjpa.persistence.datacache.common.apps.M2MEntityF; +import org.apache.openjpa.persistence.test.SingleEMFTestCase; + +public class TestM2MInDataCache extends SingleEMFTestCase { + public void setUp() { + setUp("openjpa.DataCache", "true", "openjpa.RemoteCommitProvider", "sjvm", M2MEntityE.class, M2MEntityF.class, + CLEAR_TABLES); + } + + /** + * Test if child list is in order after new child list is added in setup(). + */ + public void testM2MDataCache() { + EntityManager em = emf.createEntityManager(); + em.getTransaction().begin(); + + M2MEntityE e1 = new M2MEntityE(); + e1.setId(1); + e1.setName("ABC"); + em.persist(e1); + M2MEntityE e2 = new M2MEntityE(); + e2.setId(2); + e2.setName("DEF"); + em.persist(e2); + + M2MEntityF f1 = new M2MEntityF(); + f1.setId(10); + em.persist(f1); + M2MEntityF f2 = new M2MEntityF(); + f2.setId(20); + em.persist(f2); + + e1.getEntityF().put(f1.getId(), f1); + e1.getEntityF().put(f2.getId(), f2); + e2.getEntityF().put(f1.getId(), f1); + e2.getEntityF().put(f2.getId(), f2); + + f1.getEntityE().put(e1.getName(), e1); + f1.getEntityE().put(e2.getName(), e2); + f2.getEntityE().put(e1.getName(), e1); + f2.getEntityE().put(e2.getName(), e2); + em.getTransaction().commit(); + em.close(); + + em = emf.createEntityManager(); + // check that we can find the entities and retrieve their map fields + assertNotNull(em.find(M2MEntityE.class, 1).getEntityF()); + assertNotNull(em.find(M2MEntityE.class, 2).getEntityF()); + assertNotNull(em.find(M2MEntityF.class, 10).getEntityE()); + assertNotNull(em.find(M2MEntityF.class, 20).getEntityE()); + } +} diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityE.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityE.java new file mode 100644 index 000000000..51a67304e --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityE.java @@ -0,0 +1,67 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openjpa.persistence.datacache.common.apps; + +import javax.persistence.*; +import java.util.*; + +@Entity +public class M2MEntityE { + @Id + private int id; + + private String name; + + @ManyToMany + @MapKey(name = "id") + private Map entityf; + + public M2MEntityE() { + entityf = new HashMap(); + name = "entitye"; + } + + public Map getEntityF() { + return entityf; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String toString() { + return "EntityE:" + id; + } + + public void print() { + System.out.println("EntityD id=" + id + " entityc=" + entityf); + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityF.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityF.java new file mode 100644 index 000000000..052bf790c --- /dev/null +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/datacache/common/apps/M2MEntityF.java @@ -0,0 +1,56 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.openjpa.persistence.datacache.common.apps; + +import javax.persistence.*; +import java.util.*; + +@Entity +public class M2MEntityF { + @Id + private int id; + + @ManyToMany(mappedBy = "entityf") + @MapKey(name = "name") + private Map entitye; + + public M2MEntityF() { + entitye = new HashMap(); + } + + public Map getEntityE() { + return entitye; + } + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String toString() { + return "EntityF:" + id; + } + + public void print() { + System.out.println("EntityF id=" + id + " entitye=" + entitye); + } +}