You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@openjpa.apache.org by Jeremy Bauer <te...@gmail.com> on 2009/07/20 21:02:31 UTC
Re: svn commit: r795949 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
Donald,
Is there corresponding test code for this commit?
-Jeremy
On Mon, Jul 20, 2009 at 1:36 PM, <dw...@apache.org> wrote:
> Author: dwoods
> Date: Mon Jul 20 18:36:24 2009
> New Revision: 795949
>
> URL: http://svn.apache.org/viewvc?rev=795949&view=rev
> Log:
> OPENJPA-1184 Inverse relations not set for MapKey field when using
> parallel eager select. Patch contributed by David Minor.
>
> Modified:
>
> openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
>
> Modified:
> openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
> URL:
> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java?rev=795949&r1=795948&r2=795949&view=diff
>
> ==============================================================================
> ---
> openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
> (original)
> +++
> openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
> Mon Jul 20 18:36:24 2009
> @@ -29,6 +29,7 @@
> import java.util.Collections;
> import java.util.HashSet;
> import java.util.Iterator;
> +import java.util.Map;
> import java.util.Set;
>
> import javax.sql.DataSource;
> @@ -408,6 +409,8 @@
> for (int i = 0; i < fms.length; i++) {
> if (res.getEager(fms[i]) != null) {
> Object coll = owner.fetchObject(fms[i].getIndex());
> + if (coll instanceof Map)
> + coll = ((Map)coll).values();
> if (coll instanceof Collection &&
> ((Collection) coll).size() > 0) {
> // Found eagerly loaded collection.
>
>
>
Re: svn commit: r795949 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
Posted by Jeremy Bauer <te...@gmail.com>.
Thanks. The fix looks straight forward enough. IMO, the code can be left
in but the JIRA should remain open until jUnits are added. Hopefully soon.
-Jeremy
On Mon, Jul 20, 2009 at 2:05 PM, Donald Woods <dw...@apache.org> wrote:
> No, was going to look at that next... Or should I back it out for now (all
> junit tests passed on Sun JDK 5 and 6.)
>
>
> -Donald
>
>
>
> Jeremy Bauer wrote:
>
>> Donald,
>>
>> Is there corresponding test code for this commit?
>>
>> -Jeremy
>>
>> On Mon, Jul 20, 2009 at 1:36 PM, <dw...@apache.org> wrote:
>>
>> Author: dwoods
>>> Date: Mon Jul 20 18:36:24 2009
>>> New Revision: 795949
>>>
>>> URL: http://svn.apache.org/viewvc?rev=795949&view=rev
>>> Log:
>>> OPENJPA-1184 Inverse relations not set for MapKey field when using
>>> parallel eager select. Patch contributed by David Minor.
>>>
>>> Modified:
>>>
>>>
>>> openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
>>>
>>> Modified:
>>>
>>> openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
>>> URL:
>>>
>>> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java?rev=795949&r1=795948&r2=795949&view=diff
>>>
>>>
>>> ==============================================================================
>>> ---
>>>
>>> openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
>>> (original)
>>> +++
>>>
>>> openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
>>> Mon Jul 20 18:36:24 2009
>>> @@ -29,6 +29,7 @@
>>> import java.util.Collections;
>>> import java.util.HashSet;
>>> import java.util.Iterator;
>>> +import java.util.Map;
>>> import java.util.Set;
>>>
>>> import javax.sql.DataSource;
>>> @@ -408,6 +409,8 @@
>>> for (int i = 0; i < fms.length; i++) {
>>> if (res.getEager(fms[i]) != null) {
>>> Object coll = owner.fetchObject(fms[i].getIndex());
>>> + if (coll instanceof Map)
>>> + coll = ((Map)coll).values();
>>> if (coll instanceof Collection &&
>>> ((Collection) coll).size() > 0) {
>>> // Found eagerly loaded collection.
>>>
>>>
>>>
>>>
>>
Re: svn commit: r795949 - /openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
Posted by Donald Woods <dw...@apache.org>.
No, was going to look at that next... Or should I back it out for now
(all junit tests passed on Sun JDK 5 and 6.)
-Donald
Jeremy Bauer wrote:
> Donald,
>
> Is there corresponding test code for this commit?
>
> -Jeremy
>
> On Mon, Jul 20, 2009 at 1:36 PM, <dw...@apache.org> wrote:
>
>> Author: dwoods
>> Date: Mon Jul 20 18:36:24 2009
>> New Revision: 795949
>>
>> URL: http://svn.apache.org/viewvc?rev=795949&view=rev
>> Log:
>> OPENJPA-1184 Inverse relations not set for MapKey field when using
>> parallel eager select. Patch contributed by David Minor.
>>
>> Modified:
>>
>> openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
>>
>> Modified:
>> openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
>> URL:
>> http://svn.apache.org/viewvc/openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java?rev=795949&r1=795948&r2=795949&view=diff
>>
>> ==============================================================================
>> ---
>> openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
>> (original)
>> +++
>> openjpa/trunk/openjpa-jdbc/src/main/java/org/apache/openjpa/jdbc/kernel/JDBCStoreManager.java
>> Mon Jul 20 18:36:24 2009
>> @@ -29,6 +29,7 @@
>> import java.util.Collections;
>> import java.util.HashSet;
>> import java.util.Iterator;
>> +import java.util.Map;
>> import java.util.Set;
>>
>> import javax.sql.DataSource;
>> @@ -408,6 +409,8 @@
>> for (int i = 0; i < fms.length; i++) {
>> if (res.getEager(fms[i]) != null) {
>> Object coll = owner.fetchObject(fms[i].getIndex());
>> + if (coll instanceof Map)
>> + coll = ((Map)coll).values();
>> if (coll instanceof Collection &&
>> ((Collection) coll).size() > 0) {
>> // Found eagerly loaded collection.
>>
>>
>>
>