You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by cu...@apache.org on 2011/04/27 21:21:46 UTC
svn commit: r1097211 - in /openjpa/sandboxes/perf-2.1.x:
openjpa-kernel/src/main/java/org/apache/openjpa/conf/
openjpa-kernel/src/main/java/org/apache/openjpa/kernel/
openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/
Author: curtisr7
Date: Wed Apr 27 19:21:45 2011
New Revision: 1097211
URL: http://svn.apache.org/viewvc?rev=1097211&view=rev
Log:
OPENJPA-1986: Porting to sandbox.
Added:
openjpa/sandboxes/perf-2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/
- copied from r1097209, openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/
Modified:
openjpa/sandboxes/perf-2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Compatibility.java
openjpa/sandboxes/perf-2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
openjpa/sandboxes/perf-2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java
openjpa/sandboxes/perf-2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/CascadePersistEntity.java (contents, props changed)
openjpa/sandboxes/perf-2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/TestCascadePersist.java (contents, props changed)
Modified: openjpa/sandboxes/perf-2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Compatibility.java
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/perf-2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Compatibility.java?rev=1097211&r1=1097210&r2=1097211&view=diff
==============================================================================
--- openjpa/sandboxes/perf-2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Compatibility.java (original)
+++ openjpa/sandboxes/perf-2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/conf/Compatibility.java Wed Apr 27 19:21:45 2011
@@ -66,6 +66,7 @@ public class Compatibility {
private boolean _isNonDefaultMappingAllowed = false;
private boolean _reloadOnDetach = false;
private boolean _ignoreDetachedStateFieldForProxySerialization = false;
+ private boolean _checkDatabaseForCascadePersistToDetachedEntity = false;
/**
* Whether to require exact identity value types when creating object
@@ -534,5 +535,27 @@ public class Compatibility {
*/
public void setReloadOnDetach(boolean reloadOnDetach) {
_reloadOnDetach = reloadOnDetach;
- }
+ }
+
+ /**
+ * Whether OpenJPA will check the database for an Entity when cascading a persist to another Entity. This property
+ * only applies for the case where we are trying to cascade a persist to an Entity which doesn't have a StateManager
+ * and we can't determine if it is detached.
+ *
+ * @since 2.1.x
+ */
+ public boolean getCheckDatabaseForCascadePersistToDetachedEntity(){
+ return _checkDatabaseForCascadePersistToDetachedEntity;
+ }
+
+ /**
+ * Whether OpenJPA will check the database for an Entity when cascading a persist to another Entity. This property
+ * only applies for the case where we are trying to cascade a persist to an Entity which doesn't have a StateManager
+ * and we can't determine if it is detached.
+ *
+ * @since 2.1.x
+ */
+ public void setCheckDatabaseForCascadePersistToDetachedEntity(boolean b){
+ _checkDatabaseForCascadePersistToDetachedEntity = b;
+ }
}
Modified: openjpa/sandboxes/perf-2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/perf-2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java?rev=1097211&r1=1097210&r2=1097211&view=diff
==============================================================================
--- openjpa/sandboxes/perf-2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java (original)
+++ openjpa/sandboxes/perf-2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/BrokerImpl.java Wed Apr 27 19:21:45 2011
@@ -4527,8 +4527,20 @@ public class BrokerImpl
return (ImplHelper.toPersistenceCapable(obj, _conf)).pcIsDeleted();
return false;
}
-
public boolean isDetached(Object obj) {
+ return isDetached(obj, true);
+ }
+
+ /**
+ * This method makes a best effort to determine if the provided object is detached.
+ *
+ * @param obj
+ * @param find
+ * - If true, as a last resort this method will check whether or not the provided object exists in the
+ * DB. If it is in the DB, the provided object is detached.
+ * @return - True if the provided obj is detached, false otherwise.
+ */
+ public boolean isDetached(Object obj, boolean find) {
if (!(ImplHelper.isManageable(obj)))
return false;
@@ -4544,6 +4556,9 @@ public class BrokerImpl
Object oid = ApplicationIds.create(pc, meta);
if (oid == null)
return false;
+ if(!find){
+ return false;
+ }
return find(oid, null, EXCLUDE_ALL, null, 0) != null;
}
Modified: openjpa/sandboxes/perf-2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/perf-2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java?rev=1097211&r1=1097210&r2=1097211&view=diff
==============================================================================
--- openjpa/sandboxes/perf-2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java (original)
+++ openjpa/sandboxes/perf-2.1.x/openjpa-kernel/src/main/java/org/apache/openjpa/kernel/SingleFieldManager.java Wed Apr 27 19:21:45 2011
@@ -29,6 +29,7 @@ import java.util.Date;
import java.util.Iterator;
import java.util.Map;
+import org.apache.openjpa.conf.Compatibility;
import org.apache.openjpa.enhance.PersistenceCapable;
import org.apache.openjpa.lib.util.Localizer;
import org.apache.openjpa.meta.FieldMetaData;
@@ -49,22 +50,22 @@ import org.apache.openjpa.util.UserExcep
* FieldManager type used to hold onto a single field value and then
* dispense it via the fetch methods. The manager can also perform actions
* on the held field.
- *
- * @author Abe White
*/
-class SingleFieldManager
- extends TransferFieldManager
- implements Serializable {
+class SingleFieldManager extends TransferFieldManager implements Serializable {
+ private static final long serialVersionUID = -6205985063476549150L;
private static final Localizer _loc = Localizer.forPackage
(SingleFieldManager.class);
private final StateManagerImpl _sm;
private final BrokerImpl _broker;
-
+ private final boolean _checkDbOnCascadePersist;
+
public SingleFieldManager(StateManagerImpl sm, BrokerImpl broker) {
_sm = sm;
_broker = broker;
+ _checkDbOnCascadePersist =
+ _broker.getConfiguration().getCompatibilityInstance().getCheckDatabaseForCascadePersistToDetachedEntity();
}
/**
@@ -756,16 +757,16 @@ class SingleFieldManager
/**
* Perform pre flush operations on the given object.
*/
- private void preFlushPC(ValueMetaData vmd, Object obj, boolean logical,
- OpCallbacks call) {
+ private void preFlushPC(ValueMetaData vmd, Object obj, boolean logical, OpCallbacks call) {
if (obj == null)
return;
OpenJPAStateManager sm;
if (vmd.getCascadePersist() == ValueMetaData.CASCADE_NONE) {
- if (!_broker.isDetachedNew() && _broker.isDetached(obj))
+ if (!_broker.isDetachedNew() && _broker.isDetached(obj, _checkDbOnCascadePersist)) {
return; // allow but ignore
+ }
sm = _broker.getStateManager(obj);
if (sm == null || !sm.isPersistent()) {
@@ -782,8 +783,9 @@ class SingleFieldManager
}
} else {
if (vmd.getCascadePersist() == ValueMetaData.CASCADE_IMMEDIATE) {
- if (!_broker.isDetachedNew() && _broker.isDetached(obj))
+ if (!_broker.isDetachedNew() && _broker.isDetached(obj, _checkDbOnCascadePersist)) {
return; // allow but ignore
+ }
}
sm = _broker.getStateManager(obj);
if (sm == null || !sm.isProvisional()) {
Modified: openjpa/sandboxes/perf-2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/CascadePersistEntity.java
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/perf-2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/CascadePersistEntity.java?rev=1097211&r1=1097209&r2=1097211&view=diff
==============================================================================
(empty)
Modified: openjpa/sandboxes/perf-2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/TestCascadePersist.java
URL: http://svn.apache.org/viewvc/openjpa/sandboxes/perf-2.1.x/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/cascade/TestCascadePersist.java?rev=1097211&r1=1097209&r2=1097211&view=diff
==============================================================================
(empty)