Apache
/
openjpa
mirror of https://github.com/apache/openjpa.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

OPENJPA-407. Backing out attempted optimization due to regressions in test suite. 

git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@590520 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Patrick Linskey 2007-10-31 00:29:38 +00:00
parent f187b3d995
commit bc9d60fe3b
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfiguration.java
View File

@ -349,15 +349,14 @@ public interface FetchConfiguration
/**
* Affirms if the given fields require to be fetched in the context of
* the given fetch group set. Returns a BitSet that contains one of
* {@link #FETCH_NONE}, {@link #FETCH_LOAD}, {@link #FETCH_REF} for each
* {@link #FETCH_NONE}, {@link #FETCH_LOAD}, {@link FETCH_REF} for each
* field.
*
* @param fgs fetch group set
* @param fmds array of fields to be examined
* @return BitSet that indicates whether fetches are required or not, or
* <code>null</code> if no fields require a fetch.
* @return BitSet that indicates whether fetches are required or not
*/
public BitSet requiresFetch(Set fgs, FieldMetaData[] fmds);
public BitSet requiresFetch(Set fgs, FieldMetaData[] fmds );
/**
* Return false if we know that the object being fetched with this

16
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/FetchConfigurationImpl.java
View File

@ -537,7 +537,7 @@ public class FetchConfigurationImpl
}
public BitSet requiresFetch(Set fgs, FieldMetaData[] fmds) {
BitSet fields = null;
BitSet fields = new BitSet(fgs.size());
Iterator itr = fgs.iterator();
while (itr.hasNext()) {
fields = includes((FieldMetaData) itr.next(), fmds, fields);
@ -594,10 +594,8 @@ public class FetchConfigurationImpl
if ((fmd.isInDefaultFetchGroup() && hasFetchGroup(FetchGroup.NAME_DEFAULT))
|| hasFetchGroup(FetchGroup.NAME_ALL)
|| hasField(fmd.getFullName(false))) {
if (indirectFetch(fmd) != FETCH_NONE) {
fields = new BitSet(fmds.length);
if (indirectFetch(fmd) != FETCH_NONE)
fields.set(fmd.getIndex());
}
return fields;
}
// now we need to see if this field associates with
@ -605,11 +603,8 @@ public class FetchConfigurationImpl
String[] fgs = fmd.getCustomFetchGroups();
for (int i = 0; i < fgs.length; i++) {
if (hasFetchGroup(fgs[i])) {
if (indirectFetch(fmd) != FETCH_NONE) {
if (fields == null)
fields = new BitSet(fmds.length);
if (indirectFetch(fmd) != FETCH_NONE)
fields.set(fmd.getIndex());
}
// check whether this field has a loadFetchGroup
// if it has a LoadFetchGroup, then we need to get
// all the fields that associate with this LoadFetchGroup
@ -619,11 +614,8 @@ public class FetchConfigurationImpl
// merge the loadFetchGroup fields to the retuned fields.
if (fldIndex != null && !fldIndex.isEmpty()) {
for (int j = 0; j < fldIndex.length(); j++)
if (fldIndex.get(j)) {
if (fields == null)
fields = new BitSet(fmds.length);
if (fldIndex.get(j))
fields.set(j);
}
}
}
}