Revision: 15904
http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15904&view=rev
Author: andy_jefferson
Date: 2012-11-11 15:03:44 +0000 (Sun, 11 Nov 2012)
Log Message:
-----------
javadocs
Modified Paths:
--------------
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSPersistenceHandler.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSStoreManager.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/DynamicSchemaFieldManager.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/OldValueParameterSetter.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ParameterSetter.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ResultSetGetter.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleArrayMapping.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleBitSetMapping.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleBlobRDBMSMapping.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleClobRDBMSMapping.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleSerialisedObjectMapping.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleSerialisedPCMapping.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleStringMapping.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/FetchRequest.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractArrayStore.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractCollectionStore.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractListStore.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractSetStore.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/ArrayStoreIterator.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/BackingStoreHelper.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/BaseContainerStore.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/ElementContainerStore.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/ListStoreIterator.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKArrayStore.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKListStore.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKMapStore.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKSetStore.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSJoinArrayStore.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSJoinListStore.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSJoinMapStore.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSJoinSetStore.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSMapEntrySetStore.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSMapKeySetStore.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSMapValueSetStore.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSPersistableRelationStore.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/SetStoreIterator.java
platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/table/ClassTable.java
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSPersistenceHandler.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSPersistenceHandler.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSPersistenceHandler.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -476,7 +476,7 @@
/**
* Convenience method to handle the delete from the various tables that this object is persisted into.
* @param table The table to process
- * @param sm StateManager for the object being deleted
+ * @param sm ObjectProvider for the object being deleted
* @param clr ClassLoader resolver
*/
private void deleteTable(DatastoreClass table, ObjectProvider sm, ClassLoaderResolver clr)
@@ -666,7 +666,7 @@
* Check if we need to update the schema before performing an insert/update.
* This is typically of use where the user has an interface field and some new implementation
* is trying to be persisted to that field, so we need to update the schema.
- * @param sm StateManager for the object
+ * @param sm ObjectProvider for the object
* @param fieldNumbers The fields to check for required schema updates
*/
private void checkForSchemaUpdatesForFieldsOfObject(ObjectProvider sm, int[] fieldNumbers)
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSStoreManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSStoreManager.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/RDBMSStoreManager.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -172,7 +172,7 @@
* The RDBMS manager's responsibilities extend those for StoreManager to add :
* <ul>
* <li>creates and controls access to the data sources required for this datastore instance</li>
- * <li>implements insert(), fetch(), update(), delete() in the interface to the StateManager.</li>
+ * <li>implements insert(), fetch(), update(), delete() in the interface to the ObjectProvider.</li>
* <li>Providing cached access to JDBC database metadata (in particular column information).</li>
* <li>Resolving SQL identifier macros to actual SQL identifiers.</li>
* </ul>
@@ -1163,7 +1163,7 @@
/**
* Method to return a FieldManager for populating information in statements.
- * @param sm The state manager for the object.
+ * @param sm The ObjectProvider for the object.
* @param stmt The Prepared Statement to set values on.
* @param stmtMappings the index of parameters/mappings
* @param checkNonNullable Whether to check for nullability
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/DynamicSchemaFieldManager.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/DynamicSchemaFieldManager.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/DynamicSchemaFieldManager.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -52,8 +52,8 @@
/** Manager for the RDBMS datastore. */
RDBMSStoreManager rdbmsMgr;
- /** StateManager of the object being processed. */
- ObjectProvider sm;
+ /** ObjectProvider of the object being processed. */
+ ObjectProvider op;
/** Flag for whether we have updated the schema. */
boolean schemaUpdatesPerformed = false;
@@ -61,12 +61,12 @@
/**
* Constructor.
* @param rdbmsMgr RDBMSManager
- * @param sm StateManager for the object being processed
+ * @param op ObjectProvider for the object being processed
*/
- public DynamicSchemaFieldManager(RDBMSStoreManager rdbmsMgr, ObjectProvider sm)
+ public DynamicSchemaFieldManager(RDBMSStoreManager rdbmsMgr, ObjectProvider op)
{
this.rdbmsMgr = rdbmsMgr;
- this.sm = sm;
+ this.op = op;
}
/**
@@ -90,12 +90,12 @@
return; // No value so nothing to do
}
- ExecutionContext ec = sm.getExecutionContext();
+ ExecutionContext ec = op.getExecutionContext();
ClassLoaderResolver clr = ec.getClassLoaderResolver();
AbstractMemberMetaData mmd =
- sm.getClassMetaData().getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
- DatastoreClass table = rdbmsMgr.getDatastoreClass(sm.getObject().getClass().getName(), clr);
+ op.getClassMetaData().getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+ DatastoreClass table = rdbmsMgr.getDatastoreClass(op.getObject().getClass().getName(), clr);
JavaTypeMapping fieldMapping = table.getMemberMapping(mmd);
if (fieldMapping != null)
{
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/OldValueParameterSetter.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/OldValueParameterSetter.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/OldValueParameterSetter.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -23,26 +23,26 @@
/**
* Parameter setter that uses old values when available.
* Used as part of the nondurable update process.
- * Assumes that the old value for fields are stored by the StateManager under name "FIELD_VALUE.ORIGINAL.{fieldNum}".
+ * Assumes that the old value for fields are stored by the ObjectProvider under name "FIELD_VALUE.ORIGINAL.{fieldNum}".
*/
public class OldValueParameterSetter extends ParameterSetter
{
/**
* Constructor.
- * @param sm The state manager for the object.
+ * @param op The ObjectProvider for the object.
* @param stmt The Statement to set values on.
* @param stmtMappings mappings for parameters in the statement.
* @param checkNonNullable Whether to check for nullability
*/
- public OldValueParameterSetter(ObjectProvider sm, Object stmt, StatementClassMapping stmtMappings,
+ public OldValueParameterSetter(ObjectProvider op, Object stmt, StatementClassMapping stmtMappings,
boolean checkNonNullable)
{
- super(sm, stmt, stmtMappings, checkNonNullable);
+ super(op, stmt, stmtMappings, checkNonNullable);
}
public void storeBooleanField(int fieldNumber, boolean value)
{
- Object oldValue = sm.getAssociatedValue(ObjectProvider.ORIGINAL_FIELD_VALUE_KEY_PREFIX + fieldNumber);
+ Object oldValue = op.getAssociatedValue(ObjectProvider.ORIGINAL_FIELD_VALUE_KEY_PREFIX + fieldNumber);
if (oldValue != null)
{
super.storeBooleanField(fieldNumber, (Boolean) oldValue);
@@ -55,7 +55,7 @@
public void storeCharField(int fieldNumber, char value)
{
- Object oldValue = sm.getAssociatedValue(ObjectProvider.ORIGINAL_FIELD_VALUE_KEY_PREFIX + fieldNumber);
+ Object oldValue = op.getAssociatedValue(ObjectProvider.ORIGINAL_FIELD_VALUE_KEY_PREFIX + fieldNumber);
if (oldValue != null)
{
super.storeCharField(fieldNumber, (Character) oldValue);
@@ -68,7 +68,7 @@
public void storeByteField(int fieldNumber, byte value)
{
- Object oldValue = sm.getAssociatedValue(ObjectProvider.ORIGINAL_FIELD_VALUE_KEY_PREFIX + fieldNumber);
+ Object oldValue = op.getAssociatedValue(ObjectProvider.ORIGINAL_FIELD_VALUE_KEY_PREFIX + fieldNumber);
if (oldValue != null)
{
super.storeByteField(fieldNumber, (Byte) oldValue);
@@ -81,7 +81,7 @@
public void storeShortField(int fieldNumber, short value)
{
- Object oldValue = sm.getAssociatedValue(ObjectProvider.ORIGINAL_FIELD_VALUE_KEY_PREFIX + fieldNumber);
+ Object oldValue = op.getAssociatedValue(ObjectProvider.ORIGINAL_FIELD_VALUE_KEY_PREFIX + fieldNumber);
if (oldValue != null)
{
super.storeShortField(fieldNumber, (Short) oldValue);
@@ -94,7 +94,7 @@
public void storeIntField(int fieldNumber, int value)
{
- Object oldValue = sm.getAssociatedValue(ObjectProvider.ORIGINAL_FIELD_VALUE_KEY_PREFIX + fieldNumber);
+ Object oldValue = op.getAssociatedValue(ObjectProvider.ORIGINAL_FIELD_VALUE_KEY_PREFIX + fieldNumber);
if (oldValue != null)
{
super.storeIntField(fieldNumber, (Integer) oldValue);
@@ -107,7 +107,7 @@
public void storeLongField(int fieldNumber, long value)
{
- Object oldValue = sm.getAssociatedValue(ObjectProvider.ORIGINAL_FIELD_VALUE_KEY_PREFIX + fieldNumber);
+ Object oldValue = op.getAssociatedValue(ObjectProvider.ORIGINAL_FIELD_VALUE_KEY_PREFIX + fieldNumber);
if (oldValue != null)
{
super.storeLongField(fieldNumber, (Long) oldValue);
@@ -120,7 +120,7 @@
public void storeFloatField(int fieldNumber, float value)
{
- Object oldValue = sm.getAssociatedValue(ObjectProvider.ORIGINAL_FIELD_VALUE_KEY_PREFIX + fieldNumber);
+ Object oldValue = op.getAssociatedValue(ObjectProvider.ORIGINAL_FIELD_VALUE_KEY_PREFIX + fieldNumber);
if (oldValue != null)
{
super.storeFloatField(fieldNumber, (Float) oldValue);
@@ -133,7 +133,7 @@
public void storeDoubleField(int fieldNumber, double value)
{
- Object oldValue = sm.getAssociatedValue(ObjectProvider.ORIGINAL_FIELD_VALUE_KEY_PREFIX + fieldNumber);
+ Object oldValue = op.getAssociatedValue(ObjectProvider.ORIGINAL_FIELD_VALUE_KEY_PREFIX + fieldNumber);
if (oldValue != null)
{
super.storeDoubleField(fieldNumber, (Double) oldValue);
@@ -146,7 +146,7 @@
public void storeStringField(int fieldNumber, String value)
{
- Object oldValue = sm.getAssociatedValue(ObjectProvider.ORIGINAL_FIELD_VALUE_KEY_PREFIX + fieldNumber);
+ Object oldValue = op.getAssociatedValue(ObjectProvider.ORIGINAL_FIELD_VALUE_KEY_PREFIX + fieldNumber);
if (oldValue != null)
{
super.storeStringField(fieldNumber, (String) oldValue);
@@ -159,7 +159,7 @@
public void storeObjectField(int fieldNumber, Object value)
{
- Object oldValue = sm.getAssociatedValue(ObjectProvider.ORIGINAL_FIELD_VALUE_KEY_PREFIX + fieldNumber);
+ Object oldValue = op.getAssociatedValue(ObjectProvider.ORIGINAL_FIELD_VALUE_KEY_PREFIX + fieldNumber);
if (oldValue != null)
{
super.storeObjectField(fieldNumber, oldValue);
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ParameterSetter.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ParameterSetter.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ParameterSetter.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -44,7 +44,7 @@
private static final Localiser LOCALISER = Localiser.getInstance(
"org.datanucleus.store.rdbms.Localisation", RDBMSStoreManager.class.getClassLoader());
- protected final ObjectProvider sm;
+ protected final ObjectProvider op;
protected final ExecutionContext ec;
protected final Object statement;
protected final StatementClassMapping stmtMappings;
@@ -52,16 +52,16 @@
/**
* Constructor.
- * @param sm The state manager for the object.
+ * @param op The ObjectProvider for the object.
* @param stmt The Statement to set values on.
* @param stmtMappings mappings for parameters in the statement.
* @param checkNonNullable Whether to check for nullability
*/
- public ParameterSetter(ObjectProvider sm, Object stmt, StatementClassMapping stmtMappings,
+ public ParameterSetter(ObjectProvider op, Object stmt, StatementClassMapping stmtMappings,
boolean checkNonNullable)
{
- this.sm = sm;
- this.ec = sm.getExecutionContext();
+ this.op = op;
+ this.ec = op.getExecutionContext();
this.statement = stmt;
this.stmtMappings = stmtMappings;
this.checkNonNullable = checkNonNullable;
@@ -183,7 +183,7 @@
mapping instanceof PersistableMapping ||
mapping instanceof InterfaceMapping)
{
- // Pass in the owner StateManager/field for any mappings that have relations
+ // Pass in the owner ObjectProvider/field for any mappings that have relations
provideOwner = true;
}
@@ -194,7 +194,7 @@
// Set this value for all occurrences of this parameter
if (provideOwner)
{
- mapping.setObject(ec, statement, mapIdx.getParameterPositionsForOccurrence(i), value, sm, fieldNumber);
+ mapping.setObject(ec, statement, mapIdx.getParameterPositionsForOccurrence(i), value, op, fieldNumber);
}
else
{
@@ -207,7 +207,7 @@
// Important : call setObject even if the paramIndices is null (reachability)
if (provideOwner)
{
- mapping.setObject(ec, statement, null, value, sm, fieldNumber);
+ mapping.setObject(ec, statement, null, value, op, fieldNumber);
}
else
{
@@ -216,15 +216,15 @@
}
// Make sure the field is wrapped where appropriate
- sm.wrapSCOField(fieldNumber, value, false, true, true);
+ op.wrapSCOField(fieldNumber, value, false, true, true);
}
catch (NotYetFlushedException e)
{
- if (sm.getClassMetaData().getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber).getNullValue() == NullValue.EXCEPTION)
+ if (op.getClassMetaData().getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber).getNullValue() == NullValue.EXCEPTION)
{
throw e;
}
- sm.updateFieldAfterInsert(e.getPersistable(),fieldNumber);
+ op.updateFieldAfterInsert(e.getPersistable(),fieldNumber);
}
}
}
\ No newline at end of file
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ResultSetGetter.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ResultSetGetter.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/fieldmanager/ResultSetGetter.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -65,7 +65,7 @@
}
/**
- * Constructor without the StateManager, where we know the result set but don't have the object yet.
+ * Constructor without the ObjectProvider, where we know the result set but don't have the object yet.
* @param storeMgr RDBMS StoreManager
* @param ec Execution Context
* @param results the ResultSet
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleArrayMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleArrayMapping.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleArrayMapping.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -174,7 +174,7 @@
/**
* Method to be called after any update of the owner class element.
- * @param sm StateManager of the owner
+ * @param sm ObjectProvider of the owner
*/
public void postUpdate(ObjectProvider sm)
{
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleBitSetMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleBitSetMapping.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleBitSetMapping.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -37,7 +37,7 @@
{
/**
* Method to handle post-processing of the insert of the BLOB/CLOB for Oracle.
- * @param op StateManager of the owner
+ * @param op ObjectProvider of the owner
*/
public void insertPostProcessing(ObjectProvider op)
{
@@ -91,7 +91,7 @@
/**
* Method to be called after the insert of the owner class element.
- * @param op StateManager of the owner
+ * @param op ObjectProvider of the owner
**/
public void postInsert(ObjectProvider op)
{
@@ -99,7 +99,7 @@
/**
* Method to be called after any update of the owner class element.
- * @param op StateManager of the owner
+ * @param op ObjectProvider of the owner
*/
public void postUpdate(ObjectProvider op)
{
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleBlobRDBMSMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleBlobRDBMSMapping.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleBlobRDBMSMapping.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -303,7 +303,7 @@
* SELECT {blobColumn} FROM TABLE WHERE ID=? FOR UPDATE
* </pre>
* and then updates the Blob value returned.
- * @param sm StateManager of the object
+ * @param sm ObjectProvider of the object
* @param datastoreContainer Table storing the BLOB column
* @param mapping Datastore mapping for the BLOB column
* @param bytes The bytes to store in the BLOB
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleClobRDBMSMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleClobRDBMSMapping.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleClobRDBMSMapping.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -202,7 +202,7 @@
* SELECT {clobColumn} FROM TABLE WHERE ID=? FOR UPDATE
* </pre>
* and then updates the Clob value returned.
- * @param sm StateManager of the object
+ * @param sm ObjectProvider of the object
* @param datastoreContainer Table storing the CLOB column
* @param mapping Datastore mapping for the CLOB column
* @param value The value to store in the CLOB
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleSerialisedObjectMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleSerialisedObjectMapping.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleSerialisedObjectMapping.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -41,7 +41,7 @@
/**
* Retrieve the empty BLOB created by the insert statement and write out the
* current BLOB field value to the Oracle BLOB object
- * @param op the current StateManager
+ * @param op the current ObjectProvider
*/
public void insertPostProcessing(ObjectProvider op)
{
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleSerialisedPCMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleSerialisedPCMapping.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleSerialisedPCMapping.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -34,7 +34,7 @@
/**
* Retrieve the empty BLOB created by the insert statement and write out the
* current BLOB field value to the Oracle BLOB object
- * @param op the current StateManager
+ * @param op the current ObjectProvider
*/
public void insertPostProcessing(ObjectProvider op)
{
@@ -45,7 +45,7 @@
sm = op.getExecutionContext().findObjectProvider(value);
if (sm == null || sm.getExecutionContext().getApiAdapter().getExecutionContext(value) == null)
{
- // Assign a StateManager to the serialised object since none present
+ // Assign a ObjectProvider to the serialised object since none present
sm = op.getExecutionContext().newObjectProviderForEmbedded(value, false, op, mmd.getAbsoluteFieldNumber());
}
}
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleStringMapping.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleStringMapping.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/mapping/oracle/OracleStringMapping.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -37,7 +37,7 @@
/**
* Retrieve the empty BLOB/CLOB locator created by the insert statement
* and write out the current BLOB/CLOB field value to the Oracle BLOB/CLOB object
- * @param op The StateManager owner of this field
+ * @param op The ObjectProvider owner of this field
*/
public void insertPostProcessing(ObjectProvider op)
{
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/DeleteRequest.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -365,18 +365,18 @@
/**
* Method to update any 1-1 bidir non-owner fields where the foreign-key is stored in the other object.
- * @param sm StateManager of this object
+ * @param op ObjectProvider of this object
* @param mmd MetaData for field that has related (owner) objects
*/
- private void updateOneToOneBidirectionalOwnerObjectForField(ObjectProvider sm, AbstractMemberMetaData fmd)
+ private void updateOneToOneBidirectionalOwnerObjectForField(ObjectProvider op, AbstractMemberMetaData fmd)
{
if (NucleusLogger.PERSISTENCE.isDebugEnabled())
{
- NucleusLogger.PERSISTENCE.debug(LOCALISER.msg("052217", sm.getObjectAsPrintable(), fmd.getFullFieldName()));
+ NucleusLogger.PERSISTENCE.debug(LOCALISER.msg("052217", op.getObjectAsPrintable(), fmd.getFullFieldName()));
}
RDBMSStoreManager storeMgr = (RDBMSStoreManager)table.getStoreManager();
- ExecutionContext ec = sm.getExecutionContext();
+ ExecutionContext ec = op.getExecutionContext();
ClassLoaderResolver clr = ec.getClassLoaderResolver();
AbstractMemberMetaData[] relatedMmds = fmd.getRelatedMemberMetaData(clr);
@@ -460,7 +460,7 @@
try
{
ps = sqlControl.getStatementForUpdate(mconn, clearLinkStmt.toString(), false);
- refMapping.setObject(ec, ps, MappingHelper.getMappingIndices(1, refMapping), sm.getObject());
+ refMapping.setObject(ec, ps, MappingHelper.getMappingIndices(1, refMapping), op.getObject());
sqlControl.executeStatementUpdate(ec, mconn, clearLinkStmt.toString(), ps, true);
}
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/FetchRequest.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/FetchRequest.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/FetchRequest.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -417,12 +417,12 @@
/**
* Convenience method to return if the version field of the managed object is loaded.
- * @param sm StateManager of the object
+ * @param op ObjectProvider of the object
* @return Whether the version is loaded
*/
- private boolean isVersionLoaded(ObjectProvider sm)
+ private boolean isVersionLoaded(ObjectProvider op)
{
- return sm.getObject() != null && sm.getExecutionContext().getApiAdapter().getVersion(sm) != null;
+ return op.getObject() != null && op.getExecutionContext().getApiAdapter().getVersion(op) != null;
}
/**
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/request/InsertRequest.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -531,13 +531,13 @@
* Method to obtain the identity attributed by the datastore when using auto-increment/IDENTITY/SERIAL.
* @param ec execution context
* @param sqlControl SQLController
- * @param sm StateManager of the object
+ * @param op ObjectProvider of the object
* @param mconn The Connection
* @param ps PreparedStatement for the INSERT
* @return The identity
* @throws SQLException Thrown if an error occurs retrieving the identity
*/
- private Object getInsertedDatastoreIdentity(ExecutionContext ec, SQLController sqlControl, ObjectProvider sm,
+ private Object getInsertedDatastoreIdentity(ExecutionContext ec, SQLController sqlControl, ObjectProvider op,
ManagedConnection mconn, PreparedStatement ps)
throws SQLException
{
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractArrayStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractArrayStore.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractArrayStore.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -56,12 +56,12 @@
/**
* Accessor for the array from the datastore.
- * @param ownerSM SM for the owner
+ * @param op SM for the owner
* @return The array (as a List of objects)
*/
- public List getArray(ObjectProvider ownerSM)
+ public List getArray(ObjectProvider op)
{
- Iterator iter = iterator(ownerSM);
+ Iterator iter = iterator(op);
List elements = new ArrayList();
while (iter.hasNext())
{
@@ -75,36 +75,36 @@
/**
* Clear the association from owner to all elements. Observes the necessary dependent field settings
* with respect to whether it should delete the element when doing so.
- * @param ownerSM State Manager for the container.
+ * @param op ObjectProvider for the container.
*/
- public void clear(ObjectProvider ownerSM)
+ public void clear(ObjectProvider op)
{
Collection dependentElements = null;
if (ownerMemberMetaData.getArray().isDependentElement())
{
// Retain the dependent elements that need deleting after clearing
dependentElements = new HashSet();
- Iterator iter = iterator(ownerSM);
+ Iterator iter = iterator(op);
while (iter.hasNext())
{
dependentElements.add(iter.next());
}
}
- clearInternal(ownerSM);
+ clearInternal(op);
if (dependentElements != null && dependentElements.size() > 0)
{
- ownerSM.getExecutionContext().deleteObjects(dependentElements.toArray());
+ op.getExecutionContext().deleteObjects(dependentElements.toArray());
}
}
/**
* Method to set the array for the specified owner to the passed value.
- * @param ownerSM State Manager for the owner
+ * @param op ObjectProvider for the owner
* @param array the array
* @return Whether the array was updated successfully
*/
- public boolean set(ObjectProvider ownerSM, Object array)
+ public boolean set(ObjectProvider op, Object array)
{
if (array == null || Array.getLength(array) == 0)
{
@@ -112,7 +112,7 @@
}
// Validate all elements for writing
- ExecutionContext ec = ownerSM.getExecutionContext();
+ ExecutionContext ec = op.getExecutionContext();
int length = Array.getLength(array);
for (int i = 0; i < length; i++)
{
@@ -140,7 +140,7 @@
try
{
// Add the row to the join table
- int[] rc = internalAdd(ownerSM, element, mconn, batched, i, (i == length - 1));
+ int[] rc = internalAdd(op, element, mconn, batched, i, (i == length - 1));
if (rc != null)
{
for (int j = 0; j < rc.length; j++)
@@ -180,7 +180,7 @@
String msg = LOCALISER.msg("056009", ((Exception) exceptions.get(0)).getMessage());
NucleusLogger.DATASTORE.error(msg);
throw new NucleusDataStoreException(msg,
- (Throwable[]) exceptions.toArray(new Throwable[exceptions.size()]), ownerSM.getObject());
+ (Throwable[]) exceptions.toArray(new Throwable[exceptions.size()]), op.getObject());
}
return modified;
@@ -188,14 +188,14 @@
/**
* Adds one element to the association owner vs elements
- * @param sm State Manager for the container
+ * @param op ObjectProvider for the container
* @param element The element to add
* @param position The position to add this element at
* @return Whether it was successful
*/
- public boolean add(ObjectProvider sm, Object element, int position)
+ public boolean add(ObjectProvider op, Object element, int position)
{
- ExecutionContext ec = sm.getExecutionContext();
+ ExecutionContext ec = op.getExecutionContext();
validateElementForWriting(ec, element, null);
boolean modified = false;
@@ -207,7 +207,7 @@
try
{
// Add a row to the join table
- int[] returnCode = internalAdd(sm, element, mconn, false, position, true);
+ int[] returnCode = internalAdd(op, element, mconn, false, position, true);
if (returnCode[0] > 0)
{
modified = true;
@@ -228,7 +228,7 @@
/**
* Accessor for an iterator through the array elements.
- * @param ownerSM State Manager for the container.
+ * @param ownerSM ObjectProvider for the container.
* @return The Iterator
*/
public abstract Iterator iterator(ObjectProvider ownerSM);
@@ -274,7 +274,7 @@
/**
* Internal method to add a row to the join table.
* Used by add() and set() to add a row to the join table.
- * @param sm StateManager for the owner of the collection
+ * @param op ObjectProvider for the owner of the collection
* @param element The element to add the relation to
* @param conn The connection
* @param batched Whether we are batching
@@ -283,10 +283,10 @@
* @return Whether a row was inserted
* @throws SQLException Thrown if an error occurs
*/
- public int[] internalAdd(ObjectProvider sm, Object element, ManagedConnection conn, boolean batched, int orderId,
+ public int[] internalAdd(ObjectProvider op, Object element, ManagedConnection conn, boolean batched, int orderId,
boolean executeNow) throws MappedDatastoreException
{
- ExecutionContext ec = sm.getExecutionContext();
+ ExecutionContext ec = op.getExecutionContext();
SQLController sqlControl = storeMgr.getSQLController();
String addStmt = getAddStmt();
try
@@ -297,7 +297,7 @@
{
// Insert the join table row
int jdbcPosition = 1;
- jdbcPosition = BackingStoreHelper.populateOwnerInStatement(sm, ec, ps, jdbcPosition, this);
+ jdbcPosition = BackingStoreHelper.populateOwnerInStatement(op, ec, ps, jdbcPosition, this);
jdbcPosition = BackingStoreHelper.populateElementInStatement(ec, ps, element, jdbcPosition, getElementMapping());
jdbcPosition = BackingStoreHelper.populateOrderInStatement(ec, ps, orderId, jdbcPosition, getOrderMapping());
if (getRelationDiscriminatorMapping() != null)
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractCollectionStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractCollectionStore.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractCollectionStore.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -283,7 +283,7 @@
containerAlias, false);
// TODO Remove the "containerTable == " clause and make discriminator restriction part of the JoinTable statement too
- // Needs to pass TCK M-M relationship test. see contains(StateManager, Object) method also
+ // Needs to pass TCK M-M relationship test. see contains(ObjectProvider, Object) method also
if (elementInfo != null && containerTable == elementInfo[0].getDatastoreClass() &&
elementInfo[0].getDiscriminatorMapping() != null)
{
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractListStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractListStore.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractListStore.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -74,91 +74,91 @@
/**
* Accessor for an iterator through the list elements.
- * @param sm State Manager for the container.
+ * @param op ObjectProvider for the container.
* @return The Iterator
*/
- public Iterator iterator(ObjectProvider sm)
+ public Iterator iterator(ObjectProvider op)
{
- return listIterator(sm);
+ return listIterator(op);
}
/**
* Accessor for an iterator through the list elements.
- * @param sm State Manager for the container.
+ * @param op ObjectProvider for the container.
* @return The List Iterator
*/
- public ListIterator listIterator(ObjectProvider sm)
+ public ListIterator listIterator(ObjectProvider op)
{
- return listIterator(sm, -1, -1);
+ return listIterator(op, -1, -1);
}
/**
* Accessor for an iterator through the list elements.
- * @param ownerSM State Manager for the container.
+ * @param op ObjectProvider for the container.
* @param startIdx The start point in the list (only for indexed lists).
* @param endIdx The end point in the list (only for indexed lists).
* @return The List Iterator
*/
- protected abstract ListIterator listIterator(ObjectProvider ownerSM, int startIdx, int endIdx);
+ protected abstract ListIterator listIterator(ObjectProvider op, int startIdx, int endIdx);
/**
* Method to add an element to the List.
- * @param sm The state manager
+ * @param op The ObjectProvider
* @param element The element to remove
* @param size Size of the current list (if known, -1 if not)
* @return Whether it was added successfully.
*/
- public boolean add(ObjectProvider sm, Object element, int size)
+ public boolean add(ObjectProvider op, Object element, int size)
{
- return internalAdd(sm, 0, true, Collections.singleton(element), size);
+ return internalAdd(op, 0, true, Collections.singleton(element), size);
}
/**
* Method to add an element to the List.
* @param element The element to add.
* @param index The location to add at
- * @param sm The state manager.
+ * @param op The ObjectProvider.
*/
- public void add(ObjectProvider sm, Object element, int index, int size)
+ public void add(ObjectProvider op, Object element, int index, int size)
{
- internalAdd(sm, index, false, Collections.singleton(element), size);
+ internalAdd(op, index, false, Collections.singleton(element), size);
}
/**
* Method to add a collection of elements to the List.
- * @param sm The state manager
+ * @param op The ObjectProvider
* @param elements The elements to remove
* @param size Current size of the list (if known). -1 if not known
* @return Whether they were added successfully.
*/
- public boolean addAll(ObjectProvider sm, Collection elements, int size)
+ public boolean addAll(ObjectProvider op, Collection elements, int size)
{
- return internalAdd(sm, 0, true, elements, size);
+ return internalAdd(op, 0, true, elements, size);
}
/**
* Method to add all elements from a Collection to the List.
- * @param sm The state manager
+ * @param op The ObjectProvider
* @param elements The collection
* @param index The location to add at
* @param size Current size of the list (if known). -1 if not known
* @return Whether it was successful
*/
- public boolean addAll(ObjectProvider sm, Collection elements, int index, int size)
+ public boolean addAll(ObjectProvider op, Collection elements, int index, int size)
{
- return internalAdd(sm, index, false, elements, size);
+ return internalAdd(op, index, false, elements, size);
}
/**
* Internal method for adding an item to the List.
- * @param sm The state manager
+ * @param op The ObjectProvider
* @param startAt The start position
* @param atEnd Whether to add at the end
* @param elements The Collection of elements to add.
* @param size Current size of List (if known). -1 if not known
* @return Whether it was successful
*/
- protected abstract boolean internalAdd(ObjectProvider sm, int startAt, boolean atEnd, Collection elements, int size);
+ protected abstract boolean internalAdd(ObjectProvider op, int startAt, boolean atEnd, Collection elements, int size);
/**
* Method to retrieve an element from the List.
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractMapStore.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -159,11 +159,11 @@
/**
* Method to check if a key exists in the Map.
- * @param sm State Manager for the map
+ * @param op ObjectProvider for the map
* @param key The key to check for.
* @return Whether the key exists in the Map.
*/
- public boolean containsKey(ObjectProvider sm, Object key)
+ public boolean containsKey(ObjectProvider op, Object key)
{
if( key == null )
{
@@ -172,7 +172,7 @@
}
try
{
- getValue(sm, key);
+ getValue(op, key);
return true;
}
catch (NoSuchElementException e)
@@ -183,18 +183,18 @@
/**
* Method to check if a value exists in the Map.
- * @param sm State Manager for the map
+ * @param op ObjectProvider for the map
* @param value The value to check for.
* @return Whether the value exists in the Map.
*/
- public boolean containsValue(ObjectProvider sm, Object value)
+ public boolean containsValue(ObjectProvider op, Object value)
{
if (value == null)
{
//nulls not allowed
return false;
}
- if (!validateValueForReading(sm, value))
+ if (!validateValueForReading(op, value))
{
return false;
}
@@ -202,7 +202,7 @@
boolean exists = false;
try
{
- ExecutionContext ec = sm.getExecutionContext();
+ ExecutionContext ec = op.getExecutionContext();
ManagedConnection mconn = storeMgr.getConnection(ec);
SQLController sqlControl = storeMgr.getSQLController();
try
@@ -211,7 +211,7 @@
try
{
int jdbcPosition = 1;
- jdbcPosition = BackingStoreHelper.populateOwnerInStatement(sm, ec, ps, jdbcPosition, this);
+ jdbcPosition = BackingStoreHelper.populateOwnerInStatement(op, ec, ps, jdbcPosition, this);
BackingStoreHelper.populateValueInStatement(ec, ps, value, jdbcPosition, getValueMapping());
ResultSet rs = sqlControl.executeStatementQuery(ec, mconn, containsValueStmt, ps);
@@ -249,15 +249,15 @@
/**
* Method to return the value for a key.
- * @param sm State Manager for the Map.
+ * @param op ObjectProvider for the Map.
* @param key The key of the object to retrieve.
* @return The value for this key.
*/
- public Object get(ObjectProvider sm, Object key)
+ public Object get(ObjectProvider op, Object key)
{
try
{
- return getValue(sm, key);
+ return getValue(op, key);
}
catch (NoSuchElementException e)
{
@@ -267,17 +267,17 @@
/**
* Method to put all elements from a Map into our Map.
- * @param sm State Manager for the Map
+ * @param op ObjectProvider for the Map
* @param m The Map to add
*/
- public void putAll(ObjectProvider sm, Map m)
+ public void putAll(ObjectProvider op, Map m)
{
Iterator i = m.entrySet().iterator();
while (i.hasNext())
{
Map.Entry e = (Map.Entry)i.next();
- put(sm, e.getKey(), e.getValue());
+ put(op, e.getKey(), e.getValue());
}
}
@@ -323,17 +323,17 @@
/**
* Utility to validate a key is ok for reading.
- * @param sm State Manager for the map.
+ * @param op ObjectProvider for the map.
* @param key The key to check.
* @return Whether it is validated.
*/
- protected boolean validateKeyForReading(ObjectProvider sm, Object key)
+ protected boolean validateKeyForReading(ObjectProvider op, Object key)
{
- validateKeyType(sm.getExecutionContext().getClassLoaderResolver(), key);
+ validateKeyType(op.getExecutionContext().getClassLoaderResolver(), key);
if (!keysAreEmbedded && !keysAreSerialised)
{
- ExecutionContext ec = sm.getExecutionContext();
+ ExecutionContext ec = op.getExecutionContext();
if (key!=null && (!ec.getApiAdapter().isPersistent(key) ||
ec != ec.getApiAdapter().getExecutionContext(key)) && !ec.getApiAdapter().isDetached(key))
{
@@ -346,17 +346,17 @@
/**
* Utility to validate a value is ok for reading.
- * @param sm State Manager for the map.
+ * @param op ObjectProvider for the map.
* @param value The value to check.
* @return Whether it is validated.
*/
- protected boolean validateValueForReading(ObjectProvider sm, Object value)
+ protected boolean validateValueForReading(ObjectProvider op, Object value)
{
- validateValueType(sm.getExecutionContext().getClassLoaderResolver(), value);
+ validateValueType(op.getExecutionContext().getClassLoaderResolver(), value);
if (!valuesAreEmbedded && !valuesAreSerialised)
{
- ExecutionContext ec = sm.getExecutionContext();
+ ExecutionContext ec = op.getExecutionContext();
if (value != null && (!ec.getApiAdapter().isPersistent(value) ||
ec != ec.getApiAdapter().getExecutionContext(value)) && !ec.getApiAdapter().isDetached(value))
{
@@ -399,22 +399,22 @@
/**
* Method to retrieve a value from the Map given the key.
- * @param sm State Manager for the map.
+ * @param op ObjectProvider for the map.
* @param key The key to retrieve the value for.
* @return The value for this key
* @throws NoSuchElementException if the value for the key was not found
*/
- protected abstract Object getValue(ObjectProvider sm, Object key)
+ protected abstract Object getValue(ObjectProvider op, Object key)
throws NoSuchElementException;
/**
* Method to update a field of an embedded key.
- * @param sm State Manager of the owner
+ * @param op ObjectProvider of the owner
* @param key The key to update
* @param fieldNumber The number of the field to update
* @param newValue The new value
*/
- public boolean updateEmbeddedKey(ObjectProvider sm, Object key, int fieldNumber, Object newValue)
+ public boolean updateEmbeddedKey(ObjectProvider op, Object key, int fieldNumber, Object newValue)
{
boolean modified = false;
if (keyMapping != null && keyMapping instanceof EmbeddedKeyPCMapping)
@@ -431,7 +431,7 @@
// We have no mapping for this field so presumably is the owner field or a PK field
return false;
}
- modified = updatedEmbeddedKey(sm, key, fieldNumber, newValue, fieldMapping);
+ modified = updatedEmbeddedKey(op, key, fieldNumber, newValue, fieldMapping);
}
return modified;
@@ -439,12 +439,12 @@
/**
* Method to update a field of an embedded key.
- * @param sm State Manager of the owner
+ * @param op ObjectProvider of the owner
* @param value The value to update
* @param fieldNumber The number of the field to update
* @param newValue The new value
*/
- public boolean updateEmbeddedValue(ObjectProvider sm, Object value, int fieldNumber, Object newValue)
+ public boolean updateEmbeddedValue(ObjectProvider op, Object value, int fieldNumber, Object newValue)
{
boolean modified = false;
if (valueMapping != null && valueMapping instanceof EmbeddedValuePCMapping)
@@ -461,7 +461,7 @@
// We have no mapping for this field so presumably is the owner field or a PK field
return false;
}
- modified = updateEmbeddedValue(sm, value, fieldNumber, newValue, fieldMapping);
+ modified = updateEmbeddedValue(op, value, fieldNumber, newValue, fieldMapping);
}
return modified;
@@ -535,14 +535,14 @@
return stmt.toString();
}
- public boolean updateEmbeddedValue(ObjectProvider sm, Object value, int fieldNumber, Object newValue,
+ public boolean updateEmbeddedValue(ObjectProvider op, Object value, int fieldNumber, Object newValue,
JavaTypeMapping fieldMapping)
{
boolean modified;
String stmt = getUpdateEmbeddedValueStmt(fieldMapping, getOwnerMapping(), getValueMapping(), getMapTable());
try
{
- ExecutionContext ec = sm.getExecutionContext();
+ ExecutionContext ec = op.getExecutionContext();
ManagedConnection mconn = storeMgr.getConnection(ec);
SQLController sqlControl = storeMgr.getSQLController();
@@ -554,9 +554,9 @@
int jdbcPosition = 1;
fieldMapping.setObject(ec, ps, MappingHelper.getMappingIndices(jdbcPosition, fieldMapping), newValue);
jdbcPosition += fieldMapping.getNumberOfDatastoreMappings();
- jdbcPosition = BackingStoreHelper.populateOwnerInStatement(sm, ec, ps, jdbcPosition, this);
+ jdbcPosition = BackingStoreHelper.populateOwnerInStatement(op, ec, ps, jdbcPosition, this);
jdbcPosition = BackingStoreHelper.populateEmbeddedValueFieldsInStatement(
- sm, value, ps, jdbcPosition, (JoinTable)getMapTable(), this);
+ op, value, ps, jdbcPosition, (JoinTable)getMapTable(), this);
sqlControl.executeStatementUpdate(ec, mconn, stmt, ps, true);
modified = true;
}
@@ -683,14 +683,14 @@
return stmt.toString();
}
- public boolean updatedEmbeddedKey(ObjectProvider sm, Object key, int fieldNumber, Object newValue,
+ public boolean updatedEmbeddedKey(ObjectProvider op, Object key, int fieldNumber, Object newValue,
JavaTypeMapping fieldMapping)
{
boolean modified;
String stmt = getUpdateEmbeddedKeyStmt(fieldMapping, getOwnerMapping(), getKeyMapping(), getMapTable());
try
{
- ExecutionContext ec = sm.getExecutionContext();
+ ExecutionContext ec = op.getExecutionContext();
ManagedConnection mconn = storeMgr.getConnection(ec);
SQLController sqlControl = storeMgr.getSQLController();
@@ -702,8 +702,8 @@
int jdbcPosition = 1;
fieldMapping.setObject(ec, ps, MappingHelper.getMappingIndices(jdbcPosition, fieldMapping), key);
jdbcPosition += fieldMapping.getNumberOfDatastoreMappings();
- jdbcPosition = BackingStoreHelper.populateOwnerInStatement(sm, ec, ps, jdbcPosition, this);
- jdbcPosition = BackingStoreHelper.populateEmbeddedKeyFieldsInStatement(sm, key, ps, jdbcPosition,
+ jdbcPosition = BackingStoreHelper.populateOwnerInStatement(op, ec, ps, jdbcPosition, this);
+ jdbcPosition = BackingStoreHelper.populateEmbeddedKeyFieldsInStatement(op, key, ps, jdbcPosition,
(JoinTable)getMapTable(), this);
sqlControl.executeStatementUpdate(ec, mconn, stmt, ps, true);
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractSetStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractSetStore.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/AbstractSetStore.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -62,7 +62,7 @@
/**
* Accessor for an iterator for the set.
* Implemented by the subclass using whatever mechanism the underlying datastore provides.
- * @param op State Manager for the set.
+ * @param op ObjectProvider for the set.
* @return Iterator for the set.
*/
public abstract Iterator iterator(ObjectProvider op);
@@ -236,7 +236,7 @@
* each element 1 at a time. Please refer to the JoinSetStore and
* FKSetStore for the variations used there.
* This is used for Map key and value stores.
- * @param op State Manager for the container
+ * @param op ObjectProvider for the container
* @param elements Collection of elements to remove
* @return Whether the database was updated
*/
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/ArrayStoreIterator.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/ArrayStoreIterator.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/ArrayStoreIterator.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -46,16 +46,16 @@
/**
* Constructor.
- * @param sm the StateManager
+ * @param op the ObjectProvider
* @param rs the ResultSet
* @param rof the Query.ResultObjectFactory
* @throws MappedDatastoreException
*/
- public ArrayStoreIterator(ObjectProvider sm, Object rs, ResultObjectFactory rof,
+ public ArrayStoreIterator(ObjectProvider op, Object rs, ResultObjectFactory rof,
ElementContainerStore backingStore)
throws MappedDatastoreException
{
- this.ec = sm.getExecutionContext();
+ this.ec = op.getExecutionContext();
ArrayList results = new ArrayList();
if (rs != null)
{
@@ -79,7 +79,7 @@
{
ownerFieldNumber = getOwnerFieldMetaData(backingStore.getContainerTable()).getAbsoluteFieldNumber();
}
- nextElement = elementMapping.getObject(ec, rs, param, sm, ownerFieldNumber);
+ nextElement = elementMapping.getObject(ec, rs, param, op, ownerFieldNumber);
}
else
{
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/BackingStoreHelper.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/BackingStoreHelper.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/BackingStoreHelper.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -46,14 +46,14 @@
{
/**
* Convenience method to populate the passed PreparedStatement with the value from the owner.
- * @param sm State Manager
+ * @param op ObjectProvider
* @param ec execution context
* @param ps The PreparedStatement
* @param jdbcPosition Position in JDBC statement to populate
* @param bcs Base container backing store
* @return The next position in the JDBC statement
*/
- public static int populateOwnerInStatement(ObjectProvider sm, ExecutionContext ec, Object ps,
+ public static int populateOwnerInStatement(ObjectProvider op, ExecutionContext ec, Object ps,
int jdbcPosition, BaseContainerStore bcs)
{
if (!bcs.getStoreManager().insertValuesOnInsert(bcs.getOwnerMapping().getDatastoreMapping(0)))
@@ -66,13 +66,13 @@
{
bcs.getOwnerMapping().setObject(ec, ps,
MappingHelper.getMappingIndices(jdbcPosition, bcs.getOwnerMapping()),
- sm.getObject(), sm, bcs.getOwnerMemberMetaData().getAbsoluteFieldNumber());
+ op.getObject(), op, bcs.getOwnerMemberMetaData().getAbsoluteFieldNumber());
}
else
{
bcs.getOwnerMapping().setObject(ec, ps,
MappingHelper.getMappingIndices(jdbcPosition, bcs.getOwnerMapping()),
- sm.getObject());
+ op.getObject());
}
return jdbcPosition + bcs.getOwnerMapping().getNumberOfDatastoreMappings();
}
@@ -294,7 +294,7 @@
/**
* Convenience method to populate the passed PreparedStatement with the field values from
* the embedded element starting at the specified jdbc position.
- * @param sm State Manager of the owning container
+ * @param op ObjectProvider of the owning container
* @param element The embedded element
* @param ps The PreparedStatement
* @param jdbcPosition JDBC position in the statement to start at
@@ -302,7 +302,7 @@
* @param bcs Container store
* @return The next JDBC position
*/
- public static int populateEmbeddedElementFieldsInStatement(ObjectProvider sm, Object element, Object ps,
+ public static int populateEmbeddedElementFieldsInStatement(ObjectProvider op, Object element, Object ps,
int jdbcPosition, AbstractMemberMetaData ownerFieldMetaData, JavaTypeMapping elementMapping,
AbstractClassMetaData emd, BaseContainerStore bcs)
{
@@ -324,7 +324,7 @@
mappingDefinition.addMappingForMember(absFieldNum, stmtMapping);
}
- ObjectProvider elementSM = bcs.getStateManagerForEmbeddedPCObject(sm, element, ownerFieldMetaData,
+ ObjectProvider elementSM = bcs.getObjectProviderForEmbeddedPCObject(op, element, ownerFieldMetaData,
ObjectProvider.EMBEDDED_COLLECTION_ELEMENT_PC);
elementSM.provideFields(elementFieldNumbers,
elementMapping.getStoreManager().getFieldManagerForStatementGeneration(elementSM, ps, mappingDefinition, true));
@@ -335,7 +335,7 @@
/**
* Convenience method to populate the passed PreparedStatement with the field values from
* the embedded map key starting at the specified jdbc position.
- * @param sm State Manager of the owning container
+ * @param op ObjectProvider of the owning container
* @param key The embedded key
* @param ps The PreparedStatement
* @param jdbcPosition JDBC position in the statement to start at
@@ -343,7 +343,7 @@
* @param mapStore the map store
* @return The next JDBC position
*/
- public static int populateEmbeddedKeyFieldsInStatement(ObjectProvider sm, Object key,
+ public static int populateEmbeddedKeyFieldsInStatement(ObjectProvider op, Object key,
PreparedStatement ps, int jdbcPosition, JoinTable joinTable, AbstractMapStore mapStore)
{
AbstractClassMetaData kmd = mapStore.getKmd();
@@ -365,7 +365,7 @@
mappingDefinition.addMappingForMember(absFieldNum, stmtMapping);
}
- ObjectProvider elementSM = mapStore.getStateManagerForEmbeddedPCObject(sm, key,
+ ObjectProvider elementSM = mapStore.getObjectProviderForEmbeddedPCObject(op, key,
joinTable.getOwnerMemberMetaData(), ObjectProvider.EMBEDDED_MAP_KEY_PC);
elementSM.provideFields(elementFieldNumbers,
embeddedMapping.getStoreManager().getFieldManagerForStatementGeneration(elementSM, ps, mappingDefinition, true));
@@ -376,7 +376,7 @@
/**
* Convenience method to populate the passed PreparedStatement with the field values from
* the embedded map value starting at the specified jdbc position.
- * @param sm State Manager of the owning container
+ * @param op ObjectProvider of the owning container
* @param value The embedded value
* @param ps The PreparedStatement
* @param jdbcPosition JDBC position in the statement to start at
@@ -384,7 +384,7 @@
* @param mapStore The map store
* @return The next JDBC position
*/
- public static int populateEmbeddedValueFieldsInStatement(ObjectProvider sm, Object value,
+ public static int populateEmbeddedValueFieldsInStatement(ObjectProvider op, Object value,
PreparedStatement ps, int jdbcPosition, JoinTable joinTable, AbstractMapStore mapStore)
{
AbstractClassMetaData vmd = mapStore.getVmd();
@@ -406,7 +406,7 @@
mappingDefinition.addMappingForMember(absFieldNum, stmtMapping);
}
- ObjectProvider elementSM = mapStore.getStateManagerForEmbeddedPCObject(sm, value,
+ ObjectProvider elementSM = mapStore.getObjectProviderForEmbeddedPCObject(op, value,
joinTable.getOwnerMemberMetaData(), ObjectProvider.EMBEDDED_MAP_VALUE_PC);
elementSM.provideFields(elementFieldNumbers,
embeddedMapping.getStoreManager().getFieldManagerForStatementGeneration(elementSM, ps, mappingDefinition, true));
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/BaseContainerStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/BaseContainerStore.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/BaseContainerStore.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -118,22 +118,22 @@
}
/**
- * Method to return the StateManager for an embedded PC object (element, key, value).
+ * Method to return the ObjectProvider for an embedded PC object (element, key, value).
* It creates one if the element is not currently managed.
- * @param sm State Manager of the owner
+ * @param op ObjectProvider of the owner
* @param obj The embedded PC object
* @param ownerMmd The meta data for the owner field
* @param pcType Object type for the embedded object (see ObjectProvider EMBEDDED_PC etc)
- * @return The state manager
+ * @return The ObjectProvider
*/
- public ObjectProvider getStateManagerForEmbeddedPCObject(ObjectProvider sm, Object obj,
+ public ObjectProvider getObjectProviderForEmbeddedPCObject(ObjectProvider op, Object obj,
AbstractMemberMetaData ownerMmd, short pcType)
{
- ExecutionContext ec = sm.getExecutionContext();
+ ExecutionContext ec = op.getExecutionContext();
ObjectProvider objSM = ec.findObjectProvider(obj);
if (objSM == null)
{
- objSM = ec.newObjectProviderForEmbedded(obj, false, sm, ownerMmd.getAbsoluteFieldNumber());
+ objSM = ec.newObjectProviderForEmbedded(obj, false, op, ownerMmd.getAbsoluteFieldNumber());
}
objSM.setPcObjectType(pcType);
return objSM;
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/ElementContainerStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/ElementContainerStore.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/ElementContainerStore.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -329,20 +329,20 @@
/**
* Method to check if an element is already persistent or is persistent but managed by
* a different persistence manager.
- * @param sm The state manager of this owner
+ * @param op The ObjectProvider of this owner
* @param element The element
* @return Whether it is valid for reading.
*/
- protected boolean validateElementForReading(ObjectProvider sm, Object element)
+ protected boolean validateElementForReading(ObjectProvider op, Object element)
{
- if (!validateElementType(sm.getExecutionContext().getClassLoaderResolver(), element))
+ if (!validateElementType(op.getExecutionContext().getClassLoaderResolver(), element))
{
return false;
}
if (element != null && !elementsAreEmbedded && !elementsAreSerialised)
{
- ExecutionContext ec = sm.getExecutionContext();
+ ExecutionContext ec = op.getExecutionContext();
if ((!ec.getApiAdapter().isPersistent(element) ||
ec != ec.getApiAdapter().getExecutionContext(element)) && !ec.getApiAdapter().isDetached(element))
{
@@ -381,7 +381,7 @@
ObjectProvider elementSM = ec.findObjectProvider(element);
if (elementSM != null && elementSM.isEmbedded())
{
- // Element is already with StateManager and is embedded in another field!
+ // Element is already with ObjectProvider and is embedded in another field!
throw new NucleusUserException(LOCALISER.msg("056028",
ownerMemberMetaData.getFullFieldName(), element));
}
@@ -393,7 +393,7 @@
/**
* Accessor for an iterator through the container elements.
- * @param ownerSM State Manager for the container.
+ * @param ownerSM ObjectProvider for the container.
* @return The Iterator
*/
public abstract Iterator iterator(ObjectProvider ownerSM);
@@ -401,7 +401,7 @@
/**
* Clear the association from owner to all elements.
* Provides cascade-delete when the elements being deleted are PC types.
- * @param ownerSM State Manager for the container.
+ * @param ownerSM ObjectProvider for the container.
*/
public void clear(ObjectProvider ownerSM)
{
@@ -445,12 +445,12 @@
/**
* Method to return the size of the container.
- * @param sm The state manager.
+ * @param op The ObjectProvider.
* @return The size.
*/
- public int size(ObjectProvider sm)
+ public int size(ObjectProvider op)
{
- return getSize(sm);
+ return getSize(op);
}
/**
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/ListStoreIterator.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/ListStoreIterator.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/ListStoreIterator.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -38,7 +38,7 @@
*/
public abstract class ListStoreIterator implements ListIterator
{
- private final ObjectProvider sm;
+ private final ObjectProvider op;
private final ListIterator delegate;
@@ -50,18 +50,18 @@
/**
* Constructor
- * @param sm the StateManager
+ * @param op the ObjectProvider
* @param resultSet the ResultSet
* @param rof the Query.ResultObjectFactory
* @throws SQLException
*/
- public ListStoreIterator(ObjectProvider sm, Object resultSet, ResultObjectFactory rof, AbstractListStore als)
+ public ListStoreIterator(ObjectProvider op, Object resultSet, ResultObjectFactory rof, AbstractListStore als)
throws MappedDatastoreException
{
- this.sm = sm;
+ this.op = op;
this.abstractListStore = als;
- ExecutionContext ec = sm.getExecutionContext();
+ ExecutionContext ec = op.getExecutionContext();
ArrayList results = new ArrayList();
if (resultSet != null)
{
@@ -91,7 +91,7 @@
ownerFieldNumber =
getOwnerMemberMetaData(abstractListStore.containerTable).getAbsoluteFieldNumber();
}
- nextElement = elementMapping.getObject(ec, resultSet, param, sm, ownerFieldNumber);
+ nextElement = elementMapping.getObject(ec, resultSet, param, op, ownerFieldNumber);
}
else
{
@@ -123,7 +123,7 @@
public void add(Object o)
{
currentIndex = delegate.nextIndex();
- abstractListStore.add(sm, o, currentIndex, -1);
+ abstractListStore.add(op, o, currentIndex, -1);
delegate.add(o);
lastElement = null;
}
@@ -171,7 +171,7 @@
throw new IllegalStateException("No entry to remove");
}
- abstractListStore.remove(sm, currentIndex, -1);
+ abstractListStore.remove(op, currentIndex, -1);
delegate.remove();
lastElement = null;
@@ -185,7 +185,7 @@
throw new IllegalStateException("No entry to replace");
}
- abstractListStore.set(sm, currentIndex, o, true);
+ abstractListStore.set(op, currentIndex, o, true);
delegate.set(o);
lastElement = o;
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKArrayStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKArrayStore.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKArrayStore.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -202,7 +202,7 @@
/**
* Update a FK and element position in the element.
- * @param ownerSM StateManager for the owner
+ * @param ownerSM ObjectProvider for the owner
* @param element The element to update
* @param owner The owner object to set in the FK
* @param index The index position (or -1 if not known)
@@ -349,7 +349,7 @@
/**
* Method to clear the Array.
* This is called when the container object is being deleted and the elements are to be removed (maybe for dependent field).
- * @param ownerSM The state manager
+ * @param ownerSM The ObjectProvider
*/
public void clear(ObjectProvider ownerSM)
{
@@ -489,7 +489,7 @@
/**
* Method to set the array for the specified owner to the passed value.
- * @param ownerSM State Manager for the owner
+ * @param ownerSM ObjectProvider for the owner
* @param array the array
* @return Whether the array was updated successfully
*/
@@ -519,7 +519,7 @@
/**
* Accessor for an iterator for the set.
- * @param ownerSM State Manager for the set.
+ * @param ownerSM ObjectProvider for the set.
* @return Iterator for the set.
*/
public Iterator iterator(ObjectProvider ownerSM)
@@ -602,7 +602,7 @@
* Method to generate an SQLStatement for iterating through elements of the set.
* Selects the element table.
* Populates the iteratorMappingDef and iteratorMappingParams.
- * @param ownerSM StateManager for the owner object
+ * @param ownerSM ObjectProvider for the owner object
* @return The SQLStatement
*/
protected SQLStatement getSQLStatementForIterator(ObjectProvider ownerSM)
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKListStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKListStore.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKListStore.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -622,7 +622,7 @@
/**
* Convenience method to manage the removal of an element from the collection, performing
* any necessary "managed relationship" updates when the field is bidirectional.
- * @param ownerSM StateManager for the collection owner
+ * @param ownerSM ObjectProvider for the collection owner
* @param element The element
*/
protected void manageRemovalOfElement(ObjectProvider ownerSM, Object element)
@@ -634,7 +634,7 @@
// Managed Relations : 1-N bidirectional so null the owner on the elements
if (!om.getApiAdapter().isDeleted(element))
{
- StateManager elementSM = om.findStateManager(element);
+ ObjectProvider elementSM = om.findObjectProvider(element);
if (elementSM != null)
{
// Null the owner of the element
@@ -807,17 +807,17 @@
/**
* Method to validate that an element is valid for writing to the datastore.
* TODO Minimise differences to super.validateElementForWriting()
- * @param sm StateManager for the List
+ * @param op ObjectProvider for the List
* @param element The element to validate
* @param index The position that the element is being stored at in the list
* @return Whether the element was inserted
*/
- protected boolean validateElementForWriting(final ObjectProvider sm, Object element, final int index)
+ protected boolean validateElementForWriting(final ObjectProvider op, Object element, final int index)
{
- final Object newOwner = sm.getObject();
+ final Object newOwner = op.getObject();
// Check if element is ok for use in the datastore, specifying any external mappings that may be required
- boolean inserted = super.validateElementForWriting(sm.getExecutionContext(), element, new FieldValues()
+ boolean inserted = super.validateElementForWriting(op.getExecutionContext(), element, new FieldValues()
{
public void fetchFields(ObjectProvider esm)
{
@@ -858,7 +858,7 @@
if (externalFKMapping != null)
{
// The element has an external FK mapping so set the value it needs to use in the INSERT
- esm.setAssociatedValue(externalFKMapping, sm.getObject());
+ esm.setAssociatedValue(externalFKMapping, op.getObject());
}
if (relationDiscriminatorMapping != null)
{
@@ -898,22 +898,22 @@
{
// No owner, so correct it
NucleusLogger.PERSISTENCE.info(LOCALISER.msg("056037",
- sm.getObjectAsPrintable(), ownerMemberMetaData.getFullFieldName(),
+ op.getObjectAsPrintable(), ownerMemberMetaData.getFullFieldName(),
StringUtils.toJVMIDString(esm.getObject())));
esm.replaceFieldMakeDirty(ownerFieldNumber, newOwner);
}
- else if (currentOwner != newOwner && sm.getReferencedPC() == null)
+ else if (currentOwner != newOwner && op.getReferencedPC() == null)
{
// Owner of the element is neither this container nor is it being attached
// Inconsistent owner, so throw exception
throw new NucleusUserException(LOCALISER.msg("056038",
- sm.getObjectAsPrintable(), ownerMemberMetaData.getFullFieldName(),
+ op.getObjectAsPrintable(), ownerMemberMetaData.getFullFieldName(),
StringUtils.toJVMIDString(esm.getObject()),
StringUtils.toJVMIDString(currentOwner)));
}
}
}
- public void fetchNonLoadedFields(ObjectProvider sm)
+ public void fetchNonLoadedFields(ObjectProvider op)
{
}
public FetchPlan getFetchPlanForLoading()
@@ -927,14 +927,14 @@
/**
* Accessor for an iterator through the list elements.
- * @param ownerSM State Manager for the container.
+ * @param op ObjectProvider for the container.
* @param startIdx The start index in the list (only for indexed lists)
* @param endIdx The end index in the list (only for indexed lists)
* @return The List Iterator
*/
- protected ListIterator listIterator(ObjectProvider ownerSM, int startIdx, int endIdx)
+ protected ListIterator listIterator(ObjectProvider op, int startIdx, int endIdx)
{
- ExecutionContext ec = ownerSM.getExecutionContext();
+ ExecutionContext ec = op.getExecutionContext();
Transaction tx = ec.getTransaction();
boolean useUpdateLock = tx.lockReadObjects();
@@ -952,7 +952,7 @@
// Generate the statement, and statement mapping/parameter information
iteratorMappingDef = new StatementClassMapping();
iteratorMappingParams = new StatementParameterMapping();
- SQLStatement sqlStmt = getSQLStatementForIterator(ownerSM, startIdx, endIdx,
+ SQLStatement sqlStmt = getSQLStatementForIterator(op, startIdx, endIdx,
iteratorMappingDef, iteratorMappingParams);
iteratorStmtUnlocked = sqlStmt.getSelectStatement().toSQL();
sqlStmt.addExtension("lock-for-update", true);
@@ -968,7 +968,7 @@
// Iteration over a range so generate statement on the fly (uncached)
resultDefinition = new StatementClassMapping();
paramDefinition = new StatementParameterMapping();
- SQLStatement sqlStmt = getSQLStatementForIterator(ownerSM, startIdx, endIdx, resultDefinition,
+ SQLStatement sqlStmt = getSQLStatementForIterator(op, startIdx, endIdx, resultDefinition,
paramDefinition);
sqlStmt.addExtension("lock-for-update", useUpdateLock);
stmt = sqlStmt.getSelectStatement().toSQL();
@@ -987,7 +987,7 @@
for (int paramInstance=0;paramInstance<numParams;paramInstance++)
{
ownerIdx.getMapping().setObject(ec, ps,
- ownerIdx.getParameterPositionsForOccurrence(paramInstance), ownerSM.getObject());
+ ownerIdx.getParameterPositionsForOccurrence(paramInstance), op.getObject());
}
try
@@ -1006,7 +1006,7 @@
clr.classForName(elementType));
}
- return new RDBMSListStoreIterator(ownerSM, rs, rof, this);
+ return new RDBMSListStoreIterator(op, rs, rof, this);
}
finally
{
@@ -1037,7 +1037,7 @@
* Method to generate an SQLStatement for iterating through elements of the list.
* Selects the element table.
* Populates the resultMapping and paramMapping argument objects.
- * @param ownerSM StateManager for the owner object
+ * @param ownerSM ObjectProvider for the owner object
* @param startIdx start index to be retrieved (inclusive). Only for indexed list
* @param endIdx end index to be retrieved (exclusive). Only for indexed list
* @param resultMapping Mapping for the candidate result columns
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKMapStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKMapStore.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKMapStore.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -392,37 +392,37 @@
/**
* Utility to update a foreign-key in the value in the case of a unidirectional 1-N relationship.
- * @param sm StateManager for the owner
+ * @param op ObjectProvider for the owner
* @param value The value to update
* @param owner The owner object to set in the FK
* @return Whether it was performed successfully
*/
- private boolean updateValueFk(ObjectProvider sm, Object value, Object owner)
+ private boolean updateValueFk(ObjectProvider op, Object value, Object owner)
{
if (value == null)
{
return false;
}
- validateValueForWriting(sm, value);
- return updateValueFkInternal(sm, value, owner);
+ validateValueForWriting(op, value);
+ return updateValueFkInternal(op, value, owner);
}
/**
* Utility to update a foreign-key in the key in the case of
* a unidirectional 1-N relationship.
- * @param sm StateManager for the owner
+ * @param op ObjectProvider for the owner
* @param key The key to update
* @param owner The owner object to set in the FK
* @return Whether it was performed successfully
*/
- private boolean updateKeyFk(ObjectProvider sm, Object key, Object owner)
+ private boolean updateKeyFk(ObjectProvider op, Object key, Object owner)
{
if (key == null)
{
return false;
}
- validateKeyForWriting(sm, key);
- return updateKeyFkInternal(sm, key, owner);
+ validateKeyForWriting(op, key);
+ return updateKeyFkInternal(op, key, owner);
}
/**
@@ -442,26 +442,26 @@
/**
* Method to put an item in the Map.
- * @param sm State Manager for the map.
+ * @param op ObjectProvider for the map.
* @param newKey The key to store the value against
* @param newValue The value to store.
* @return The value stored.
**/
- public Object put(final ObjectProvider sm, final Object newKey, Object newValue)
+ public Object put(final ObjectProvider op, final Object newKey, Object newValue)
{
if (keyFieldNumber >= 0)
{
- validateKeyForWriting(sm, newKey);
- validateValueType(sm.getExecutionContext().getClassLoaderResolver(), newValue);
+ validateKeyForWriting(op, newKey);
+ validateValueType(op.getExecutionContext().getClassLoaderResolver(), newValue);
}
else
{
- validateKeyType(sm.getExecutionContext().getClassLoaderResolver(), newKey);
- validateValueForWriting(sm, newValue);
+ validateKeyType(op.getExecutionContext().getClassLoaderResolver(), newKey);
+ validateValueForWriting(op, newValue);
}
// Check if there is an existing value for this key
- Object oldValue = get(sm, newKey);
+ Object oldValue = get(op, newKey);
if (oldValue != newValue)
{
if (vmd != null)
@@ -469,11 +469,11 @@
if (oldValue != null && !oldValue.equals(newValue))
{
// Key is stored in the value and the value has changed so remove the old value
- removeValue(sm, newKey, oldValue);
+ removeValue(op, newKey, oldValue);
}
- ExecutionContext ec = sm.getExecutionContext();
- final Object newOwner = sm.getObject();
+ ExecutionContext ec = op.getExecutionContext();
+ final Object newOwner = op.getObject();
if (ec.getApiAdapter().isPersistent(newValue))
{
@@ -506,7 +506,7 @@
}
else
{
- updateValueFk(sm, newValue, newOwner);
+ updateValueFk(op, newValue, newOwner);
}
// Ensure the current key field is loaded, and replace with new value
@@ -542,10 +542,10 @@
if (externalFKMapping != null)
{
// Set the owner in the value object where appropriate
- vsm.setAssociatedValue(externalFKMapping, sm.getObject());
+ vsm.setAssociatedValue(externalFKMapping, op.getObject());
}
}
- public void fetchNonLoadedFields(ObjectProvider sm)
+ public void fetchNonLoadedFields(ObjectProvider op)
{
}
public FetchPlan getFetchPlanForLoading()
@@ -558,8 +558,8 @@
else
{
// Value is stored in the key
- ExecutionContext ec = sm.getExecutionContext();
- final Object newOwner = sm.getObject();
+ ExecutionContext ec = op.getExecutionContext();
+ final Object newOwner = op.getObject();
if (ec.getApiAdapter().isPersistent(newKey))
{
@@ -593,7 +593,7 @@
}
else
{
- updateKeyFk(sm, newKey, newOwner);
+ updateKeyFk(op, newKey, newOwner);
}
// Ensure the current value field is loaded, and replace with new value
@@ -631,10 +631,10 @@
if (externalFKMapping != null)
{
// Set the owner in the value object where appropriate
- vsm.setAssociatedValue(externalFKMapping, sm.getObject());
+ vsm.setAssociatedValue(externalFKMapping, op.getObject());
}
}
- public void fetchNonLoadedFields(ObjectProvider sm)
+ public void fetchNonLoadedFields(ObjectProvider op)
{
}
public FetchPlan getFetchPlanForLoading()
@@ -657,9 +657,9 @@
if (ownerMemberMetaData.getMap().isDependentValue() && oldValue != null)
{
// Delete the old value if it is no longer contained and is dependent
- if (!containsValue(sm, oldValue))
+ if (!containsValue(op, oldValue))
{
- sm.getExecutionContext().deleteObjectInternal(oldValue);
+ op.getExecutionContext().deleteObjectInternal(oldValue);
}
}
@@ -668,15 +668,15 @@
/**
* Method to remove an entry from the map.
- * @param sm State Manager for the map.
+ * @param op ObjectProvider for the map.
* @param key Key of the entry to remove.
* @return The value that was removed.
*/
- public Object remove(ObjectProvider sm, Object key)
+ public Object remove(ObjectProvider op, Object key)
{
- Object oldValue = get(sm, key);
+ Object oldValue = get(op, key);
- ExecutionContext ec = sm.getExecutionContext();
+ ExecutionContext ec = op.getExecutionContext();
if (keyFieldNumber >= 0)
{
// Key stored in value
@@ -707,7 +707,7 @@
else
{
// Update the external FK in the value in the datastore
- updateValueFkInternal(sm, oldValue, null);
+ updateValueFkInternal(op, oldValue, null);
}
}
else
@@ -733,7 +733,7 @@
}
}
}
- sm.getExecutionContext().deleteObjectInternal(key);
+ op.getExecutionContext().deleteObjectInternal(key);
}
}
}
@@ -767,7 +767,7 @@
else
{
// Update the external FK in the key in the datastore
- updateKeyFkInternal(sm, key, null);
+ updateKeyFkInternal(op, key, null);
}
}
else
@@ -793,7 +793,7 @@
}
}
}
- sm.getExecutionContext().deleteObjectInternal(oldValue);
+ op.getExecutionContext().deleteObjectInternal(oldValue);
}
}
}
@@ -803,13 +803,13 @@
/**
* Utility to remove a value from the Map.
- * @param sm State Manager for the map.
+ * @param op ObjectProvider for the map.
* @param key Key of the object
* @param oldValue Value to remove
*/
- private void removeValue(ObjectProvider sm, Object key, Object oldValue)
+ private void removeValue(ObjectProvider op, Object key, Object oldValue)
{
- ExecutionContext ec = sm.getExecutionContext();
+ ExecutionContext ec = op.getExecutionContext();
// Null out the key and owner fields if they are nullable
if (keyMapping.isNullable())
@@ -835,7 +835,7 @@
}
else
{
- updateValueFk(sm, oldValue, null);
+ updateValueFk(op, oldValue, null);
}
}
// otherwise just delete the item
@@ -847,29 +847,29 @@
/**
* Method to clear the map of all values.
- * @param sm State Manager for the map.
+ * @param op ObjectProvider for the map.
*/
- public void clear(ObjectProvider sm)
+ public void clear(ObjectProvider op)
{
// TODO Fix this. Should not be retrieving objects only to remove them since they
// may be cached in the org.datanucleus.sco object. But we need to utilise delete-dependent correctly too
- Iterator iter = keySetStore().iterator(sm);
+ Iterator iter = keySetStore().iterator(op);
while (iter.hasNext())
{
- remove(sm, iter.next());
+ remove(op, iter.next());
}
}
/**
* Utility to clear the key of a value from the Map.
* If the key is non nullable, delete the value.
- * @param sm State Manager for the map.
+ * @param op ObjectProvider for the map.
* @param key Key of the object
* @param oldValue Value to remove
*/
- public void clearKeyOfValue(ObjectProvider sm, Object key, Object oldValue)
+ public void clearKeyOfValue(ObjectProvider op, Object key, Object oldValue)
{
- ExecutionContext ec = sm.getExecutionContext();
+ ExecutionContext ec = op.getExecutionContext();
if (keyMapping.isNullable())
{
@@ -957,10 +957,10 @@
return stmt.toString();
}
- protected boolean updateValueFkInternal(ObjectProvider sm, Object value, Object owner)
+ protected boolean updateValueFkInternal(ObjectProvider op, Object value, Object owner)
{
boolean retval;
- ExecutionContext ec = sm.getExecutionContext();
+ ExecutionContext ec = op.getExecutionContext();
try
{
ManagedConnection mconn = storeMgr.getConnection(ec);
@@ -976,7 +976,7 @@
if (ownerMemberMetaData != null)
{
ownerMapping.setObject(ec, ps, MappingHelper.getMappingIndices(1,ownerMapping), null,
- sm, ownerMemberMetaData.getAbsoluteFieldNumber());
+ op, ownerMemberMetaData.getAbsoluteFieldNumber());
}
else
{
@@ -986,7 +986,7 @@
}
else
{
- jdbcPosition = BackingStoreHelper.populateOwnerInStatement(sm, ec, ps, jdbcPosition, this);
+ jdbcPosition = BackingStoreHelper.populateOwnerInStatement(op, ec, ps, jdbcPosition, this);
}
jdbcPosition = BackingStoreHelper.populateValueInStatement(ec, ps, value, jdbcPosition, valueMapping);
@@ -1011,10 +1011,10 @@
return retval;
}
- protected boolean updateKeyFkInternal(ObjectProvider sm, Object key, Object owner)
+ protected boolean updateKeyFkInternal(ObjectProvider op, Object key, Object owner)
{
boolean retval;
- ExecutionContext ec = sm.getExecutionContext();
+ ExecutionContext ec = op.getExecutionContext();
try
{
ManagedConnection mconn = storeMgr.getConnection(ec);
@@ -1030,7 +1030,7 @@
if (ownerMemberMetaData != null)
{
ownerMapping.setObject(ec, ps, MappingHelper.getMappingIndices(1,ownerMapping), null,
- sm, ownerMemberMetaData.getAbsoluteFieldNumber());
+ op, ownerMemberMetaData.getAbsoluteFieldNumber());
}
else
{
@@ -1040,7 +1040,7 @@
}
else
{
- jdbcPosition = BackingStoreHelper.populateOwnerInStatement(sm, ec, ps, jdbcPosition, this);
+ jdbcPosition = BackingStoreHelper.populateOwnerInStatement(op, ec, ps, jdbcPosition, this);
}
jdbcPosition = BackingStoreHelper.populateKeyInStatement(ec, ps, key, jdbcPosition, keyMapping);
@@ -1067,7 +1067,7 @@
/**
* Method to retrieve a value from the Map given the key.
- * @param ownerSM State Manager for the owner of the map.
+ * @param ownerSM ObjectProvider for the owner of the map.
* @param key The key to retrieve the value for.
* @return The value for this key
* @throws NoSuchElementException if the key was not found
@@ -1197,7 +1197,7 @@
/**
* Method to return an SQLStatement for retrieving the value for a key.
* Selects the join table and optionally joins to the value table if it has its own table.
- * @param ownerSM StateManager for the owning object
+ * @param ownerSM ObjectProvider for the owning object
* @return The SQLStatement
*/
protected SQLStatement getSQLStatementForGet(ObjectProvider ownerSM)
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKSetStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKSetStore.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSFKSetStore.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -474,7 +474,7 @@
}
}
- public void fetchNonLoadedFields(ObjectProvider sm)
+ public void fetchNonLoadedFields(ObjectProvider op)
{
}
public FetchPlan getFetchPlanForLoading()
@@ -575,7 +575,7 @@
return false;
}
- // Find the state manager for the element
+ // Find the ObjectProvider for the element
Object elementToRemove = element;
ExecutionContext ec = op.getExecutionContext();
if (ec.getApiAdapter().isDetached(element)) // User passed in detached object to collection.remove()!
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSJoinArrayStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSJoinArrayStore.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSJoinArrayStore.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -142,7 +142,7 @@
/**
* Method to return an iterator to the array.
- * @param ownerSM StateManager for the owner of the array
+ * @param ownerSM ObjectProvider for the owner of the array
*/
public Iterator iterator(ObjectProvider ownerSM)
{
@@ -228,7 +228,7 @@
* Method to generate an SQLStatement for iterating through elements of the set.
* Selects the join table.
* Populates the iteratorMappingDef and iteratorMappingParams.
- * @param ownerSM StateManager for the owner object
+ * @param ownerSM ObjectProvider for the owner object
* @return The SQLStatement
*/
protected SQLStatement getSQLStatementForIterator(ObjectProvider ownerSM)
Modified: platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSJoinListStore.java
===================================================================
--- platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSJoinListStore.java 2012-11-11 14:43:27 UTC (rev 15903)
+++ platform/store.rdbms/trunk/src/java/org/datanucleus/store/rdbms/scostore/RDBMSJoinListStore.java 2012-11-11 15:03:44 UTC (rev 15904)
@@ -177,14 +177,14 @@
* <li>Insert all new elements directly at their desired positions>/li>
* </ol>
* Both steps can be batched (separately).
- * @param sm The state manager
+ * @param op The ObjectProvider
* @param start The start location (if required)
* @param atEnd Whether to add the element at the end
* @param c The collection of objects to add.
* @param size Current size of list if known. -1 if not known
* @return Whether it was successful
*/
- protected boolean internalAdd(ObjectProvider sm, int start, boolean atEnd, Collection c, int size)
+ protected boolean internalAdd(ObjectProvider op, int start, boolean atEnd, Collection c, int size)
{
if (c == null || c.size() == 0)
{
@@ -196,7 +196,7 @@
int shift = c.size();
// check all elements are valid for persisting and exist (persistence-by-reachability)
- ExecutionContext ec = sm.getExecutionContext();
+ ExecutionContext ec = op.getExecutionContext();
Iterator iter = c.iterator();
while (iter.hasNext())
{
@@ -216,16 +216,16 @@
{
// No owner, so correct it
NucleusLogger.PERSISTENCE.info(LOCALISER.msg("056037",
- sm.getObjectAsPrintable(), ownerMemberMetaData.getFullFieldName(),
+ op.getObjectAsPrintable(), ownerMemberMetaData.getFullFieldName(),
StringUtils.toJVMIDString(elementSM.getObject())));
- elementSM.replaceField(relatedMmds[0].getAbsoluteFieldNumber(), sm.getObject());
+ elementSM.replaceField(relatedMmds[0].getAbsoluteFieldNumber(), op.getObject());
}
- else if (elementOwner != sm.getObject() && sm.getReferencedPC() == null)
+ else if (elementOwner != op.getObject() && op.getReferencedPC() == null)
{
// Owner of the element is neither this container nor being attached
// Inconsistent owner, so throw exception
throw new NucleusUserException(LOCALISER.msg("056038",
- sm.getObjectAsPrintable(), ownerMemberMetaData.getFullFieldName(),
+ op.getObjectAsPrintable(), ownerMemberMetaData.getFullFieldName(),
StringUtils.toJVMIDString(elementSM.getObject()),
StringUtils.toJVMIDString(elementOwner)));
}
@@ -239,7 +239,7 @@
if (size < 0)
{
// Get the current size from the datastore
- currentListSize = size(sm);
+ currentListSize = size(op);
}
else
{
@@ -249,7 +249,7 @@
// Check for dynamic schema updates prior to addition
if (storeMgr.getBooleanObjectProperty("datanucleus.rdbms.dynamicSchemaUpdates").booleanValue())
{
- DynamicSchemaFieldManager dynamicSchemaFM = new DynamicSchemaFieldManager(storeMgr, sm);
+ DynamicSchemaFieldManager dynamicSchemaFM = new DynamicSchemaFieldManager(storeMgr, op);
dynamicSchemaFM.storeObjectField(getOwnerMemberMetaData().getAbsoluteFieldNumber(), c);
if (dynamicSchemaFM.hasPerformedSchemaUpdates())
{
@@ -272,7 +272,7 @@
for (int i = currentListSize - 1; i >= start; i--)
{
// Shift the index for this row by "shift"
- internalShift(sm, mconn, batched, i, shift, (i == start));
+ internalShift(op, mconn, batched, i, shift, (i == start));
}
}
else
@@ -296,7 +296,7 @@
JavaTypeMapping relationDiscriminatorMapping = getRelationDiscriminatorMapping();
jdbcPosition = 1;
- jdbcPosition = BackingStoreHelper.populateOwnerInStatement(sm, ec, ps, jdbcPosition, this);
+ jdbcPosition = BackingStoreHelper.populateOwnerInStatement(op, ec, ps, jdbcPosition, this);
jdbcPosition = BackingStoreHelper.populateElementInStatement(ec, ps, element, jdbcPosition, elementMapping);
if (orderMapping != null)
{
@@ -428,14 +428,14 @@
/**
* Method to update the collection to be the supplied collection of elements.
- * @param sm StateManager of the object
+ * @param op ObjectProvider of the object
* @param coll The collection to use
*/
- public void update(ObjectProvider sm, Collection coll)
+ public void update(ObjectProvider op, Collection coll)
{
if (coll == null || coll.isEmpty())
{
- clear(sm);
+ clear(op);
return;
}
@@ -443,20 +443,20 @@
ownerMemberMetaData.getCollection().isEmbeddedElement())
{
// Serialized/Embedded elements so just clear and add again
- clear(sm);
- addAll(sm, coll, 0);
+ clear(op);
+ addAll(op, coll, 0);
return;
}
// Find existing elements, and remove any that are no longer present
@@ Diff output truncated at 100000 characters. @@
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|