DataNucleus

Revision: 11941
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=11941&view=rev
Author:   andy_jefferson
Date:     2011-01-31 09:23:21 +0000 (Mon, 31 Jan 2011)

Log Message:
-----------
structure so we can retrieve via any identity type

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-01-31 09:03:14 UTC (rev 11940)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-01-31 09:23:21 UTC (rev 11941)
@@ -154,21 +154,14 @@
             }
 
             DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(cmd));
-            Object pkValue = sm.provideField(sm.getClassMetaData().getPKMemberPositions()[0]);
-
-            if (pkValue != null)
+            DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, sm);
+            if (dbObject == null)
             {
-                ObjectId objectId = new ObjectId((String) pkValue);
-                DBObject dbObject = collection.findOne(objectId);
-                if (dbObject == null)
-                {
-                    throw new NucleusDataStoreException("Couldn't find object with id " + sm.toPrintableID() + " to update");
-                }
-
-                StoreFieldManager fieldManager = new StoreFieldManager(dbObject, cmd);
-                sm.provideFields(cmd.getAllMemberPositions(), fieldManager);
-                collection.save(dbObject);
+                throw new NucleusDataStoreException("Could not find object with id " + sm.getObjectId());
             }
+            StoreFieldManager fieldManager = new StoreFieldManager(dbObject, cmd);
+            sm.provideFields(cmd.getAllMemberPositions(), fieldManager);
+            collection.save(dbObject);
 
             if (NucleusLogger.DATASTORE_PERSIST.isDebugEnabled())
             {
@@ -206,19 +199,12 @@
             }
 
             DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(acmd));
-            Object pkValue = sm.provideField(sm.getClassMetaData().getPKMemberPositions()[0]);
-
-            if (pkValue != null)
+            DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, sm);
+            if (dbObject == null)
             {
-                ObjectId objectId = new ObjectId((String) pkValue);
-                DBObject dbObject = collection.findOne(objectId);
-                if (dbObject == null)
-                {
-                    throw new NucleusDataStoreException("Couldn't find object with id " + sm.toPrintableID() + " to delete");
-                }
-
-                collection.remove(dbObject);
+                throw new NucleusDataStoreException("Could not find object with id " + sm.getObjectId());
             }
+            collection.remove(dbObject);
 
             if (NucleusLogger.DATASTORE_PERSIST.isDebugEnabled())
             {
@@ -247,20 +233,13 @@
             DB db = (DB)mconn.getConnection();
 
             DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(acmd));
-            Object pkValue = sm.provideField(sm.getClassMetaData().getPKMemberPositions()[0]);
-
-            if (pkValue != null)
+            DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, sm);
+            if (dbObject == null)
             {
-                ObjectId objectId = new ObjectId((String) pkValue);
-                DBObject dbObject = collection.findOne(objectId);
-                if (dbObject == null)
-                {
-                    throw new NucleusDataStoreException("Couldn't find object with id " + sm.toPrintableID() + " to fetch fields from");
-                }
-
-                FetchFieldManager fieldManager = new FetchFieldManager(dbObject, acmd);
-                sm.replaceFields(fieldNumbers, fieldManager);
+                throw new NucleusDataStoreException("Could not find object with id " + sm.getObjectId());
             }
+            FetchFieldManager fieldManager = new FetchFieldManager(dbObject, acmd);
+            sm.replaceFields(fieldNumbers, fieldManager);
         }
         finally
         {
@@ -284,19 +263,11 @@
             try
             {
                 DB db = (DB)mconn.getConnection();
-
                 DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(cmd));
-                Object pkValue = sm.provideField(sm.getClassMetaData().getPKMemberPositions()[0]);
-
-                if (pkValue != null)
+                DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, sm);
+                if (dbObject == null)
                 {
-                    ObjectId objectId = new ObjectId((String) pkValue);
-                    DBObject foundObject = collection.findOne(objectId);
-
-                    if (foundObject == null)
-                    {
-                        throw new NucleusObjectNotFoundException();
-                    }
+                    throw new NucleusObjectNotFoundException();
                 }
             }
             finally

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-01-31 09:03:14 UTC (rev 11940)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-01-31 09:23:21 UTC (rev 11941)
@@ -17,10 +17,17 @@
 **********************************************************************/
 package org.datanucleus.store.mongodb;
 
+import org.bson.types.ObjectId;
+import org.datanucleus.exceptions.NucleusDataStoreException;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.ColumnMetaData;
+import org.datanucleus.metadata.IdentityType;
+import org.datanucleus.store.ObjectProvider;
 
+import com.mongodb.DBCollection;
+import com.mongodb.DBObject;
+
 /**
  * Utilities for MongoDB.
  */
@@ -59,4 +66,26 @@
         // Fallback to the member name
         return mmd.getName();
     }
+
+    public static DBObject getObjectForObjectProvider(DBCollection dbCollection, ObjectProvider sm)
+    {
+        AbstractClassMetaData cmd = sm.getClassMetaData();
+        if (cmd.getIdentityType() == IdentityType.APPLICATION)
+        {
+            // TODO Support (composite) application id retrieval
+        }
+        else if (cmd.getIdentityType() == IdentityType.DATASTORE)
+        {
+            // TODO Support datastore id retrieval
+        }
+
+        Object pkValue = sm.provideField(sm.getClassMetaData().getPKMemberPositions()[0]);
+        if (pkValue != null)
+        {
+            // Retrieve using "_id" MongoDB identity column
+            ObjectId objectId = new ObjectId((String) pkValue);
+            return dbCollection.findOne(objectId);
+        }
+        return null;
+    }
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11943
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=11943&view=rev
Author:   andy_jefferson
Date:     2011-01-31 09:58:08 +0000 (Mon, 31 Jan 2011)

Log Message:
-----------
support for datastore identity

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-01-31 09:50:50 UTC (rev 11942)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-01-31 09:58:08 UTC (rev 11943)
@@ -21,7 +21,6 @@
 import com.mongodb.DB;
 import com.mongodb.DBCollection;
 import com.mongodb.DBObject;
-import org.bson.types.ObjectId;
 
 import org.datanucleus.exceptions.NucleusDataStoreException;
 import org.datanucleus.exceptions.NucleusObjectNotFoundException;
@@ -99,17 +98,6 @@
             sm.provideFields(cmd.getAllMemberPositions(), fieldManager);
             collection.insert(dbObject);
 
-            // Retrieve the object "key" from MongoDB and set the PK field with its value (if String)
-            // TODO This should only be used if using "IDENTITY" value generation
-            ObjectId id = (ObjectId) dbObject.get("_id");
-            Class<?> pkType = cmd.getMetaDataForManagedMemberAtAbsolutePosition(cmd.getPKMemberPositions()[0]).getType();
-            if (pkType.equals(String.class)) 
-            {
-                sm.setPostStoreNewObjectId(id.toString());
-                Integer pkIdPos = cmd.getPKMemberPositions()[0];
-                sm.replaceField(pkIdPos, id.toString());
-            }
-
             if (NucleusLogger.DATASTORE_PERSIST.isDebugEnabled())
             {
                 NucleusLogger.DATASTORE_PERSIST.debug(LOCALISER.msg("MongoDB.ExecutionTime", 
@@ -231,7 +219,31 @@
         try
         {
             DB db = (DB)mconn.getConnection();
+            if (NucleusLogger.PERSISTENCE.isDebugEnabled())
+            {
+                // Debug information about what we are retrieving
+                StringBuffer str = new StringBuffer("Fetching object \"");
+                str.append(sm.toPrintableID()).append("\" (id=");
+                str.append(sm.getExecutionContext().getApiAdapter().getObjectId(sm)).append(")").append(" fields [");
+                for (int i=0;i<fieldNumbers.length;i++)
+                {
+                    if (i > 0)
+                    {
+                        str.append(",");
+                    }
+                    str.append(acmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumbers[i]).getName());
+                }
+                str.append("]");
+                NucleusLogger.PERSISTENCE.debug(str);
+            }
 
+            long startTime = System.currentTimeMillis();
+            if (NucleusLogger.DATASTORE_RETRIEVE.isDebugEnabled())
+            {
+                NucleusLogger.DATASTORE_RETRIEVE.debug(LOCALISER.msg("MongoDB.Fetch.Start", 
+                    sm.toPrintableID(), sm.getInternalObjectId()));
+            }
+
             DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(acmd));
             DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, sm);
             if (dbObject == null)
@@ -240,6 +252,16 @@
             }
             FetchFieldManager fieldManager = new FetchFieldManager(dbObject, acmd);
             sm.replaceFields(fieldNumbers, fieldManager);
+
+            if (NucleusLogger.DATASTORE_RETRIEVE.isDebugEnabled())
+            {
+                NucleusLogger.DATASTORE_RETRIEVE.debug(LOCALISER.msg("MongoDB.ExecutionTime",
+                    (System.currentTimeMillis() - startTime)));
+            }
+            if (storeMgr.getRuntimeManager() != null)
+            {
+                storeMgr.getRuntimeManager().incrementFetchCount();
+            }
         }
         finally
         {

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java	2011-01-31 09:50:50 UTC (rev 11942)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java	2011-01-31 09:58:08 UTC (rev 11943)
@@ -61,6 +61,7 @@
     {
         Set set = new HashSet();
         set.add("ApplicationIdentity");
+        set.add("DatastoreIdentity");
         set.add("ORM");
         set.add("TransactionIsolationLevel.read-committed");
         return set;

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-01-31 09:50:50 UTC (rev 11942)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-01-31 09:58:08 UTC (rev 11943)
@@ -17,10 +17,11 @@
 **********************************************************************/
 package org.datanucleus.store.mongodb;
 
-import org.bson.types.ObjectId;
+import org.datanucleus.identity.OID;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.ColumnMetaData;
+import org.datanucleus.metadata.IdentityMetaData;
 import org.datanucleus.metadata.IdentityType;
 import org.datanucleus.store.ObjectProvider;
 
@@ -68,6 +69,25 @@
         return mmd.getName();
     }
 
+    /**
+     * Accessor for the MongoDB "field" name to store the datastore id under. Takes the column name if provided
+     * otherwise "IDENTITY".
+     * @param mmd Metadata for the identity
+     * @return The field name
+     */
+    public static String getFieldName(IdentityMetaData idmd)
+    {
+        // Try the first column if specified
+        ColumnMetaData[] colmds = idmd.getColumnMetaData();
+        if (colmds != null && colmds.length > 1)
+        {
+            return colmds[0].getName();
+        }
+
+        // Fallback to "IDENTITY"
+        return "IDENTITY";
+    }
+
     public static DBObject getObjectForObjectProvider(DBCollection dbCollection, ObjectProvider sm)
     {
         AbstractClassMetaData cmd = sm.getClassMetaData();
@@ -90,16 +110,21 @@
         }
         else if (cmd.getIdentityType() == IdentityType.DATASTORE)
         {
-            // TODO Support datastore id retrieval
+            BasicDBObject query = new BasicDBObject();
+            OID oid = (OID) sm.getObjectId();
+            Object value = oid.getKeyValue();
+            query.put(MongoDBUtils.getFieldName(cmd.getIdentityMetaData()), value);
+            DBCursor curs = dbCollection.find(query);
+            if (!curs.hasNext())
+            {
+                return null;
+            }
+            return curs.next();
         }
-
-        Object pkValue = sm.provideField(sm.getClassMetaData().getPKMemberPositions()[0]);
-        if (pkValue != null)
+        else
         {
-            // Retrieve using "_id" MongoDB identity column
-            ObjectId objectId = new ObjectId((String) pkValue);
-            return dbCollection.findOne(objectId);
+            // TODO Support nondurable identity
+            return null;
         }
-        return null;
     }
 }
\ No newline at end of file

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2011-01-31 09:50:50 UTC (rev 11942)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2011-01-31 09:58:08 UTC (rev 11943)
@@ -120,6 +120,13 @@
     @Override
     public Object fetchObjectField(int fieldNumber)
     {
+        AbstractMemberMetaData ammd = acmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+        String fieldName = MongoDBUtils.getFieldName(ammd);
+        if (!dbObject.containsField(fieldName))
+        {
+            return null;
+        }
+
         // TODO Implement this
         return super.fetchObjectField(fieldNumber);
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 11964
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=11964&view=rev
Author:   andy_jefferson
Date:     2011-02-01 07:37:14 +0000 (Tue, 01 Feb 2011)

Log Message:
-----------
basic relation handling

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-01 07:11:04 UTC (rev 11963)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-01 07:37:14 UTC (rev 11964)
@@ -95,7 +95,7 @@
             DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(cmd));
             BasicDBObject dbObject = new BasicDBObject();
 
-            StoreFieldManager fieldManager = new StoreFieldManager(dbObject, cmd);
+            StoreFieldManager fieldManager = new StoreFieldManager(sm, dbObject, cmd);
             sm.provideFields(cmd.getAllMemberPositions(), fieldManager);
             collection.insert(dbObject);
 
@@ -158,7 +158,7 @@
             {
                 throw new NucleusDataStoreException("Could not find object with id " + sm.getObjectId());
             }
-            StoreFieldManager fieldManager = new StoreFieldManager(dbObject, cmd);
+            StoreFieldManager fieldManager = new StoreFieldManager(sm, dbObject, cmd);
             sm.provideFields(cmd.getAllMemberPositions(), fieldManager);
             // TODO Support persisting version
             collection.save(dbObject);
@@ -262,7 +262,7 @@
             {
                 throw new NucleusDataStoreException("Could not find object with id " + sm.getObjectId());
             }
-            FetchFieldManager fieldManager = new FetchFieldManager(dbObject, acmd);
+            FetchFieldManager fieldManager = new FetchFieldManager(sm, dbObject, acmd);
             sm.replaceFields(fieldNumbers, fieldManager);
             // TODO Support retrieving version
 

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-01 07:11:04 UTC (rev 11963)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-01 07:37:14 UTC (rev 11964)
@@ -148,8 +148,8 @@
      * @param fp FetchPlan when retrieving the objects
      * @return List of all candidate objects
      */
-    public static List getObjectsOfCandidateType(ExecutionContext ec, DB db, Class candidateClass, boolean subclasses,
-            boolean ignoreCache, FetchPlan fp)
+    public static List getObjectsOfCandidateType(final ExecutionContext ec, DB db, Class candidateClass, 
+            boolean subclasses, boolean ignoreCache, FetchPlan fp)
     {
         final AbstractClassMetaData cmd = ec.getMetaDataManager().getMetaDataForClass(candidateClass, ec.getClassLoaderResolver());
         BasicDBObject query = new BasicDBObject();
@@ -163,17 +163,17 @@
                 final DBObject dbObject = curs.next();
 
                 Object id = IdentityUtils.getApplicationIdentityForResultSetRow(ec, cmd, null, 
-                    false, new FetchFieldManager(dbObject, cmd));
+                    false, new FetchFieldManager(ec, dbObject, cmd));
                 results.add(ec.findObject(id, 
                     new FieldValues2()
                     {
                         public void fetchFields(ObjectProvider sm)
                         {
-                            sm.replaceFields(cmd.getAllMemberPositions(), new FetchFieldManager(dbObject, cmd));
+                            sm.replaceFields(cmd.getAllMemberPositions(), new FetchFieldManager(ec, dbObject, cmd));
                         }
                         public void fetchNonLoadedFields(ObjectProvider sm)
                         {
-                            sm.replaceNonLoadedFields(cmd.getAllMemberPositions(), new FetchFieldManager(dbObject, cmd));
+                            sm.replaceNonLoadedFields(cmd.getAllMemberPositions(), new FetchFieldManager(ec, dbObject, cmd));
                         }
                         public FetchPlan getFetchPlanForLoading()
                         {
@@ -197,12 +197,12 @@
                         public void fetchFields(ObjectProvider sm)
                         {
                             sm.replaceFields(cmd.getAllMemberPositions(), 
-                                new FetchFieldManager(dbObject, cmd));
+                                new FetchFieldManager(ec, dbObject, cmd));
                         }
                         public void fetchNonLoadedFields(ObjectProvider sm)
                         {
                             sm.replaceNonLoadedFields(cmd.getAllMemberPositions(), 
-                                new FetchFieldManager(dbObject, cmd));
+                                new FetchFieldManager(ec, dbObject, cmd));
                         }
                         public FetchPlan getFetchPlanForLoading()
                         {

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2011-02-01 07:11:04 UTC (rev 11963)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2011-02-01 07:37:14 UTC (rev 11964)
@@ -17,27 +17,51 @@
 ***********************************************************************/
 package org.datanucleus.store.mongodb.fieldmanager;
 
+import java.lang.reflect.Array;
+import java.util.Collection;
+import java.util.Iterator;
+
 import com.mongodb.DBObject;
+
+import org.datanucleus.ClassLoaderResolver;
+import org.datanucleus.exceptions.NucleusDataStoreException;
+import org.datanucleus.exceptions.NucleusException;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
+import org.datanucleus.metadata.Relation;
+import org.datanucleus.store.ExecutionContext;
+import org.datanucleus.store.ObjectProvider;
 import org.datanucleus.store.fieldmanager.AbstractFieldManager;
 import org.datanucleus.store.mongodb.MongoDBUtils;
+import org.datanucleus.store.types.ObjectStringConverter;
+import org.datanucleus.store.types.sco.SCOUtils;
 
 /**
  * Field Manager for retrieving values from MongoDB.
  */
 public class FetchFieldManager extends AbstractFieldManager
 {
+    private ExecutionContext ec;
+
     private DBObject dbObject;
+
     private AbstractClassMetaData acmd;
 
-    public FetchFieldManager(DBObject dbObject, AbstractClassMetaData acmd)
+    public FetchFieldManager(ObjectProvider sm, DBObject dbObject, AbstractClassMetaData acmd)
     {
         super();
+        this.ec = sm.getExecutionContext();
         this.dbObject = dbObject;
         this.acmd = acmd;
     }
 
+    public FetchFieldManager(ExecutionContext ec, DBObject dbObject, AbstractClassMetaData acmd)
+    {
+        this.ec = ec;
+        this.dbObject = dbObject;
+        this.acmd = acmd;
+    }
+
     @Override
     public boolean fetchBooleanField(int fieldNumber)
     {
@@ -127,7 +151,74 @@
             return null;
         }
 
-        // TODO Implement this
-        return super.fetchObjectField(fieldNumber);
+        Object value = dbObject.get(fieldName);
+        ClassLoaderResolver clr = ec.getClassLoaderResolver();
+        int relationType = ammd.getRelationType(clr);
+
+        if (relationType == Relation.ONE_TO_ONE_BI || relationType == Relation.ONE_TO_ONE_UNI ||
+            relationType == Relation.MANY_TO_ONE_BI || relationType == Relation.MANY_TO_ONE_UNI)
+        {
+            return ec.findObject(value, true, true, null);
+        }
+        else if (relationType == Relation.ONE_TO_MANY_UNI || relationType == Relation.ONE_TO_MANY_BI ||
+                relationType == Relation.MANY_TO_MANY_BI)
+        {
+            if (ammd.hasCollection())
+            {
+                Collection<Object> coll;
+                try
+                {
+                    Class instanceType = SCOUtils.getContainerInstanceType(ammd.getType(), ammd.getOrderMetaData() != null);
+                    coll = (Collection<Object>) instanceType.newInstance();
+                }
+                catch (Exception e)
+                {
+                    throw new NucleusDataStoreException(e.getMessage(), e);
+                }
+
+                Collection collIds = (Collection)value;
+                Iterator idIter = collIds.iterator();
+                while (idIter.hasNext())
+                {
+                    Object elementId = idIter.next();
+                    coll.add(ec.findObject(elementId, true, true, null));
+                }
+                return coll;
+            }
+            else if (ammd.hasMap())
+            {
+                // TODO Support this
+                throw new NucleusException("Dont currently support retrieval of map field values");
+            }
+            else if (ammd.hasArray())
+            {
+                Collection arrIds = (Collection)value;
+                Object array = Array.newInstance(ammd.getType().getComponentType(), arrIds.size());
+                Iterator idIter = arrIds.iterator();
+                int i=0;
+                while (idIter.hasNext())
+                {
+                    Object elementId = idIter.next();
+                    Array.set(array, i, ec.findObject(elementId, true, true, null));
+                }
+                return array;
+            }
+            else
+            {
+                return value;
+            }
+        }
+        else
+        {
+            ObjectStringConverter strConv = 
+                ec.getNucleusContext().getTypeManager().getStringConverter(value.getClass());
+            if (!ammd.isSerialized() && strConv != null)
+            {
+                // Persisted as a String, so convert back
+                String strValue = (String)value;
+                return strConv.toObject(strValue);
+            }
+            return value;
+        }
     }
 }
\ No newline at end of file

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2011-02-01 07:11:04 UTC (rev 11963)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2011-02-01 07:37:14 UTC (rev 11964)
@@ -17,24 +17,40 @@
 ***********************************************************************/
 package org.datanucleus.store.mongodb.fieldmanager;
 
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+
 import com.mongodb.DBObject;
+
+import org.datanucleus.ClassLoaderResolver;
+import org.datanucleus.exceptions.NucleusException;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
+import org.datanucleus.metadata.Relation;
+import org.datanucleus.store.ExecutionContext;
+import org.datanucleus.store.ObjectProvider;
 import org.datanucleus.store.fieldmanager.AbstractFieldManager;
 import org.datanucleus.store.mongodb.MongoDBUtils;
+import org.datanucleus.store.types.ObjectStringConverter;
 
 /**
  * Field Manager for putting values into MongoDB.
  */
 public class StoreFieldManager extends AbstractFieldManager
 {
+    private ObjectProvider sm;
+
     private DBObject dbObject;
 
     private AbstractClassMetaData acmd;
 
-    public StoreFieldManager(DBObject dbObject, AbstractClassMetaData acmd)
+    public StoreFieldManager(ObjectProvider sm, DBObject dbObject, AbstractClassMetaData acmd)
     {
         super();
+        this.sm = sm;
         this.dbObject = dbObject;
         this.acmd = acmd;
     }
@@ -121,8 +137,8 @@
     @Override
     public void storeObjectField(int fieldNumber, Object value)
     {
-        AbstractMemberMetaData ammd = acmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
-        String fieldName = MongoDBUtils.getFieldName(ammd);
+        AbstractMemberMetaData mmd = acmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+        String fieldName = MongoDBUtils.getFieldName(mmd);
         if (value == null)
         {
             if (dbObject.containsField(fieldName))
@@ -132,8 +148,82 @@
             return;
         }
 
-        // TODO Handle relationships etc
-        // TODO Make use of ObjectStringConverter/ObjectLongConverter if available
-        dbObject.put(fieldName, value);
+        ExecutionContext ec = sm.getExecutionContext();
+        ClassLoaderResolver clr = ec.getClassLoaderResolver();
+        int relationType = mmd.getRelationType(clr);
+        if (relationType == Relation.ONE_TO_ONE_BI || relationType == Relation.ONE_TO_ONE_UNI ||
+            relationType == Relation.MANY_TO_ONE_BI || relationType == Relation.MANY_TO_ONE_UNI)
+        {
+            // PC object, so make sure it is persisted
+            Object valuePC = sm.getExecutionContext().persistObjectInternal(value, sm, fieldNumber, -1);
+            Object valueId = ec.getApiAdapter().getIdForObject(valuePC);
+            dbObject.put(fieldName, valueId); // Persist the id
+        }
+        else if (relationType == Relation.ONE_TO_MANY_UNI || relationType == Relation.ONE_TO_MANY_BI ||
+            relationType == Relation.MANY_TO_MANY_BI)
+        {
+            // Collection/Map/Array
+            if (mmd.hasCollection())
+            {
+                Collection collIds = new ArrayList();
+                Collection coll = (Collection)value;
+                Iterator collIter = coll.iterator();
+                while (collIter.hasNext())
+                {
+                    Object element = collIter.next();
+                    Object elementPC = sm.getExecutionContext().persistObjectInternal(element, sm, fieldNumber, -1);
+                    Object elementID = sm.getExecutionContext().getApiAdapter().getIdForObject(elementPC);
+                    collIds.add(elementID);
+                }
+                dbObject.put(fieldName, collIds);
+            }
+            else if (mmd.hasMap())
+            {
+                Map map = (Map)value;
+                Iterator<Map.Entry> mapIter = map.entrySet().iterator();
+                while (mapIter.hasNext())
+                {
+                    Map.Entry entry = mapIter.next();
+                    Object mapKey = entry.getKey();
+                    Object mapValue = entry.getValue();
+                    if (ec.getApiAdapter().isPersistable(mapKey))
+                    {
+                        ec.persistObjectInternal(mapKey, sm, fieldNumber, -1);
+                    }
+                    if (ec.getApiAdapter().isPersistable(mapValue))
+                    {
+                        ec.persistObjectInternal(mapValue, sm, fieldNumber, -1);
+                    }
+                }
+                throw new NucleusException("Dont currently support persistence of maps");
+            }
+            else if (mmd.hasArray())
+            {
+                Collection arrIds = new ArrayList();
+                for (int i=0;i<Array.getLength(value);i++)
+                {
+                    Object element = Array.get(value, i);
+                    Object elementPC = ec.persistObjectInternal(element, sm, fieldNumber, -1);
+                    Object elementID = ec.getApiAdapter().getIdForObject(elementPC);
+                    arrIds.add(elementID);
+                }
+                dbObject.put(fieldName, arrIds);
+            }
+        }
+        else
+        {
+            ObjectStringConverter strConv = 
+                ec.getNucleusContext().getTypeManager().getStringConverter(value.getClass());
+            if (!mmd.isSerialized() && strConv != null)
+            {
+                // Persist as a String
+                String strValue = strConv.toString(value);
+                dbObject.put(fieldName, strValue);
+            }
+            else
+            {
+                dbObject.put(fieldName, value);
+            }
+        }
     }
 }
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12003
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=12003&view=rev
Author:   andy_jefferson
Date:     2011-02-01 16:26:09 +0000 (Tue, 01 Feb 2011)

Log Message:
-----------
[NUCMONGODB-4] Support storing of version

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-01 16:21:41 UTC (rev 12002)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-01 16:26:09 UTC (rev 12003)
@@ -17,6 +17,9 @@
 ***********************************************************************/
 package org.datanucleus.store.mongodb;
 
+import java.sql.Timestamp;
+import java.util.Date;
+
 import com.mongodb.BasicDBObject;
 import com.mongodb.DB;
 import com.mongodb.DBCollection;
@@ -27,7 +30,10 @@
 import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.identity.OID;
 import org.datanucleus.metadata.AbstractClassMetaData;
+import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.IdentityType;
+import org.datanucleus.metadata.VersionMetaData;
+import org.datanucleus.metadata.VersionStrategy;
 import org.datanucleus.store.AbstractPersistenceHandler;
 import org.datanucleus.store.ExecutionContext;
 import org.datanucleus.store.ObjectProvider;
@@ -95,10 +101,6 @@
             DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(cmd));
             BasicDBObject dbObject = new BasicDBObject();
 
-            StoreFieldManager fieldManager = new StoreFieldManager(sm, dbObject, cmd);
-            sm.provideFields(cmd.getAllMemberPositions(), fieldManager);
-            collection.insert(dbObject);
-
             if (cmd.getIdentityType() == IdentityType.DATASTORE)
             {
                 // Add datastore identity field value
@@ -107,8 +109,67 @@
                 Object key = oid.getKeyValue();
                 dbObject.put(fieldName, key);
             }
-            // TODO Support persisting version
 
+            if (cmd.hasVersionStrategy())
+            {
+                if (cmd.getVersionMetaData().getVersionStrategy() == VersionStrategy.VERSION_NUMBER)
+                {
+                    long versionNumber = 1;
+                    sm.setTransactionalVersion(Long.valueOf(versionNumber));
+                    if (NucleusLogger.DATASTORE.isDebugEnabled())
+                    {
+                        NucleusLogger.DATASTORE.debug(LOCALISER.msg("MongoDB.Insert.ObjectPersistedWithVersion",
+                            sm.toPrintableID(), sm.getInternalObjectId(), "" + versionNumber));
+                    }
+
+                    if (cmd.getVersionMetaData().getFieldName() != null)
+                    {
+                        // Version stored in a field
+                        AbstractMemberMetaData verMmd = cmd.getMetaDataForMember(cmd.getVersionMetaData().getFieldName());
+                        Object verFieldValue = Long.valueOf(versionNumber);
+                        if (verMmd.getType() == int.class || verMmd.getType() == Integer.class)
+                        {
+                            verFieldValue = Integer.valueOf((int)versionNumber);
+                        }
+                        sm.replaceField(verMmd.getAbsoluteFieldNumber(), verFieldValue);
+                    }
+                    else
+                    {
+                        // Surrogate version
+                        String fieldName = MongoDBUtils.getFieldName(cmd.getVersionMetaData());
+                        dbObject.put(fieldName, new Long(versionNumber));
+                    }
+                }
+                else if (cmd.getVersionMetaData().getVersionStrategy() == VersionStrategy.DATE_TIME)
+                {
+                    Date date = new Date();
+                    Timestamp ts = new Timestamp(date.getTime());
+                    sm.setTransactionalVersion(ts);
+
+                    if (NucleusLogger.DATASTORE.isDebugEnabled())
+                    {
+                        NucleusLogger.DATASTORE.debug(LOCALISER.msg("MongoDB.Insert.ObjectPersistedWithVersion",
+                            sm.toPrintableID(), sm.getInternalObjectId(), "" + ts));
+                    }
+                    if (cmd.getVersionMetaData().getFieldName() != null)
+                    {
+                        // Version field
+                        AbstractMemberMetaData verMmd = cmd.getMetaDataForMember(cmd.getVersionMetaData().getFieldName());
+                        sm.replaceField(verMmd.getAbsoluteFieldNumber(), ts);
+                    }
+                    else
+                    {
+                        // Surrogate version
+                        String fieldName = MongoDBUtils.getFieldName(cmd.getVersionMetaData());
+                        dbObject.put(fieldName, ts);
+                    }
+                }
+            }
+
+            StoreFieldManager fieldManager = new StoreFieldManager(sm, dbObject, cmd);
+            sm.provideFields(cmd.getAllMemberPositions(), fieldManager);
+            collection.insert(dbObject);
+
             if (NucleusLogger.DATASTORE_PERSIST.isDebugEnabled())
             {
                 NucleusLogger.DATASTORE_PERSIST.debug(LOCALISER.msg("MongoDB.ExecutionTime", 
@@ -158,9 +219,31 @@
             {
                 throw new NucleusDataStoreException("Could not find object with id " + sm.getObjectId());
             }
+
+            if (cmd.hasVersionStrategy())
+            {
+                // Version object so calculate version to store with
+                Object currentVersion = sm.getTransactionalVersion();
+                VersionMetaData vermd = cmd.getVersionMetaData();
+                Object nextVersion = vermd.getNextVersion(currentVersion);
+                sm.setTransactionalVersion(nextVersion);
+
+                if (cmd.getVersionMetaData().getFieldName() != null)
+                {
+                    // Update the version field value
+                    AbstractMemberMetaData verMmd = cmd.getMetaDataForMember(cmd.getVersionMetaData().getFieldName());
+                    sm.replaceField(verMmd.getAbsoluteFieldNumber(), nextVersion);
+                }
+                else
+                {
+                    // Update the stored surrogate value
+                    String fieldName = MongoDBUtils.getFieldName(cmd.getVersionMetaData());
+                    dbObject.put(fieldName, nextVersion);
+                }
+            }
+
             StoreFieldManager fieldManager = new StoreFieldManager(sm, dbObject, cmd);
             sm.provideFields(cmd.getAllMemberPositions(), fieldManager);
-            // TODO Support persisting version
             collection.save(dbObject);
 
             if (NucleusLogger.DATASTORE_PERSIST.isDebugEnabled())
@@ -262,9 +345,28 @@
             {
                 throw new NucleusDataStoreException("Could not find object with id " + sm.getObjectId());
             }
+
+            if (acmd.hasVersionStrategy() && sm.getTransactionalVersion() == null)
+            {
+                // No version set, so retrieve it
+                if (acmd.getVersionMetaData().getFieldName() != null)
+                {
+                    // Version stored in a field
+                    Object datastoreVersion =
+                        sm.provideField(acmd.getAbsolutePositionOfMember(acmd.getVersionMetaData().getFieldName()));
+                    sm.setVersion(datastoreVersion);
+                }
+                else
+                {
+                    // Surrogate version
+                    String fieldName = MongoDBUtils.getFieldName(acmd.getVersionMetaData());
+                    Object datastoreVersion = dbObject.get(fieldName);
+                    sm.setVersion(datastoreVersion);
+                }
+            }
+
             FetchFieldManager fieldManager = new FetchFieldManager(sm, dbObject, acmd);
             sm.replaceFields(fieldNumbers, fieldManager);
-            // TODO Support retrieving version
 
             if (NucleusLogger.DATASTORE_RETRIEVE.isDebugEnabled())
             {

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-01 16:21:41 UTC (rev 12002)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-01 16:26:09 UTC (rev 12003)
@@ -29,6 +29,7 @@
 import org.datanucleus.metadata.ColumnMetaData;
 import org.datanucleus.metadata.IdentityMetaData;
 import org.datanucleus.metadata.IdentityType;
+import org.datanucleus.metadata.VersionMetaData;
 import org.datanucleus.store.ExecutionContext;
 import org.datanucleus.store.FieldValues2;
 import org.datanucleus.store.ObjectProvider;
@@ -98,6 +99,25 @@
         return "IDENTITY";
     }
 
+    /**
+     * Accessor for the MongoDB "field" name to store the surrogate version under. Takes the column name if provided
+     * otherwise "VERSION".
+     * @param mmd Metadata for the version
+     * @return The field name
+     */
+    public static String getFieldName(VersionMetaData vermd)
+    {
+        // Try the first column if specified
+        ColumnMetaData[] colmds = vermd.getColumnMetaData();
+        if (colmds != null && colmds.length > 1)
+        {
+            return colmds[0].getName();
+        }
+
+        // Fallback to "VERSION"
+        return "VERSION";
+    }
+
     public static DBObject getObjectForObjectProvider(DBCollection dbCollection, ObjectProvider sm)
     {
         AbstractClassMetaData cmd = sm.getClassMetaData();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12006
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=12006&view=rev
Author:   andy_jefferson
Date:     2011-02-01 16:48:35 +0000 (Tue, 01 Feb 2011)

Log Message:
-----------
variable name refactoring

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-01 16:47:29 UTC (rev 12005)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-01 16:48:35 UTC (rev 12006)
@@ -267,7 +267,7 @@
         // Check if read-only so update not permitted
         storeMgr.assertReadOnlyForUpdateOfObject(sm);
 
-        AbstractClassMetaData acmd = sm.getClassMetaData();
+        AbstractClassMetaData cmd = sm.getClassMetaData();
 
         ExecutionContext ec = sm.getExecutionContext();
         ManagedConnection mconn = storeMgr.getConnection(ec);
@@ -281,7 +281,7 @@
                     sm.toPrintableID(), sm.getInternalObjectId()));
             }
 
-            DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(acmd));
+            DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(cmd));
             DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, sm);
             if (dbObject == null)
             {
@@ -307,7 +307,7 @@
 
     public void fetchObject(ObjectProvider sm, int[] fieldNumbers)
     {
-        AbstractClassMetaData acmd = sm.getClassMetaData();
+        AbstractClassMetaData cmd = sm.getClassMetaData();
 
         ExecutionContext ec = sm.getExecutionContext();
         ManagedConnection mconn = storeMgr.getConnection(ec);
@@ -326,7 +326,7 @@
                     {
                         str.append(",");
                     }
-                    str.append(acmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumbers[i]).getName());
+                    str.append(cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumbers[i]).getName());
                 }
                 str.append("]");
                 NucleusLogger.PERSISTENCE.debug(str);
@@ -339,33 +339,33 @@
                     sm.toPrintableID(), sm.getInternalObjectId()));
             }
 
-            DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(acmd));
+            DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(cmd));
             DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, sm);
             if (dbObject == null)
             {
                 throw new NucleusDataStoreException("Could not find object with id " + sm.getObjectId());
             }
 
-            if (acmd.hasVersionStrategy() && sm.getTransactionalVersion() == null)
+            if (cmd.hasVersionStrategy() && sm.getTransactionalVersion() == null)
             {
                 // No version set, so retrieve it
-                if (acmd.getVersionMetaData().getFieldName() != null)
+                if (cmd.getVersionMetaData().getFieldName() != null)
                 {
                     // Version stored in a field
                     Object datastoreVersion =
-                        sm.provideField(acmd.getAbsolutePositionOfMember(acmd.getVersionMetaData().getFieldName()));
+                        sm.provideField(cmd.getAbsolutePositionOfMember(cmd.getVersionMetaData().getFieldName()));
                     sm.setVersion(datastoreVersion);
                 }
                 else
                 {
                     // Surrogate version
-                    String fieldName = MongoDBUtils.getFieldName(acmd.getVersionMetaData());
+                    String fieldName = MongoDBUtils.getFieldName(cmd.getVersionMetaData());
                     Object datastoreVersion = dbObject.get(fieldName);
                     sm.setVersion(datastoreVersion);
                 }
             }
 
-            FetchFieldManager fieldManager = new FetchFieldManager(sm, dbObject, acmd);
+            FetchFieldManager fieldManager = new FetchFieldManager(sm, dbObject, cmd);
             sm.replaceFields(fieldNumbers, fieldManager);
 
             if (NucleusLogger.DATASTORE_RETRIEVE.isDebugEnabled())

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-01 16:47:29 UTC (rev 12005)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-01 16:48:35 UTC (rev 12006)
@@ -49,16 +49,16 @@
     /**
      * Accessor for the MongoDB collection name for this class.
      * Takes the table name if provided, otherwise uses the (short-form) class name
-     * @param acmd Metadata for the class
+     * @param cmd Metadata for the class
      * @return The collection name
      */
-    public static String getCollectionName(AbstractClassMetaData acmd)
+    public static String getCollectionName(AbstractClassMetaData cmd)
     {
-        if (acmd.getTable() != null)
+        if (cmd.getTable() != null)
         {
-            return acmd.getTable();
+            return cmd.getTable();
         }
-        return acmd.getName();
+        return cmd.getName();
     }
 
     /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12017
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=12017&view=rev
Author:   andy_jefferson
Date:     2011-02-02 08:24:38 +0000 (Wed, 02 Feb 2011)

Log Message:
-----------
[NUCMONGODB-9] Support value generator of IDENTITY when using datastore identity

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-02 08:01:24 UTC (rev 12016)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-02 08:24:38 UTC (rev 12017)
@@ -31,6 +31,7 @@
 import org.datanucleus.identity.OID;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
+import org.datanucleus.metadata.IdentityStrategy;
 import org.datanucleus.metadata.IdentityType;
 import org.datanucleus.metadata.VersionMetaData;
 import org.datanucleus.metadata.VersionStrategy;
@@ -101,9 +102,10 @@
             DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(cmd));
             BasicDBObject dbObject = new BasicDBObject();
 
-            if (cmd.getIdentityType() == IdentityType.DATASTORE)
+            if (cmd.getIdentityType() == IdentityType.DATASTORE &&
+                cmd.getIdentityMetaData().getValueStrategy() != IdentityStrategy.IDENTITY)
             {
-                // Add datastore identity field value
+                // Add surrogate datastore identity field (if using identity then just uses "_id" MongoDB special)
                 String fieldName = MongoDBUtils.getFieldName(cmd.getIdentityMetaData());
                 OID oid = (OID) sm.getInternalObjectId();
                 Object key = oid.getKeyValue();
@@ -170,6 +172,15 @@
             sm.provideFields(cmd.getAllMemberPositions(), fieldManager);
             collection.insert(dbObject);
 
+            // Set datastore id when using IDENTITY
+            if (cmd.getIdentityType() == IdentityType.DATASTORE &&
+                cmd.getIdentityMetaData().getValueStrategy() == IdentityStrategy.IDENTITY)
+            {
+                // Set identity from MongoDB "_id" field
+                Object idKey = dbObject.get("_id");
+                sm.setPostStoreNewObjectId((String)idKey);
+            }
+
             if (NucleusLogger.DATASTORE_PERSIST.isDebugEnabled())
             {
                 NucleusLogger.DATASTORE_PERSIST.debug(LOCALISER.msg("MongoDB.ExecutionTime", 

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-02 08:01:24 UTC (rev 12016)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-02 08:24:38 UTC (rev 12017)
@@ -28,6 +28,7 @@
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.ColumnMetaData;
 import org.datanucleus.metadata.IdentityMetaData;
+import org.datanucleus.metadata.IdentityStrategy;
 import org.datanucleus.metadata.IdentityType;
 import org.datanucleus.metadata.VersionMetaData;
 import org.datanucleus.store.ExecutionContext;
@@ -143,7 +144,14 @@
             BasicDBObject query = new BasicDBObject();
             OID oid = (OID) sm.getObjectId();
             Object value = oid.getKeyValue();
-            query.put(MongoDBUtils.getFieldName(cmd.getIdentityMetaData()), value);
+            if (cmd.getIdentityMetaData().getValueStrategy() == IdentityStrategy.IDENTITY)
+            {
+                query.put("_id", value);
+            }
+            else
+            {
+                query.put(MongoDBUtils.getFieldName(cmd.getIdentityMetaData()), value);
+            }
             DBCursor curs = dbCollection.find(query);
             if (!curs.hasNext())
             {
@@ -230,8 +238,16 @@
             {
                 final DBObject dbObject = curs.next();
 
-                Object idValue = dbObject.get(MongoDBUtils.getFieldName(cmd.getIdentityMetaData()));
-                OID oid = OIDFactory.getInstance(ec.getNucleusContext(), cmd.getFullClassName(), idValue);
+                Object idKey = null;
+                if (cmd.getIdentityMetaData().getValueStrategy() == IdentityStrategy.IDENTITY)
+                {
+                    idKey = dbObject.get("_id");
+                }
+                else
+                {
+                    idKey = dbObject.get(MongoDBUtils.getFieldName(cmd.getIdentityMetaData()));
+                }
+                OID oid = OIDFactory.getInstance(ec.getNucleusContext(), cmd.getFullClassName(), idKey);
                 Object pc = ec.findObject(oid, 
                     new FieldValues2()
                     {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12024
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=12024&view=rev
Author:   andy_jefferson
Date:     2011-02-02 10:28:50 +0000 (Wed, 02 Feb 2011)

Log Message:
-----------
more details around IDENTITY value strategy

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-02 10:19:29 UTC (rev 12023)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-02 10:28:50 UTC (rev 12024)
@@ -25,6 +25,7 @@
 import com.mongodb.DBCollection;
 import com.mongodb.DBObject;
 
+import org.bson.types.ObjectId;
 import org.datanucleus.exceptions.NucleusDataStoreException;
 import org.datanucleus.exceptions.NucleusObjectNotFoundException;
 import org.datanucleus.exceptions.NucleusUserException;
@@ -71,7 +72,7 @@
         }
 
         AbstractClassMetaData cmd = sm.getClassMetaData();
-        if (cmd.getIdentityType() == IdentityType.APPLICATION || cmd.getIdentityType() == IdentityType.DATASTORE)
+        if (cmd.getIdentityType() != IdentityType.NONDURABLE)
         {
             // Enforce uniqueness of datastore rows in this plugin
             try
@@ -177,8 +178,8 @@
                 cmd.getIdentityMetaData().getValueStrategy() == IdentityStrategy.IDENTITY)
             {
                 // Set identity from MongoDB "_id" field
-                Object idKey = dbObject.get("_id");
-                sm.setPostStoreNewObjectId((String)idKey);
+                ObjectId idKey = (ObjectId) dbObject.get("_id");
+                sm.setPostStoreNewObjectId(idKey.toString());
             }
             else if (cmd.getIdentityType() == IdentityType.APPLICATION)
             {
@@ -193,8 +194,8 @@
                             // Field type must be String since MongoDB "_id" is a hex String.
                             throw new NucleusUserException("Any field using IDENTITY value generation with MongoDB should be of type String");
                         }
-                        Object idKey = dbObject.get("_id");
-                        sm.replaceField(mmd.getAbsoluteFieldNumber(), (String)idKey);
+                        ObjectId idKey = (ObjectId)dbObject.get("_id");
+                        sm.replaceField(mmd.getAbsoluteFieldNumber(), idKey.toString());
                         sm.setPostStoreNewObjectId(idKey); // TODO This is incorrect if part of a composite PK
                     }
                 }

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-02 10:19:29 UTC (rev 12023)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-02 10:28:50 UTC (rev 12024)
@@ -130,6 +130,11 @@
             {
                 AbstractMemberMetaData pkMmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(pkPositions[i]);
                 Object value = sm.provideField(pkPositions[i]);
+                if (value == null && pkMmd.getValueStrategy() == IdentityStrategy.IDENTITY)
+                {
+                    // PK field not yet set, so return null (needs to be attributed in the datastore)
+                    return null;
+                }
                 query.put(MongoDBUtils.getFieldName(pkMmd), value);
             }
             DBCursor curs = dbCollection.find(query);
@@ -143,6 +148,11 @@
         {
             BasicDBObject query = new BasicDBObject();
             OID oid = (OID) sm.getObjectId();
+            if (oid == null && cmd.getIdentityMetaData().getValueStrategy() == IdentityStrategy.IDENTITY)
+            {
+                // Not yet set, so return null (needs to be attributed in the datastore)
+                return null;
+            }
             Object value = oid.getKeyValue();
             if (cmd.getIdentityMetaData().getValueStrategy() == IdentityStrategy.IDENTITY)
             {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12029
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=12029&view=rev
Author:   andy_jefferson
Date:     2011-02-02 12:17:59 +0000 (Wed, 02 Feb 2011)

Log Message:
-----------
[NUCMONGODB-5] Support (nested) embedded PC fields

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java

Added Paths:
-----------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchEmbeddedFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-02 11:24:58 UTC (rev 12028)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-02 12:17:59 UTC (rev 12029)
@@ -20,6 +20,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.FetchPlan;
 import org.datanucleus.identity.IdentityUtils;
 import org.datanucleus.identity.OID;
@@ -27,6 +28,7 @@
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.ColumnMetaData;
+import org.datanucleus.metadata.EmbeddedMetaData;
 import org.datanucleus.metadata.IdentityMetaData;
 import org.datanucleus.metadata.IdentityStrategy;
 import org.datanucleus.metadata.IdentityType;
@@ -119,6 +121,44 @@
         return "VERSION";
     }
 
+    /**
+     * Accessor for the MongoDB field for the field of this embedded field.
+     * Uses the column name from the embedded definition (if present), otherwise falls back to
+     * the column name of the field in its own class definition, otherwise uses its field name.
+     * @param mmd Metadata for the owning member
+     * @param fieldNumber Member number of the embedded object
+     * @return The field name to use
+     */
+    public static String getFieldName(AbstractMemberMetaData mmd, int fieldNumber)
+    {
+        String columnName = null;
+
+        // Try the first column if specified
+        EmbeddedMetaData embmd = mmd.getEmbeddedMetaData();
+        AbstractMemberMetaData embMmd = null;
+        if (embmd != null)
+        {
+            AbstractMemberMetaData[] embmmds = embmd.getMemberMetaData();
+            embMmd = embmmds[fieldNumber];
+        }
+
+        ColumnMetaData[] colmds = embMmd.getColumnMetaData();
+        if (colmds != null && colmds.length > 0)
+        {
+            columnName = colmds[0].getName();
+        }
+        if (columnName == null)
+        {
+            // Fallback to the field/property name
+            columnName = embMmd.getName();
+        }
+        if (columnName == null)
+        {
+            columnName = embMmd.getName();
+        }
+        return columnName;
+    }
+
     public static DBObject getObjectForObjectProvider(DBCollection dbCollection, ObjectProvider sm)
     {
         AbstractClassMetaData cmd = sm.getClassMetaData();
@@ -302,4 +342,35 @@
         }
         return results;
     }
+
+    /**
+     * Convenience method to find an object given a string form of its identity, and the metadata for the
+     * class (or a superclass).
+     * @param idStr The id string
+     * @param cmd Metadata for the class
+     * @param ec Execution Context
+     * @return The object
+     */
+    public static Object getObjectFromIdString(String idStr, AbstractClassMetaData cmd, ExecutionContext ec)
+    {
+        ClassLoaderResolver clr = ec.getClassLoaderResolver();
+        Object id = null;
+        if (cmd.getIdentityType() == IdentityType.DATASTORE)
+        {
+            id = OIDFactory.getInstance(ec.getNucleusContext(), idStr);
+        }
+        else if (cmd.getIdentityType() == IdentityType.APPLICATION)
+        {
+            if (cmd.usesSingleFieldIdentityClass())
+            {
+                id = ec.getApiAdapter().getNewApplicationIdentityObjectId(clr, cmd, idStr);
+            }
+            else
+            {
+                Class cls = clr.classForName(cmd.getFullClassName());
+                id = ec.newObjectId(cls, idStr);
+            }
+        }
+        return ec.findObject(id, true, true, null);
+    }
 }
\ No newline at end of file

Added: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchEmbeddedFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchEmbeddedFieldManager.java	                        (rev 0)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchEmbeddedFieldManager.java	2011-02-02 12:17:59 UTC (rev 12029)
@@ -0,0 +1,263 @@
+/**********************************************************************
+Copyright (c) 2011 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.store.mongodb.fieldmanager;
+
+import java.lang.reflect.Array;
+import java.util.Collection;
+
+import org.datanucleus.ClassLoaderResolver;
+import org.datanucleus.exceptions.NucleusDataStoreException;
+import org.datanucleus.exceptions.NucleusException;
+import org.datanucleus.exceptions.NucleusUserException;
+import org.datanucleus.metadata.AbstractClassMetaData;
+import org.datanucleus.metadata.AbstractMemberMetaData;
+import org.datanucleus.metadata.EmbeddedMetaData;
+import org.datanucleus.metadata.MetaDataUtils;
+import org.datanucleus.metadata.Relation;
+import org.datanucleus.store.ExecutionContext;
+import org.datanucleus.store.ObjectProvider;
+import org.datanucleus.store.fieldmanager.AbstractFieldManager;
+import org.datanucleus.store.fieldmanager.FieldManager;
+import org.datanucleus.store.mongodb.MongoDBUtils;
+import org.datanucleus.store.types.ObjectLongConverter;
+import org.datanucleus.store.types.ObjectStringConverter;
+import org.datanucleus.store.types.sco.SCOUtils;
+
+import com.mongodb.DBObject;
+
+/**
+ * FieldManager for the retrieval of a related embedded object (1-1 relation).
+ */
+public class FetchEmbeddedFieldManager extends AbstractFieldManager
+{
+    private final AbstractMemberMetaData mmd;
+    private final DBObject dbObject;
+    private final ObjectProvider sm;
+    private final ExecutionContext ec;
+
+    public FetchEmbeddedFieldManager(ObjectProvider sm, DBObject dbObject, AbstractMemberMetaData mmd)
+    {
+        this.mmd = mmd;
+        this.dbObject = dbObject;
+        this.sm = sm;
+        this.ec = sm.getExecutionContext();
+    }
+
+    @Override
+    public boolean fetchBooleanField(int fieldNumber)
+    {
+        String fieldName = MongoDBUtils.getFieldName(mmd, fieldNumber);
+        return ((Boolean)dbObject.get(fieldName)).booleanValue();
+    }
+
+    @Override
+    public char fetchCharField(int fieldNumber)
+    {
+        String fieldName = MongoDBUtils.getFieldName(mmd, fieldNumber);
+        return ((Character)dbObject.get(fieldName)).charValue();
+    }
+
+    @Override
+    public byte fetchByteField(int fieldNumber)
+    {
+        String fieldName = MongoDBUtils.getFieldName(mmd, fieldNumber);
+        return ((Byte)dbObject.get(fieldName)).byteValue();
+    }
+
+    @Override
+    public short fetchShortField(int fieldNumber)
+    {
+        String fieldName = MongoDBUtils.getFieldName(mmd, fieldNumber);
+        return ((Short)dbObject.get(fieldName)).shortValue();
+    }
+
+    @Override
+    public int fetchIntField(int fieldNumber)
+    {
+        String fieldName = MongoDBUtils.getFieldName(mmd, fieldNumber);
+        return ((Integer)dbObject.get(fieldName)).intValue();
+    }
+
+    @Override
+    public long fetchLongField(int fieldNumber)
+    {
+        String fieldName = MongoDBUtils.getFieldName(mmd, fieldNumber);
+        return ((Long)dbObject.get(fieldName)).longValue();
+    }
+
+    @Override
+    public float fetchFloatField(int fieldNumber)
+    {
+        String fieldName = MongoDBUtils.getFieldName(mmd, fieldNumber);
+        return ((Float)dbObject.get(fieldName)).floatValue();
+    }
+
+    @Override
+    public double fetchDoubleField(int fieldNumber)
+    {
+        String fieldName = MongoDBUtils.getFieldName(mmd, fieldNumber);
+        return ((Double)dbObject.get(fieldName)).doubleValue();
+    }
+
+    @Override
+    public String fetchStringField(int fieldNumber)
+    {
+        String fieldName = MongoDBUtils.getFieldName(mmd, fieldNumber);
+        if (dbObject.containsField(fieldName))
+        {
+            return (String)dbObject.get(fieldName);
+        }
+        else
+        {
+            return null;
+        }
+    }
+
+    @Override
+    public Object fetchObjectField(int fieldNumber)
+    {
+        ClassLoaderResolver clr = ec.getClassLoaderResolver();
+        AbstractMemberMetaData embMmd = mmd.getEmbeddedMetaData().getMemberMetaData()[fieldNumber];
+        int relationType = embMmd.getRelationType(clr);
+        if ((relationType == Relation.ONE_TO_ONE_UNI || relationType == Relation.ONE_TO_ONE_BI) && embMmd.isEmbedded())
+        {
+            // Persistable object embedded into table of this object
+            Class embcls = embMmd.getType();
+            AbstractClassMetaData embcmd = ec.getMetaDataManager().getMetaDataForClass(embcls, clr);
+            if (embcmd != null)
+            {
+                // Check for null value (currently need all columns to return null)
+                // TODO Cater for null using embmd.getNullIndicatorColumn etc
+                EmbeddedMetaData embmd = mmd.getEmbeddedMetaData();
+                AbstractMemberMetaData[] embmmds = embmd.getMemberMetaData();
+                boolean isNull = true;
+                for (int i=0;i<embmmds.length;i++)
+                {
+                    String embFieldName = MongoDBUtils.getFieldName(mmd, i);
+                    if (dbObject.containsField(embFieldName))
+                    {
+                        isNull = false;
+                        break;
+                    }
+                }
+                if (isNull)
+                {
+                    return null;
+                }
+
+                ObjectProvider embSM = ec.newObjectProviderForMember(embMmd, embcmd);
+                embSM.addEmbeddedOwner(sm, fieldNumber);
+                FieldManager ffm = new FetchEmbeddedFieldManager(embSM, dbObject, embMmd);
+                embSM.replaceFields(embcmd.getAllMemberPositions(), ffm);
+                return embSM.getObject();
+            }
+            throw new NucleusUserException("Field " + mmd.getFullFieldName() + " marked as embedded but no such metadata");
+        }
+
+        String fieldName = MongoDBUtils.getFieldName(mmd, fieldNumber);
+        if (!dbObject.containsField(fieldName))
+        {
+            return null;
+        }
+
+        Object value = dbObject.get(fieldName);
+        if (relationType == Relation.ONE_TO_ONE_BI || relationType == Relation.ONE_TO_ONE_UNI ||
+            relationType == Relation.MANY_TO_ONE_BI || relationType == Relation.MANY_TO_ONE_UNI)
+        {
+            String idStr = (String)value;
+            if (value == null)
+            {
+                return null;
+            }
+            AbstractClassMetaData otherCmd = ec.getMetaDataManager().getMetaDataForClass(embMmd.getType(), clr);
+            return MongoDBUtils.getObjectFromIdString(idStr, otherCmd,ec);
+        }
+        else if (relationType == Relation.ONE_TO_MANY_UNI || relationType == Relation.ONE_TO_MANY_BI ||
+                relationType == Relation.MANY_TO_MANY_BI)
+        {
+            if (embMmd.hasCollection())
+            {
+                // "a,b,c,d,..."
+                Collection<Object> coll;
+                AbstractClassMetaData elemCmd = embMmd.getCollection().getElementClassMetaData(clr, ec.getMetaDataManager());
+                try
+                {
+                    Class instanceType = SCOUtils.getContainerInstanceType(embMmd.getType(), embMmd.getOrderMetaData() != null);
+                    coll = (Collection<Object>) instanceType.newInstance();
+                }
+                catch (Exception e)
+                {
+                    throw new NucleusDataStoreException(e.getMessage(), e);
+                }
+
+                String collIdsStr = (String)value;
+                String[] components = MetaDataUtils.getInstance().getValuesForCommaSeparatedAttribute(collIdsStr);
+                for (int i=0;i<components.length;i++)
+                {
+                    String elementIdStr = components[i];
+                    coll.add(MongoDBUtils.getObjectFromIdString(elementIdStr, elemCmd, ec));
+                }
+                return coll;
+            }
+            else if (embMmd.hasMap())
+            {
+                // "{a,b},{c,d},..."
+                // TODO Support this
+                throw new NucleusException("Dont currently support retrieval of map field values");
+            }
+            else if (embMmd.hasArray())
+            {
+                // "a,b,c,d,..."
+                AbstractClassMetaData elemCmd = embMmd.getArray().getElementClassMetaData(clr, ec.getMetaDataManager());
+                String arrIdsStr = (String)value;
+                String[] components = MetaDataUtils.getInstance().getValuesForCommaSeparatedAttribute(arrIdsStr);
+                Object array = Array.newInstance(embMmd.getType().getComponentType(), arrIdsStr.length());
+                for (int i=0;i<components.length;i++)
+                {
+                    String elementIdStr = components[i];
+                    Array.set(array, i, MongoDBUtils.getObjectFromIdString(elementIdStr, elemCmd, ec));
+                }
+                return array;
+            }
+            else
+            {
+                return value;
+            }
+        }
+        else
+        {
+            ObjectStringConverter strConv = 
+                ec.getNucleusContext().getTypeManager().getStringConverter(value.getClass());
+            ObjectLongConverter longConv = 
+                ec.getNucleusContext().getTypeManager().getLongConverter(value.getClass());
+            if (strConv != null)
+            {
+                // Persisted as a String, so convert back
+                String strValue = (String)value;
+                return strConv.toObject(strValue);
+            }
+            else if (longConv != null)
+            {
+                // Persisted as a Long, so convert back
+                Long longValue = (Long)value;
+                return longConv.toObject(longValue);
+            }
+            return value;
+        }
+    }
+}
\ No newline at end of file

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2011-02-02 11:24:58 UTC (rev 12028)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2011-02-02 12:17:59 UTC (rev 12029)
@@ -25,15 +25,16 @@
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.exceptions.NucleusDataStoreException;
 import org.datanucleus.exceptions.NucleusException;
-import org.datanucleus.identity.OIDFactory;
+import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
-import org.datanucleus.metadata.IdentityType;
+import org.datanucleus.metadata.EmbeddedMetaData;
 import org.datanucleus.metadata.MetaDataUtils;
 import org.datanucleus.metadata.Relation;
 import org.datanucleus.store.ExecutionContext;
 import org.datanucleus.store.ObjectProvider;
 import org.datanucleus.store.fieldmanager.AbstractFieldManager;
+import org.datanucleus.store.fieldmanager.FieldManager;
 import org.datanucleus.store.mongodb.MongoDBUtils;
 import org.datanucleus.store.types.ObjectLongConverter;
 import org.datanucleus.store.types.ObjectStringConverter;
@@ -45,6 +46,7 @@
 public class FetchFieldManager extends AbstractFieldManager
 {
     private ExecutionContext ec;
+    private ObjectProvider sm;
 
     private DBObject dbObject;
 
@@ -52,7 +54,7 @@
 
     public FetchFieldManager(ObjectProvider sm, DBObject dbObject, AbstractClassMetaData acmd)
     {
-        super();
+        this.sm = sm;
         this.ec = sm.getExecutionContext();
         this.dbObject = dbObject;
         this.acmd = acmd;
@@ -147,17 +149,51 @@
     @Override
     public Object fetchObjectField(int fieldNumber)
     {
-        AbstractMemberMetaData ammd = acmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
-        String fieldName = MongoDBUtils.getFieldName(ammd);
+        AbstractMemberMetaData mmd = acmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+        ClassLoaderResolver clr = ec.getClassLoaderResolver();
+        int relationType = mmd.getRelationType(clr);
+        if ((relationType == Relation.ONE_TO_ONE_UNI || relationType == Relation.ONE_TO_ONE_BI) && mmd.isEmbedded())
+        {
+            // Persistable object embedded into table of this object
+            Class embcls = mmd.getType();
+            AbstractClassMetaData embcmd = ec.getMetaDataManager().getMetaDataForClass(embcls, clr);
+            if (embcmd != null)
+            {
+                // Check for null value (currently need all columns to return null)
+                // TODO Cater for null (use embmd.getNullIndicatorColumn/Value)
+                EmbeddedMetaData embmd = mmd.getEmbeddedMetaData();
+                AbstractMemberMetaData[] embmmds = embmd.getMemberMetaData();
+                boolean isNull = true;
+                for (int i=0;i<embmmds.length;i++)
+                {
+                    String embFieldName = MongoDBUtils.getFieldName(mmd, i);
+                    if (dbObject.containsField(embFieldName))
+                    {
+                        isNull = false;
+                        break;
+                    }
+                }
+                if (isNull)
+                {
+                    return null;
+                }
+
+                ObjectProvider embSM = ec.newObjectProviderForMember(mmd, embcmd);
+                embSM.addEmbeddedOwner(sm, fieldNumber);
+                FieldManager ffm = new FetchEmbeddedFieldManager(embSM, dbObject, mmd);
+                embSM.replaceFields(embcmd.getAllMemberPositions(), ffm);
+                return embSM.getObject();
+            }
+            throw new NucleusUserException("Field " + mmd.getFullFieldName() + " marked as embedded but no such metadata");
+        }
+
+        String fieldName = MongoDBUtils.getFieldName(mmd);
         if (!dbObject.containsField(fieldName))
         {
             return null;
         }
 
         Object value = dbObject.get(fieldName);
-        ClassLoaderResolver clr = ec.getClassLoaderResolver();
-        int relationType = ammd.getRelationType(clr);
-
         if (relationType == Relation.ONE_TO_ONE_BI || relationType == Relation.ONE_TO_ONE_UNI ||
             relationType == Relation.MANY_TO_ONE_BI || relationType == Relation.MANY_TO_ONE_UNI)
         {
@@ -166,19 +202,20 @@
             {
                 return null;
             }
-            AbstractClassMetaData otherCmd = ec.getMetaDataManager().getMetaDataForClass(ammd.getType(), clr);
-            return getObjectFromIdString(idStr, otherCmd);
+            AbstractClassMetaData otherCmd = ec.getMetaDataManager().getMetaDataForClass(mmd.getType(), clr);
+            return MongoDBUtils.getObjectFromIdString(idStr, otherCmd, ec);
         }
         else if (relationType == Relation.ONE_TO_MANY_UNI || relationType == Relation.ONE_TO_MANY_BI ||
                 relationType == Relation.MANY_TO_MANY_BI)
         {
-            if (ammd.hasCollection())
+            if (mmd.hasCollection())
             {
+                // "a,b,c,d,..."
                 Collection<Object> coll;
-                AbstractClassMetaData elemCmd = ammd.getCollection().getElementClassMetaData(clr, ec.getMetaDataManager());
+                AbstractClassMetaData elemCmd = mmd.getCollection().getElementClassMetaData(clr, ec.getMetaDataManager());
                 try
                 {
-                    Class instanceType = SCOUtils.getContainerInstanceType(ammd.getType(), ammd.getOrderMetaData() != null);
+                    Class instanceType = SCOUtils.getContainerInstanceType(mmd.getType(), mmd.getOrderMetaData() != null);
                     coll = (Collection<Object>) instanceType.newInstance();
                 }
                 catch (Exception e)
@@ -191,25 +228,27 @@
                 for (int i=0;i<components.length;i++)
                 {
                     String elementIdStr = components[i];
-                    coll.add(getObjectFromIdString(elementIdStr, elemCmd));
+                    coll.add(MongoDBUtils.getObjectFromIdString(elementIdStr, elemCmd, ec));
                 }
                 return coll;
             }
-            else if (ammd.hasMap())
+            else if (mmd.hasMap())
             {
+                // "{a,b},{c,d},..."
                 // TODO Support this
                 throw new NucleusException("Dont currently support retrieval of map field values");
             }
-            else if (ammd.hasArray())
+            else if (mmd.hasArray())
             {
-                AbstractClassMetaData elemCmd = ammd.getArray().getElementClassMetaData(clr, ec.getMetaDataManager());
+                // "a,b,c,d,..."
+                AbstractClassMetaData elemCmd = mmd.getArray().getElementClassMetaData(clr, ec.getMetaDataManager());
                 String arrIdsStr = (String)value;
                 String[] components = MetaDataUtils.getInstance().getValuesForCommaSeparatedAttribute(arrIdsStr);
-                Object array = Array.newInstance(ammd.getType().getComponentType(), arrIdsStr.length());
+                Object array = Array.newInstance(mmd.getType().getComponentType(), arrIdsStr.length());
                 for (int i=0;i<components.length;i++)
                 {
                     String elementIdStr = components[i];
-                    Array.set(array, i, getObjectFromIdString(elementIdStr, elemCmd));
+                    Array.set(array, i, MongoDBUtils.getObjectFromIdString(elementIdStr, elemCmd, ec));
                 }
                 return array;
             }
@@ -239,34 +278,4 @@
             return value;
         }
     }
-
-    /**
-     * Convenience method to find an object given a string form of its identity, and the metadata for the
-     * class (or a superclass).
-     * @param idStr The id string
-     * @param cmd Metadata for the class
-     * @return The object
-     */
-    protected Object getObjectFromIdString(String idStr, AbstractClassMetaData cmd)
-    {
-        ClassLoaderResolver clr = ec.getClassLoaderResolver();
-        Object id = null;
-        if (cmd.getIdentityType() == IdentityType.DATASTORE)
-        {
-            id = OIDFactory.getInstance(ec.getNucleusContext(), idStr);
-        }
-        else if (cmd.getIdentityType() == IdentityType.APPLICATION)
-        {
-            if (cmd.usesSingleFieldIdentityClass())
-            {
-                id = ec.getApiAdapter().getNewApplicationIdentityObjectId(clr, cmd, idStr);
-            }
-            else
-            {
-                Class cls = clr.classForName(cmd.getFullClassName());
-                id = ec.newObjectId(cls, idStr);
-            }
-        }
-        return ec.findObject(id, true, true, null);
-    }
 }
\ No newline at end of file

Added: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java	                        (rev 0)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java	2011-02-02 12:17:59 UTC (rev 12029)
@@ -0,0 +1,284 @@
+/**********************************************************************
+Copyright (c) 2011 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.store.mongodb.fieldmanager;
+
+import java.lang.reflect.Array;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.datanucleus.ClassLoaderResolver;
+import org.datanucleus.exceptions.NucleusException;
+import org.datanucleus.exceptions.NucleusUserException;
+import org.datanucleus.metadata.AbstractClassMetaData;
+import org.datanucleus.metadata.AbstractMemberMetaData;
+import org.datanucleus.metadata.Relation;
+import org.datanucleus.store.ExecutionContext;
+import org.datanucleus.store.ObjectProvider;
+import org.datanucleus.store.fieldmanager.AbstractFieldManager;
+import org.datanucleus.store.fieldmanager.FieldManager;
+import org.datanucleus.store.mongodb.MongoDBUtils;
+import org.datanucleus.store.types.ObjectLongConverter;
+import org.datanucleus.store.types.ObjectStringConverter;
+
+import com.mongodb.DBObject;
+
+/**
+ * FieldManager for the persistence of a related embedded object (1-1 relation).
+ */
+public class StoreEmbeddedFieldManager extends AbstractFieldManager
+{
+    private final ObjectProvider sm;
+    private final AbstractMemberMetaData mmd;
+    private DBObject dbObject;
+
+    public StoreEmbeddedFieldManager(ObjectProvider sm, DBObject dbObject, AbstractMemberMetaData mmd)
+    {
+        this.sm = sm;
+        this.dbObject = dbObject;
+        this.mmd = mmd;
+    }
+
+    @Override
+    public void storeBooleanField(int fieldNumber, boolean value)
+    {
+        String fieldName = MongoDBUtils.getFieldName(mmd, fieldNumber);
+        dbObject.put(fieldName, new Boolean(value));
+    }
+
+
+    @Override
+    public void storeCharField(int fieldNumber, char value)
+    {
+        String fieldName = MongoDBUtils.getFieldName(mmd, fieldNumber);
+        dbObject.put(fieldName, new Character(value));
+    }
+
+    @Override
+    public void storeByteField(int fieldNumber, byte value)
+    {
+        String fieldName = MongoDBUtils.getFieldName(mmd, fieldNumber);
+        dbObject.put(fieldName, new Byte(value));
+    }
+
+    @Override
+    public void storeShortField(int fieldNumber, short value)
+    {
+        String fieldName = MongoDBUtils.getFieldName(mmd, fieldNumber);
+        dbObject.put(fieldName, new Short(value));
+    }
+
+    @Override
+    public void storeIntField(int fieldNumber, int value)
+    {
+        String fieldName = MongoDBUtils.getFieldName(mmd, fieldNumber);
+        dbObject.put(fieldName, new Integer(value));
+    }
+
+    @Override
+    public void storeLongField(int fieldNumber, long value)
+    {
+        String fieldName = MongoDBUtils.getFieldName(mmd, fieldNumber);
+        dbObject.put(fieldName, new Long(value));
+    }
+
+    @Override
+    public void storeFloatField(int fieldNumber, float value)
+    {
+        String fieldName = MongoDBUtils.getFieldName(mmd, fieldNumber);
+        dbObject.put(fieldName, new Float(value));
+    }
+
+    @Override
+    public void storeDoubleField(int fieldNumber, double value)
+    {
+        String fieldName = MongoDBUtils.getFieldName(mmd, fieldNumber);
+        dbObject.put(fieldName, new Double(value));
+    }
+
+    @Override
+    public void storeStringField(int fieldNumber, String value)
+    {
+        String fieldName = MongoDBUtils.getFieldName(mmd, fieldNumber);
+        if (value == null)
+        {
+            dbObject.removeField(fieldName);
+            return;
+        }
+
+        dbObject.put(fieldName, value);
+    }
+
+    @Override
+    public void storeObjectField(int fieldNumber, Object value)
+    {
+        AbstractMemberMetaData embMmd = mmd.getEmbeddedMetaData().getMemberMetaData()[fieldNumber];
+        ExecutionContext ec = sm.getExecutionContext();
+        ClassLoaderResolver clr = ec.getClassLoaderResolver();
+        int relationType = embMmd.getRelationType(clr);
+        if ((relationType == Relation.ONE_TO_ONE_BI || relationType == Relation.ONE_TO_ONE_UNI) && embMmd.isEmbedded())
+        {
+            // (Nested) Embedded PC object
+            Class embcls = embMmd.getType();
+            AbstractClassMetaData embcmd = ec.getMetaDataManager().getMetaDataForClass(embcls, clr);
+            if (embcmd != null)
+            {
+                if (value == null)
+                {
+                    // TODO Delete any fields for the embedded object
+                    return;
+                }
+
+                ObjectProvider embSM = ec.findObjectProviderForEmbedded(value, sm, embMmd);
+                embSM.addEmbeddedOwner(sm, fieldNumber);
+                FieldManager ffm = new StoreEmbeddedFieldManager(embSM, dbObject, embMmd);
+                embSM.provideFields(embcmd.getAllMemberPositions(), ffm);
+                return;
+            }
+            else
+            {
+                throw new NucleusUserException("Field " + embMmd.getFullFieldName() +
+                    " specified as embedded but metadata not found for the class of type " + embMmd.getTypeName());
+            }
+        }
+
+        String fieldName = MongoDBUtils.getFieldName(mmd, fieldNumber);
+        if (value == null)
+        {
+            if (dbObject.containsField(fieldName))
+            {
+                dbObject.removeField(fieldName);
+            }
+            return;
+        }
+
+        if (relationType == Relation.ONE_TO_ONE_BI || relationType == Relation.ONE_TO_ONE_UNI ||
+            relationType == Relation.MANY_TO_ONE_BI || relationType == Relation.MANY_TO_ONE_UNI)
+        {
+            // PC object, so make sure it is persisted
+            Object valuePC = sm.getExecutionContext().persistObjectInternal(value, sm, fieldNumber, -1);
+            Object valueId = ec.getApiAdapter().getIdForObject(valuePC);
+            dbObject.put(fieldName, valueId.toString()); // Store the id String form
+        }
+        else if (relationType == Relation.ONE_TO_MANY_UNI || relationType == Relation.ONE_TO_MANY_BI ||
+            relationType == Relation.MANY_TO_MANY_BI)
+        {
+            // Collection/Map/Array
+            if (embMmd.hasCollection())
+            {
+                StringBuffer str = new StringBuffer();
+                Collection coll = (Collection)value;
+                Iterator collIter = coll.iterator();
+                while (collIter.hasNext())
+                {
+                    Object element = collIter.next();
+                    Object elementPC = sm.getExecutionContext().persistObjectInternal(element, sm, fieldNumber, -1);
+                    Object elementID = sm.getExecutionContext().getApiAdapter().getIdForObject(elementPC);
+                    str.append(elementID.toString());
+                    if (collIter.hasNext())
+                    {
+                        str.append(",");
+                    }
+                }
+                dbObject.put(fieldName, str.toString()); // Store comma-separated string form of ids
+            }
+            else if (embMmd.hasMap())
+            {
+                StringBuffer str = new StringBuffer();
+                Map map = (Map)value;
+                Iterator<Map.Entry> mapIter = map.entrySet().iterator();
+                while (mapIter.hasNext())
+                {
+                    Map.Entry entry = mapIter.next();
+                    Object mapKey = entry.getKey();
+                    Object mapValue = entry.getValue();
+                    str.append("{");
+                    if (ec.getApiAdapter().isPersistable(mapKey))
+                    {
+                        Object pc = ec.persistObjectInternal(mapKey, sm, fieldNumber, -1);
+                        Object keyID = sm.getExecutionContext().getApiAdapter().getIdForObject(pc);
+                        str.append(keyID.toString());
+                    }
+                    else
+                    {
+                        str.append(mapKey);
+                    }
+
+                    if (ec.getApiAdapter().isPersistable(mapValue))
+                    {
+                        Object pc = ec.persistObjectInternal(mapValue, sm, fieldNumber, -1);
+                        Object valueID = sm.getExecutionContext().getApiAdapter().getIdForObject(pc);
+                        str.append(valueID.toString());
+                    }
+                    else
+                    {
+                        str.append(mapValue);
+                    }
+
+                    str.append("}");
+                    if (mapIter.hasNext())
+                    {
+                        str.append(",");
+                    }
+                }
+                // TODO Remove this when we can retrieve maps
+                throw new NucleusException("Dont currently support retrieval of map field values");
+//                dbObject.put(fieldName, str.toString()); // Store comma-separated string form of entries
+            }
+            else if (embMmd.hasArray())
+            {
+                StringBuffer str = new StringBuffer();
+                for (int i=0;i<Array.getLength(value);i++)
+                {
+                    Object element = Array.get(value, i);
+                    Object elementPC = ec.persistObjectInternal(element, sm, fieldNumber, -1);
+                    Object elementID = ec.getApiAdapter().getIdForObject(elementPC);
+                    str.append(elementID.toString());
+                    if (i < Array.getLength(value)-1)
+                    {
+                        str.append(",");
+                    }
+                }
+                dbObject.put(fieldName, str.toString()); // Store comma-separated string form of ids
+            }
+        }
+        else
+        {
+            ObjectStringConverter strConv = 
+                ec.getNucleusContext().getTypeManager().getStringConverter(value.getClass());
+            ObjectLongConverter longConv = 
+                ec.getNucleusContext().getTypeManager().getLongConverter(value.getClass());
+            if (strConv != null)
+            {
+                // Persist as a String
+                String strValue = strConv.toString(value);
+                dbObject.put(fieldName, strValue);
+            }
+            else if (longConv != null)
+            {
+                // Persist as a Long
+                Long longValue = longConv.toLong(value);
+                dbObject.put(fieldName, longValue);
+            }
+            else
+            {
+                dbObject.put(fieldName, value);
+            }
+        }
+    }
+}
\ No newline at end of file

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2011-02-02 11:24:58 UTC (rev 12028)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2011-02-02 12:17:59 UTC (rev 12029)
@@ -26,12 +26,14 @@
 
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.exceptions.NucleusException;
+import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.Relation;
 import org.datanucleus.store.ExecutionContext;
 import org.datanucleus.store.ObjectProvider;
 import org.datanucleus.store.fieldmanager.AbstractFieldManager;
+import org.datanucleus.store.fieldmanager.FieldManager;
 import org.datanucleus.store.mongodb.MongoDBUtils;
 import org.datanucleus.store.types.ObjectLongConverter;
 import org.datanucleus.store.types.ObjectStringConverter;
@@ -138,6 +140,34 @@
     public void storeObjectField(int fieldNumber, Object value)
     {
         AbstractMemberMetaData mmd = acmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+        ExecutionContext ec = sm.getExecutionContext();
+        ClassLoaderResolver clr = ec.getClassLoaderResolver();
+        int relationType = mmd.getRelationType(clr);
+        if ((relationType == Relation.ONE_TO_ONE_BI || relationType == Relation.ONE_TO_ONE_UNI) && mmd.isEmbedded())
+        {
+            // Embedded PC object
+            Class embcls = mmd.getType();
+            AbstractClassMetaData embcmd = ec.getMetaDataManager().getMetaDataForClass(embcls, clr);
+            if (embcmd != null)
+            {
+                if (value == null)
+                {
+                    // TODO Delete any fields for the embedded object
+                    return;
+                }
+                ObjectProvider embSM = ec.findObjectProviderForEmbedded(value, sm, mmd);
+                embSM.addEmbeddedOwner(sm, fieldNumber);
+                FieldManager ffm = new StoreEmbeddedFieldManager(embSM, dbObject, mmd);
+                embSM.provideFields(embcmd.getAllMemberPositions(), ffm);
+                return;
+            }
+            else
+            {
+                throw new NucleusUserException("Field " + mmd.getFullFieldName() +
+                    " specified as embedded but metadata not found for the class of type " + mmd.getTypeName());
+            }
+        }
+
         String fieldName = MongoDBUtils.getFieldName(mmd);
         if (value == null)
         {
@@ -148,9 +178,6 @@
             return;
         }
 
-        ExecutionContext ec = sm.getExecutionContext();
-        ClassLoaderResolver clr = ec.getClassLoaderResolver();
-        int relationType = mmd.getRelationType(clr);
         if (relationType == Relation.ONE_TO_ONE_BI || relationType == Relation.ONE_TO_ONE_UNI ||
             relationType == Relation.MANY_TO_ONE_BI || relationType == Relation.MANY_TO_ONE_UNI)
         {
@@ -183,6 +210,7 @@
             }
             else if (mmd.hasMap())
             {
+                StringBuffer str = new StringBuffer();
                 Map map = (Map)value;
                 Iterator<Map.Entry> mapIter = map.entrySet().iterator();
                 while (mapIter.hasNext())
@@ -190,16 +218,38 @@
                     Map.Entry entry = mapIter.next();
                     Object mapKey = entry.getKey();
                     Object mapValue = entry.getValue();
+                    str.append("{");
                     if (ec.getApiAdapter().isPersistable(mapKey))
                     {
-                        ec.persistObjectInternal(mapKey, sm, fieldNumber, -1);
+                        Object pc = ec.persistObjectInternal(mapKey, sm, fieldNumber, -1);
+                        Object keyID = sm.getExecutionContext().getApiAdapter().getIdForObject(pc);
+                        str.append(keyID.toString());
                     }
+                    else
+                    {
+                        str.append(mapKey);
+                    }
+
                     if (ec.getApiAdapter().isPersistable(mapValue))
                     {
-                        ec.persistObjectInternal(mapValue, sm, fieldNumber, -1);
+                        Object pc = ec.persistObjectInternal(mapValue, sm, fieldNumber, -1);
+                        Object valueID = sm.getExecutionContext().getApiAdapter().getIdForObject(pc);
+                        str.append(valueID.toString());
                     }
+                    else
+                    {
+                        str.append(mapValue);
+                    }
+
+                    str.append("}");
+                    if (mapIter.hasNext())
+                    {
+                        str.append(",");
+                    }
                 }
-                throw new NucleusException("Dont currently support persistence of maps");
+                // TODO Remove this when we can retrieve maps
+                throw new NucleusException("Dont currently support retrieval of map field values");
+//                dbObject.put(fieldName, str.toString()); // Store comma-separated string form of entries
             }
             else if (mmd.hasArray())
             {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12033
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=12033&view=rev
Author:   andy_jefferson
Date:     2011-02-02 14:32:12 +0000 (Wed, 02 Feb 2011)

Log Message:
-----------
TODOs

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java	2011-02-02 12:19:59 UTC (rev 12032)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java	2011-02-02 14:32:12 UTC (rev 12033)
@@ -60,6 +60,7 @@
     protected void registerConnectionMgr()
     {
         super.registerConnectionMgr();
+        // TODO Why can't we use the connection pool ?
         this.connectionMgr.disableConnectionPool();
     }
 

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-02 12:19:59 UTC (rev 12032)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-02 14:32:12 UTC (rev 12033)
@@ -230,9 +230,12 @@
             boolean subclasses, boolean ignoreCache, FetchPlan fp)
     {
         final AbstractClassMetaData cmd = ec.getMetaDataManager().getMetaDataForClass(candidateClass, ec.getClassLoaderResolver());
+
+        //TODO Allow for subclasses
         BasicDBObject query = new BasicDBObject();
         DBCollection dbCollection = db.getCollection(MongoDBUtils.getCollectionName(cmd));
         DBCursor curs = dbCollection.find(query);
+
         List results = new ArrayList();
         if (cmd.getIdentityType() == IdentityType.APPLICATION)
         {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12046
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=12046&view=rev
Author:   andy_jefferson
Date:     2011-02-02 19:44:30 +0000 (Wed, 02 Feb 2011)

Log Message:
-----------
[NUCMONGODB-2] Majority of index/unique creation for SchemaTool usage

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-02 19:43:36 UTC (rev 12045)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-02 19:44:30 UTC (rev 12046)
@@ -71,6 +71,7 @@
             storeMgr.addClass(sm.getClassMetaData().getFullClassName(),sm.getExecutionContext().getClassLoaderResolver());
         }
 
+        // TODO Remove this when we enforce uniqueness on the PK reliably
         AbstractClassMetaData cmd = sm.getClassMetaData();
         if (cmd.getIdentityType() != IdentityType.NONDURABLE)
         {

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java	2011-02-02 19:43:36 UTC (rev 12045)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java	2011-02-02 19:44:30 UTC (rev 12046)
@@ -27,13 +27,22 @@
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.NucleusContext;
 import org.datanucleus.metadata.AbstractClassMetaData;
+import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.ClassMetaData;
 import org.datanucleus.metadata.ClassPersistenceModifier;
+import org.datanucleus.metadata.ColumnMetaData;
+import org.datanucleus.metadata.IdentityStrategy;
+import org.datanucleus.metadata.IdentityType;
+import org.datanucleus.metadata.IndexMetaData;
+import org.datanucleus.metadata.UniqueMetaData;
 import org.datanucleus.store.AbstractStoreManager;
 import org.datanucleus.store.StoreData;
 import org.datanucleus.store.connection.ManagedConnection;
 import org.datanucleus.store.schema.SchemaAwareStoreManager;
+import org.datanucleus.util.NucleusLogger;
+import org.datanucleus.util.StringUtils;
 
+import com.mongodb.BasicDBObject;
 import com.mongodb.DB;
 import com.mongodb.DBCollection;
 
@@ -107,30 +116,40 @@
         {
             return;
         }
-
+NucleusLogger.DATASTORE_SCHEMA.debug(">> addClasses for " + StringUtils.objectArrayToString(classNames));
         // Filter out any "simple" type classes
         String[] filteredClassNames = 
             getNucleusContext().getTypeManager().filterOutSupportedSecondClassNames(classNames);
 
         // Find the ClassMetaData for these classes and all referenced by these classes
-        Iterator iter = getMetaDataManager().getReferencedClasses(filteredClassNames, clr).iterator();
-        while (iter.hasNext())
+        ManagedConnection mconn = getConnection(-1);
+        try
         {
-            ClassMetaData cmd = (ClassMetaData)iter.next();
-            if (cmd.getPersistenceModifier() == ClassPersistenceModifier.PERSISTENCE_CAPABLE)
+            DB db = (DB)mconn.getConnection();
+            Iterator iter = getMetaDataManager().getReferencedClasses(filteredClassNames, clr).iterator();
+            while (iter.hasNext())
             {
-                if (!storeDataMgr.managesClass(cmd.getFullClassName()))
+                ClassMetaData cmd = (ClassMetaData)iter.next();
+                if (cmd.getPersistenceModifier() == ClassPersistenceModifier.PERSISTENCE_CAPABLE)
                 {
-                    StoreData sd = storeDataMgr.get(cmd.getFullClassName());
-                    if (sd == null)
+                    if (!storeDataMgr.managesClass(cmd.getFullClassName()))
                     {
-                        registerStoreData(newStoreData(cmd, clr));
+                        StoreData sd = storeDataMgr.get(cmd.getFullClassName());
+                        if (sd == null)
+                        {
+                            registerStoreData(newStoreData(cmd, clr));
+                        }
+
+                        // Create schema for class
+                        createSchemaForClass(cmd, db);
                     }
-
-                    // TODO Create schema (collection/indices) for class
                 }
             }
         }
+        finally
+        {
+            mconn.release();
+        }
     }
 
     /* (non-Javadoc)
@@ -151,9 +170,7 @@
                 AbstractClassMetaData cmd = getMetaDataManager().getMetaDataForClass(className, clr);
                 if (cmd != null)
                 {
-                    /*DBCollection collection = */db.getCollection(MongoDBUtils.getCollectionName(cmd));
-                    // TODO Create schema for this class
-                    // TODO Create indexes for this class
+                    createSchemaForClass(cmd, db);
                 }
             }
         }
@@ -163,6 +180,140 @@
         }
     }
 
+    protected void createSchemaForClass(AbstractClassMetaData cmd, DB db)
+    {
+        // Create collection (if not existing)
+        DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(cmd));
+        // TODO Create fields for this class?
+
+        IndexMetaData[] idxmds = cmd.getIndexMetaData();
+        if (idxmds != null && idxmds.length > 0)
+        {
+            for (int i=0;i<idxmds.length;i++)
+            {
+                BasicDBObject query = new BasicDBObject();
+                if (idxmds[i].getColumnMetaData() != null)
+                {
+                    ColumnMetaData[] idxcolmds = idxmds[i].getColumnMetaData();
+                    for (int j=0;j<idxcolmds.length;j++)
+                    {
+                        query.append(idxcolmds[j].getName(), 1);
+                    }
+                }
+                else if (idxmds[i].getMemberMetaData() != null)
+                {
+                    AbstractMemberMetaData[] idxmmds = idxmds[i].getMemberMetaData();
+                    for (int j=0;j<idxmmds.length;j++)
+                    {
+                        String memberName = idxmmds[i].getName();
+                        AbstractMemberMetaData mmd = cmd.getMetaDataForMember(memberName);
+                        query.append(MongoDBUtils.getFieldName(mmd), 1);
+                    }
+                }
+                NucleusLogger.DATASTORE_SCHEMA.debug(">> Creating index for " + query + 
+                    " name=" + idxmds[i].getName() + " unique=" + idxmds[i].isUnique());
+                collection.ensureIndex(query, idxmds[i].getName(), idxmds[i].isUnique());
+            }
+        }
+        UniqueMetaData[] unimds = cmd.getUniqueMetaData();
+        if (unimds != null && unimds.length > 0)
+        {
+            for (int i=0;i<unimds.length;i++)
+            {
+                BasicDBObject query = new BasicDBObject();
+                if (unimds[i].getColumnMetaData() != null)
+                {
+                    ColumnMetaData[] unicolmds = unimds[i].getColumnMetaData();
+                    for (int j=0;j<unicolmds.length;j++)
+                    {
+                        query.append(unicolmds[j].getName(), 1);
+                    }
+                }
+                else if (unimds[i].getMemberMetaData() != null)
+                {
+                    AbstractMemberMetaData[] unimmds = unimds[i].getMemberMetaData();
+                    for (int j=0;j<unimmds.length;j++)
+                    {
+                        String memberName = unimmds[i].getName();
+                        AbstractMemberMetaData mmd = cmd.getMetaDataForMember(memberName);
+                        query.append(MongoDBUtils.getFieldName(mmd), 1);
+                    }
+                }
+                NucleusLogger.DATASTORE_SCHEMA.debug(">> Creating index for " + query + 
+                    " name=" + unimds[i].getName() + " unique");
+                collection.ensureIndex(query, unimds[i].getName(), true);
+            }
+        }
+
+        if (cmd.getIdentityType() == IdentityType.APPLICATION)
+        {
+            // Add unique index on PK
+            BasicDBObject query = new BasicDBObject();
+            int[] pkFieldNumbers = cmd.getPKMemberPositions();
+            for (int i=0;i<pkFieldNumbers.length;i++)
+            {
+                AbstractMemberMetaData pkMmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(pkFieldNumbers[i]);
+                query.append(MongoDBUtils.getFieldName(pkMmd), 1);
+            }
+            if (cmd.getPrimaryKeyMetaData() != null)
+            {
+                collection.ensureIndex(query, cmd.getPrimaryKeyMetaData().getName(), true);
+            }
+            else
+            {
+                collection.ensureIndex(query, cmd.getName() + "_PK", true);
+            }
+            NucleusLogger.DATASTORE_SCHEMA.debug(">> Creating unique index on PK of " + cmd.getFullClassName() + " as " + query);
+        }
+        else if (cmd.getIdentityType() == IdentityType.DATASTORE)
+        {
+            if (cmd.getIdentityMetaData().getValueStrategy() == IdentityStrategy.IDENTITY)
+            {
+                // Using builtin "_id" field so nothing to do
+            }
+            else
+            {
+                BasicDBObject query = new BasicDBObject();
+                query.append(MongoDBUtils.getFieldName(cmd.getIdentityMetaData()), 1);
+                if (cmd.getPrimaryKeyMetaData() != null)
+                {
+                    collection.ensureIndex(query, cmd.getPrimaryKeyMetaData().getName(), true);
+                }
+                else
+                {
+                    collection.ensureIndex(query, cmd.getName() + "_PK", true);
+                }
+                NucleusLogger.DATASTORE_SCHEMA.debug(">> Creating unique index on PK of " + cmd.getFullClassName() + " as " + query);
+            }
+        }
+
+        AbstractMemberMetaData[] mmds = cmd.getManagedMembers();
+        if (mmds != null && mmds.length > 0)
+        {
+            for (int i=0;i<mmds.length;i++)
+            {
+                IndexMetaData idxmd = mmds[i].getIndexMetaData();
+                if (idxmd != null)
+                {
+                    BasicDBObject query = new BasicDBObject();
+                    query.append(MongoDBUtils.getFieldName(mmds[i]), 1);
+                    NucleusLogger.DATASTORE_SCHEMA.debug(">> Creating index for " + query + 
+                        " name=" + idxmd + " unique=" + idxmd.isUnique());
+                    collection.ensureIndex(query, idxmd.getName(), idxmd.isUnique());
+                }
+                UniqueMetaData unimd = mmds[i].getUniqueMetaData();
+                if (unimd != null)
+                {
+                    BasicDBObject query = new BasicDBObject();
+                    query.append(MongoDBUtils.getFieldName(mmds[i]), 1);
+                    NucleusLogger.DATASTORE_SCHEMA.debug(">> Creating index for " + query + 
+                        " name=" + unimd + " unique=true");
+                    collection.ensureIndex(query, unimd.getName(), true);
+                }
+            }
+        }
+    }
+
     /* (non-Javadoc)
      * @see org.datanucleus.store.schema.SchemaAwareStoreManager#deleteSchema(java.util.Set)
      */
@@ -182,6 +333,7 @@
                 if (cmd != null)
                 {
                     DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(cmd));
+                    collection.dropIndexes();
                     collection.drop();
                 }
             }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12074
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=12074&view=rev
Author:   andy_jefferson
Date:     2011-02-04 10:34:12 +0000 (Fri, 04 Feb 2011)

Log Message:
-----------
[NUCMONGODB-14] Support fetch plan, so retrieval only pulls back the fields needed (catering for any embedded PCs too)

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchEmbeddedFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-04 10:33:22 UTC (rev 12073)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-04 10:34:12 UTC (rev 12074)
@@ -32,6 +32,7 @@
 import org.datanucleus.metadata.IdentityMetaData;
 import org.datanucleus.metadata.IdentityStrategy;
 import org.datanucleus.metadata.IdentityType;
+import org.datanucleus.metadata.Relation;
 import org.datanucleus.metadata.VersionMetaData;
 import org.datanucleus.store.ExecutionContext;
 import org.datanucleus.store.FieldValues2;
@@ -91,15 +92,23 @@
      */
     public static String getFieldName(IdentityMetaData idmd)
     {
-        // Try the first column if specified
-        ColumnMetaData[] colmds = idmd.getColumnMetaData();
-        if (colmds != null && colmds.length > 1)
+        if (idmd.getValueStrategy() == IdentityStrategy.IDENTITY)
         {
-            return colmds[0].getName();
+            // Make use of MongoDB "_id" field
+            return "_id";
         }
+        else
+        {
+            // Try the first column if specified
+            ColumnMetaData[] colmds = idmd.getColumnMetaData();
+            if (colmds != null && colmds.length > 1)
+            {
+                return colmds[0].getName();
+            }
 
-        // Fallback to "IDENTITY"
-        return "IDENTITY";
+            // Fallback to "IDENTITY"
+            return "IDENTITY";
+        }
     }
 
     /**
@@ -229,20 +238,75 @@
     public static List getObjectsOfCandidateType(ExecutionContext ec, DB db, Class candidateClass, 
             boolean subclasses, boolean ignoreCache, FetchPlan fp)
     {
+        ClassLoaderResolver clr = ec.getClassLoaderResolver();
+
+        AbstractClassMetaData cmd = ec.getMetaDataManager().getMetaDataForClass(candidateClass, clr);
+        List results = getObjectsOfType(cmd, db, ec, ignoreCache, fp);
+
+        if (subclasses)
+        {
+            // TODO Cater for inheritance here - maybe they persist all into the same table, with discriminator?
+            String[] subclassNames = ec.getMetaDataManager().getSubclassesForClass(candidateClass.getName(), true);
+            if (subclassNames != null && subclassNames.length > 0)
+            {
+                for (int i=0;i<subclassNames.length;i++)
+                {
+                    AbstractClassMetaData subcmd = ec.getMetaDataManager().getMetaDataForClass(subclassNames[i], clr);
+                    results.addAll(getObjectsOfType(subcmd, db, ec, ignoreCache, fp));
+                }
+            }
+        }
+
+        return results;
+    }
+
+    protected static List getObjectsOfType(AbstractClassMetaData cmd, DB db, ExecutionContext ec, boolean ignoreCache,
+            FetchPlan fp)
+    {
         List results = new ArrayList();
 
         ClassLoaderResolver clr = ec.getClassLoaderResolver();
-        AbstractClassMetaData cmd = ec.getMetaDataManager().getMetaDataForClass(candidateClass, clr);
-        DBCursor curs = db.getCollection(MongoDBUtils.getCollectionName(cmd)).find(new BasicDBObject());
+        fp.manageFetchPlanForClass(cmd);
+        int[] fpMembers = fp.getFetchPlanForClass(cmd).getMemberNumbers();
+        BasicDBObject fieldsSelection = new BasicDBObject();
+        if (fpMembers != null && fpMembers.length > 0)
+        {
+            fieldsSelection = new BasicDBObject();
+            for (int i=0;i<fpMembers.length;i++)
+            {
+                AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fpMembers[i]);
+                int relationType = mmd.getRelationType(clr);
+                if (mmd.isEmbedded() && 
+                    (relationType == Relation.ONE_TO_ONE_UNI || relationType == Relation.ONE_TO_ONE_BI ||
+                     relationType == Relation.MANY_TO_ONE_BI || relationType == Relation.MANY_TO_ONE_UNI))
+                {
+                    // Embedded field, so add all fields of sub-objects
+                    selectAllFieldsOfEmbeddedObject(mmd, fieldsSelection, ec, clr);
+                }
+                else
+                {
+                    String fieldName = MongoDBUtils.getFieldName(mmd);
+                    fieldsSelection.append(fieldName, 1);
+                }
+            }
+        }
+        if (cmd.getIdentityType() == IdentityType.DATASTORE)
+        {
+            fieldsSelection.append(MongoDBUtils.getFieldName(cmd.getIdentityMetaData()), 1);
+        }
+        if (cmd.hasVersionStrategy())
+        {
+            fieldsSelection.append(MongoDBUtils.getFieldName(cmd.getVersionMetaData()), 1);
+        }
 
-        // TODO Set key fields to be retrieved (extra argument on "find()")
-        // TODO Only load fields in the FetchPlan
+        DBCursor curs = db.getCollection(MongoDBUtils.getCollectionName(cmd)).find(new BasicDBObject(), fieldsSelection);
+
         if (cmd.getIdentityType() == IdentityType.APPLICATION)
         {
             while (curs.hasNext())
             {
                 final DBObject dbObject = curs.next();
-                results.add(getObjectUsingApplicationIdForDBObject(dbObject, cmd, ec, ignoreCache));
+                results.add(getObjectUsingApplicationIdForDBObject(dbObject, cmd, ec, ignoreCache, fpMembers));
             }
         }
         else if (cmd.getIdentityType() == IdentityType.DATASTORE)
@@ -250,46 +314,36 @@
             while (curs.hasNext())
             {
                 final DBObject dbObject = curs.next();
-                results.add(getObjectUsingDatastoreIdForDBObject(dbObject, cmd, ec, ignoreCache));
+                results.add(getObjectUsingDatastoreIdForDBObject(dbObject, cmd, ec, ignoreCache, fpMembers));
             }
         }
+        return results;
+    }
 
-        if (subclasses)
+    protected static void selectAllFieldsOfEmbeddedObject(AbstractMemberMetaData mmd, BasicDBObject fieldsSelection,
+            ExecutionContext ec, ClassLoaderResolver clr)
+    {
+        EmbeddedMetaData embmd = mmd.getEmbeddedMetaData();
+        AbstractMemberMetaData[] embmmds = embmd.getMemberMetaData();
+        for (int i=0;i<embmmds.length;i++)
         {
-            // TODO Cater for inheritance here - maybe they persist all into the same table, with discriminator?
-            String[] subclassNames = ec.getMetaDataManager().getSubclassesForClass(candidateClass.getName(), true);
-            if (subclassNames != null && subclassNames.length > 0)
+            int relationType = embmmds[i].getRelationType(clr);
+            if (embmmds[i].isEmbedded() &&
+                (relationType == Relation.ONE_TO_ONE_UNI || relationType == Relation.ONE_TO_ONE_BI ||
+                 relationType == Relation.MANY_TO_ONE_BI || relationType == Relation.MANY_TO_ONE_UNI))
             {
-                for (int i=0;i<subclassNames.length;i++)
-                {
-                    AbstractClassMetaData subcmd = ec.getMetaDataManager().getMetaDataForClass(subclassNames[i], clr);
-                    DBCursor subcur = db.getCollection(MongoDBUtils.getCollectionName(subcmd)).find(new BasicDBObject());
-
-                    if (cmd.getIdentityType() == IdentityType.APPLICATION)
-                    {
-                        while (subcur.hasNext())
-                        {
-                            final DBObject dbObject = subcur.next();
-                            results.add(getObjectUsingApplicationIdForDBObject(dbObject, subcmd, ec, ignoreCache));
-                        }
-                    }
-                    else if (cmd.getIdentityType() == IdentityType.DATASTORE)
-                    {
-                        while (curs.hasNext())
-                        {
-                            final DBObject dbObject = subcur.next();
-                            results.add(getObjectUsingDatastoreIdForDBObject(dbObject, subcmd, ec, ignoreCache));
-                        }
-                    }
-                }
+                selectAllFieldsOfEmbeddedObject(embmmds[i], fieldsSelection, ec, clr);
             }
+            else
+            {
+                String embFieldName = MongoDBUtils.getFieldName(mmd, i);
+                fieldsSelection.append(embFieldName, 1);
+            }
         }
-
-        return results;
     }
 
     protected static Object getObjectUsingApplicationIdForDBObject(final DBObject dbObject, final AbstractClassMetaData cmd,
-            final ExecutionContext ec, boolean ignoreCache)
+            final ExecutionContext ec, boolean ignoreCache, final int[] fpMembers)
     {
         Object id = IdentityUtils.getApplicationIdentityForResultSetRow(ec, cmd, null, 
             false, new FetchFieldManager(ec, dbObject, cmd));
@@ -299,11 +353,11 @@
             {
                 public void fetchFields(ObjectProvider sm)
                 {
-                    sm.replaceFields(cmd.getAllMemberPositions(), new FetchFieldManager(ec, dbObject, cmd));
+                    sm.replaceFields(fpMembers, new FetchFieldManager(ec, dbObject, cmd));
                 }
                 public void fetchNonLoadedFields(ObjectProvider sm)
                 {
-                    sm.replaceNonLoadedFields(cmd.getAllMemberPositions(), new FetchFieldManager(ec, dbObject, cmd));
+                    sm.replaceNonLoadedFields(fpMembers, new FetchFieldManager(ec, dbObject, cmd));
                 }
                 public FetchPlan getFetchPlanForLoading()
                 {
@@ -333,7 +387,7 @@
     }
 
     protected static Object getObjectUsingDatastoreIdForDBObject(final DBObject dbObject, final AbstractClassMetaData cmd,
-            final ExecutionContext ec, boolean ignoreCache)
+            final ExecutionContext ec, boolean ignoreCache, final int[] fpMembers)
     {
         Object idKey = null;
         if (cmd.getIdentityMetaData().getValueStrategy() == IdentityStrategy.IDENTITY)
@@ -351,13 +405,11 @@
                 // StateManager calls the fetchFields method
                 public void fetchFields(ObjectProvider sm)
                 {
-                    sm.replaceFields(cmd.getAllMemberPositions(), 
-                        new FetchFieldManager(ec, dbObject, cmd));
+                    sm.replaceFields(fpMembers, new FetchFieldManager(ec, dbObject, cmd));
                 }
                 public void fetchNonLoadedFields(ObjectProvider sm)
                 {
-                    sm.replaceNonLoadedFields(cmd.getAllMemberPositions(), 
-                        new FetchFieldManager(ec, dbObject, cmd));
+                    sm.replaceNonLoadedFields(fpMembers, new FetchFieldManager(ec, dbObject, cmd));
                 }
                 public FetchPlan getFetchPlanForLoading()
                 {
@@ -385,35 +437,4 @@
         }
         return pc;
     }
-
-    /**
-     * Convenience method to find an object given a string form of its identity, and the metadata for the
-     * class (or a superclass).
-     * @param idStr The id string
-     * @param cmd Metadata for the class
-     * @param ec Execution Context
-     * @return The object
-     */
-    public static Object getObjectFromIdString(String idStr, AbstractClassMetaData cmd, ExecutionContext ec)
-    {
-        ClassLoaderResolver clr = ec.getClassLoaderResolver();
-        Object id = null;
-        if (cmd.getIdentityType() == IdentityType.DATASTORE)
-        {
-            id = OIDFactory.getInstance(ec.getNucleusContext(), idStr);
-        }
-        else if (cmd.getIdentityType() == IdentityType.APPLICATION)
-        {
-            if (cmd.usesSingleFieldIdentityClass())
-            {
-                id = ec.getApiAdapter().getNewApplicationIdentityObjectId(clr, cmd, idStr);
-            }
-            else
-            {
-                Class cls = clr.classForName(cmd.getFullClassName());
-                id = ec.newObjectId(cls, idStr);
-            }
-        }
-        return ec.findObject(id, true, true, null);
-    }
 }
\ No newline at end of file

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchEmbeddedFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchEmbeddedFieldManager.java	2011-02-04 10:33:22 UTC (rev 12073)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchEmbeddedFieldManager.java	2011-02-04 10:34:12 UTC (rev 12074)
@@ -25,6 +25,7 @@
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.exceptions.NucleusDataStoreException;
 import org.datanucleus.exceptions.NucleusUserException;
+import org.datanucleus.identity.IdentityUtils;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.EmbeddedMetaData;
@@ -185,7 +186,7 @@
                 return null;
             }
             AbstractClassMetaData otherCmd = ec.getMetaDataManager().getMetaDataForClass(embMmd.getType(), clr);
-            return MongoDBUtils.getObjectFromIdString(idStr, otherCmd,ec);
+            return IdentityUtils.getObjectFromIdString(idStr, otherCmd, ec, true);
         }
         else if (relationType == Relation.ONE_TO_MANY_UNI || relationType == Relation.ONE_TO_MANY_BI ||
                 relationType == Relation.MANY_TO_MANY_BI)
@@ -210,7 +211,7 @@
                 while (idIter.hasNext())
                 {
                     String elementIdStr = (String)idIter.next();
-                    coll.add(MongoDBUtils.getObjectFromIdString(elementIdStr, elemCmd, ec));
+                    coll.add(IdentityUtils.getObjectFromIdString(elementIdStr, elemCmd, ec, true));
                 }
                 return coll;
             }
@@ -244,7 +245,7 @@
 
                     if (keyCmd != null)
                     {
-                        mapKey = MongoDBUtils.getObjectFromIdString(keyStr, keyCmd, ec);
+                        mapKey = IdentityUtils.getObjectFromIdString(keyStr, keyCmd, ec, true);
                     }
                     else
                     {
@@ -253,7 +254,7 @@
                     }
                     if (valueCmd != null)
                     {
-                        mapVal = MongoDBUtils.getObjectFromIdString(valueStr, valueCmd, ec);
+                        mapVal = IdentityUtils.getObjectFromIdString(valueStr, valueCmd, ec, true);
                     }
                     else
                     {
@@ -278,7 +279,7 @@
                 while (idIter.hasNext())
                 {
                     String elementIdStr = (String)idIter.next();
-                    Array.set(array, i, MongoDBUtils.getObjectFromIdString(elementIdStr, elemCmd, ec));
+                    Array.set(array, i, IdentityUtils.getObjectFromIdString(elementIdStr, elemCmd, ec, true));
                     i++;
                 }
                 return array;

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2011-02-04 10:33:22 UTC (rev 12073)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2011-02-04 10:34:12 UTC (rev 12074)
@@ -28,6 +28,7 @@
 import org.datanucleus.exceptions.NucleusDataStoreException;
 import org.datanucleus.exceptions.NucleusException;
 import org.datanucleus.exceptions.NucleusUserException;
+import org.datanucleus.identity.IdentityUtils;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.EmbeddedMetaData;
@@ -204,7 +205,7 @@
                 return null;
             }
             AbstractClassMetaData otherCmd = ec.getMetaDataManager().getMetaDataForClass(mmd.getType(), clr);
-            return MongoDBUtils.getObjectFromIdString(idStr, otherCmd, ec);
+            return IdentityUtils.getObjectFromIdString(idStr, otherCmd, ec, true);
         }
         else if (relationType == Relation.ONE_TO_MANY_UNI || relationType == Relation.ONE_TO_MANY_BI ||
                 relationType == Relation.MANY_TO_MANY_BI)
@@ -229,7 +230,7 @@
                 while (idIter.hasNext())
                 {
                     String elementIdStr = (String)idIter.next();
-                    coll.add(MongoDBUtils.getObjectFromIdString(elementIdStr, elemCmd, ec));
+                    coll.add(IdentityUtils.getObjectFromIdString(elementIdStr, elemCmd, ec, true));
                 }
                 return coll;
             }
@@ -263,7 +264,7 @@
 
                     if (keyCmd != null)
                     {
-                        mapKey = MongoDBUtils.getObjectFromIdString(keyStr, keyCmd, ec);
+                        mapKey = IdentityUtils.getObjectFromIdString(keyStr, keyCmd, ec, true);
                     }
                     else
                     {
@@ -271,7 +272,7 @@
                     }
                     if (valueCmd != null)
                     {
-                        mapVal = MongoDBUtils.getObjectFromIdString(valueStr, valueCmd, ec);
+                        mapVal = IdentityUtils.getObjectFromIdString(valueStr, valueCmd, ec, true);
                     }
                     else
                     {
@@ -295,7 +296,7 @@
                 while (idIter.hasNext())
                 {
                     String elementIdStr = (String)idIter.next();
-                    Array.set(array, i, MongoDBUtils.getObjectFromIdString(elementIdStr, elemCmd, ec));
+                    Array.set(array, i, IdentityUtils.getObjectFromIdString(elementIdStr, elemCmd, ec, true));
                     i++;
                 }
                 return array;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12077
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=12077&view=rev
Author:   andy_jefferson
Date:     2011-02-04 11:01:24 +0000 (Fri, 04 Feb 2011)

Log Message:
-----------
logging of retrieve and index creation

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation.properties
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation_es.properties
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation.properties
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation.properties	2011-02-04 10:41:44 UTC (rev 12076)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation.properties	2011-02-04 11:01:24 UTC (rev 12077)
@@ -30,7 +30,8 @@
 
 
 MongoDB.SchemaCreate.Class=Creating schema for class "{0}" in collection "{1}"
-MongoDB.SchemaCreate.Class.Family=Creating field "{0}" for collection "{1}"
+MongoDB.SchemaCreate.Class.Field=Creating field "{0}" for collection "{1}"
+MongoDB.SchemaCreate.Class.Index=Creating index "{0}" for collection "{1}" as "{2}"
 MongoDB.SchemaDelete.Class=Deleting schema for class "{0}" in collection "{1}"
 MongoDB.SchemaValidate.Class=Validate schema for class "{0}" failed since collection "{1}" is missing
-MongoDB.SchemaValidate.Class.Family=Validate schema of collection "{0}" has field "{1}" missing
+MongoDB.SchemaValidate.Class.Field=Validate schema of collection "{0}" has field "{1}" missing

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation_es.properties
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation_es.properties	2011-02-04 10:41:44 UTC (rev 12076)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation_es.properties	2011-02-04 11:01:24 UTC (rev 12077)
@@ -29,7 +29,8 @@
 MongoDB.ExecutionTime=Tiempo de ejecuci\xF3n = {0} ms
 
 MongoDB.SchemaCreate.Class=Creando el esquema para la clase "{0}" en la colleccion "{1}"
-MongoDB.SchemaCreate.Class.Family=Creando campo "{0}" para la colleccion "{1}"
+MongoDB.SchemaCreate.Class.Field=Creando campo "{0}" para la colleccion "{1}"
+MongoDB.SchemaCreate.Class.Index=Creando indice "{0}" para la colleccion "{1}" como "{2}"
 MongoDB.SchemaDelete.Class=Borrando el esquema de la clase "{0}" en la colleccion "{1}"
 MongoDB.SchemaValidate.Class=Validar el esquema de la clase "{0}", no tiene la colleccion "{1}" !
-MongoDB.SchemaValidate.Class.Family=Validar el esquema de la colleccion "{0}" no tiene el campo "{1}" !
+MongoDB.SchemaValidate.Class.Field=Validar el esquema de la colleccion "{0}" no tiene el campo "{1}" !

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java	2011-02-04 10:41:44 UTC (rev 12076)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java	2011-02-04 11:01:24 UTC (rev 12077)
@@ -39,6 +39,7 @@
 import org.datanucleus.store.StoreData;
 import org.datanucleus.store.connection.ManagedConnection;
 import org.datanucleus.store.schema.SchemaAwareStoreManager;
+import org.datanucleus.util.Localiser;
 import org.datanucleus.util.NucleusLogger;
 import org.datanucleus.util.StringUtils;
 
@@ -48,6 +49,9 @@
 
 public class MongoDBStoreManager extends AbstractStoreManager implements SchemaAwareStoreManager
 {
+    protected static final Localiser LOCALISER = Localiser.getInstance(
+        "org.datanucleus.store.mongodb.Localisation", MongoDBStoreManager.class.getClassLoader());
+
     /**
      * Constructor.
      * @param clr ClassLoader resolver
@@ -210,8 +214,11 @@
                         query.append(MongoDBUtils.getFieldName(mmd), 1);
                     }
                 }
-                NucleusLogger.DATASTORE_SCHEMA.debug(">> Creating index for " + query + 
-                    " name=" + idxmds[i].getName() + " unique=" + idxmds[i].isUnique());
+                if (NucleusLogger.DATASTORE_SCHEMA.isDebugEnabled())
+                {
+                    NucleusLogger.DATASTORE_SCHEMA.debug(LOCALISER.msg("MongoDB.SchemaCreate.Class.Index",
+                        idxmds[i].getName(), MongoDBUtils.getCollectionName(cmd), query));
+                }
                 collection.ensureIndex(query, idxmds[i].getName(), idxmds[i].isUnique());
             }
         }
@@ -239,8 +246,11 @@
                         query.append(MongoDBUtils.getFieldName(mmd), 1);
                     }
                 }
-                NucleusLogger.DATASTORE_SCHEMA.debug(">> Creating index for " + query + 
-                    " name=" + unimds[i].getName() + " unique");
+                if (NucleusLogger.DATASTORE_SCHEMA.isDebugEnabled())
+                {
+                    NucleusLogger.DATASTORE_SCHEMA.debug(LOCALISER.msg("MongoDB.SchemaCreate.Class.Index",
+                        unimds[i].getName(), MongoDBUtils.getCollectionName(cmd), query));
+                }
                 collection.ensureIndex(query, unimds[i].getName(), true);
             }
         }
@@ -255,15 +265,13 @@
                 AbstractMemberMetaData pkMmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(pkFieldNumbers[i]);
                 query.append(MongoDBUtils.getFieldName(pkMmd), 1);
             }
-            if (cmd.getPrimaryKeyMetaData() != null)
+            String pkName = (cmd.getPackageMetaData() != null ? cmd.getPackageMetaData().getName() : cmd.getName() + "_PK");
+            if (NucleusLogger.DATASTORE_SCHEMA.isDebugEnabled())
             {
-                collection.ensureIndex(query, cmd.getPrimaryKeyMetaData().getName(), true);
+                NucleusLogger.DATASTORE_SCHEMA.debug(LOCALISER.msg("MongoDB.SchemaCreate.Class.Index",
+                    pkName, MongoDBUtils.getCollectionName(cmd), query));
             }
-            else
-            {
-                collection.ensureIndex(query, cmd.getName() + "_PK", true);
-            }
-            NucleusLogger.DATASTORE_SCHEMA.debug(">> Creating unique index on PK of " + cmd.getFullClassName() + " as " + query);
+            collection.ensureIndex(query, pkName, true);
         }
         else if (cmd.getIdentityType() == IdentityType.DATASTORE)
         {
@@ -275,15 +283,13 @@
             {
                 BasicDBObject query = new BasicDBObject();
                 query.append(MongoDBUtils.getFieldName(cmd.getIdentityMetaData()), 1);
-                if (cmd.getPrimaryKeyMetaData() != null)
+                String pkName = (cmd.getPrimaryKeyMetaData() != null ? cmd.getPrimaryKeyMetaData().getName() : cmd.getName() + "_PK");
+                if (NucleusLogger.DATASTORE_SCHEMA.isDebugEnabled())
                 {
-                    collection.ensureIndex(query, cmd.getPrimaryKeyMetaData().getName(), true);
+                    NucleusLogger.DATASTORE_SCHEMA.debug(LOCALISER.msg("MongoDB.SchemaCreate.Class.Index",
+                        pkName, MongoDBUtils.getCollectionName(cmd), query));
                 }
-                else
-                {
-                    collection.ensureIndex(query, cmd.getName() + "_PK", true);
-                }
-                NucleusLogger.DATASTORE_SCHEMA.debug(">> Creating unique index on PK of " + cmd.getFullClassName() + " as " + query);
+                collection.ensureIndex(query, pkName, true);
             }
         }
 
@@ -297,8 +303,11 @@
                 {
                     BasicDBObject query = new BasicDBObject();
                     query.append(MongoDBUtils.getFieldName(mmds[i]), 1);
-                    NucleusLogger.DATASTORE_SCHEMA.debug(">> Creating index for " + query + 
-                        " name=" + idxmd + " unique=" + idxmd.isUnique());
+                    if (NucleusLogger.DATASTORE_SCHEMA.isDebugEnabled())
+                    {
+                        NucleusLogger.DATASTORE_SCHEMA.debug(LOCALISER.msg("MongoDB.SchemaCreate.Class.Index",
+                            idxmd.getName(), MongoDBUtils.getCollectionName(cmd), query));
+                    }
                     collection.ensureIndex(query, idxmd.getName(), idxmd.isUnique());
                 }
                 UniqueMetaData unimd = mmds[i].getUniqueMetaData();
@@ -306,8 +315,11 @@
                 {
                     BasicDBObject query = new BasicDBObject();
                     query.append(MongoDBUtils.getFieldName(mmds[i]), 1);
-                    NucleusLogger.DATASTORE_SCHEMA.debug(">> Creating index for " + query + 
-                        " name=" + unimd + " unique=true");
+                    if (NucleusLogger.DATASTORE_SCHEMA.isDebugEnabled())
+                    {
+                        NucleusLogger.DATASTORE_SCHEMA.debug(LOCALISER.msg("MongoDB.SchemaCreate.Class.Index",
+                            unimd.getName(), MongoDBUtils.getCollectionName(cmd), query));
+                    }
                     collection.ensureIndex(query, unimd.getName(), true);
                 }
             }

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-04 10:41:44 UTC (rev 12076)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-04 11:01:24 UTC (rev 12077)
@@ -38,6 +38,7 @@
 import org.datanucleus.store.FieldValues2;
 import org.datanucleus.store.ObjectProvider;
 import org.datanucleus.store.mongodb.fieldmanager.FetchFieldManager;
+import org.datanucleus.util.NucleusLogger;
 
 import com.mongodb.BasicDBObject;
 import com.mongodb.DB;
@@ -299,6 +300,11 @@
             fieldsSelection.append(MongoDBUtils.getFieldName(cmd.getVersionMetaData()), 1);
         }
 
+        if (NucleusLogger.DATASTORE_RETRIEVE.isDebugEnabled())
+        {
+            NucleusLogger.DATASTORE_RETRIEVE.debug("Fetching instances of collection " + MongoDBUtils.getCollectionName(cmd) +
+                " fields=" + fieldsSelection);
+        }
         DBCursor curs = db.getCollection(MongoDBUtils.getCollectionName(cmd)).find(new BasicDBObject(), fieldsSelection);
 
         if (cmd.getIdentityType() == IdentityType.APPLICATION)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12080
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=12080&view=rev
Author:   andy_jefferson
Date:     2011-02-04 14:48:11 +0000 (Fri, 04 Feb 2011)

Log Message:
-----------
[NUCMONGODB-17] Support persistence of discriminator value when defined, and support use of discriminator value when retrieving objects of types that have a discriminator defined

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-04 14:42:39 UTC (rev 12079)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-04 14:48:11 UTC (rev 12080)
@@ -32,6 +32,8 @@
 import org.datanucleus.identity.OID;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
+import org.datanucleus.metadata.DiscriminatorMetaData;
+import org.datanucleus.metadata.DiscriminatorStrategy;
 import org.datanucleus.metadata.IdentityStrategy;
 import org.datanucleus.metadata.IdentityType;
 import org.datanucleus.metadata.VersionMetaData;
@@ -114,6 +116,23 @@
                 dbObject.put(fieldName, key);
             }
 
+            if (cmd.hasDiscriminatorStrategy())
+            {
+                // Add discriminator field
+                DiscriminatorMetaData discmd = cmd.getDiscriminatorMetaData();
+                String fieldName = MongoDBUtils.getFieldName(discmd);
+                Object discVal = null;
+                if (cmd.getDiscriminatorStrategy() == DiscriminatorStrategy.CLASS_NAME)
+                {
+                    discVal = cmd.getFullClassName();
+                }
+                else
+                {
+                    discVal = discmd.getValue();
+                }
+                dbObject.put(fieldName, discVal);
+            }
+
             if (cmd.hasVersionStrategy())
             {
                 if (cmd.getVersionMetaData().getVersionStrategy() == VersionStrategy.VERSION_NUMBER)

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-04 14:42:39 UTC (rev 12079)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-04 14:48:11 UTC (rev 12080)
@@ -28,6 +28,7 @@
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.ColumnMetaData;
+import org.datanucleus.metadata.DiscriminatorMetaData;
 import org.datanucleus.metadata.EmbeddedMetaData;
 import org.datanucleus.metadata.IdentityMetaData;
 import org.datanucleus.metadata.IdentityStrategy;
@@ -88,7 +89,7 @@
     /**
      * Accessor for the MongoDB "field" name to store the datastore id under. Takes the column name if provided
      * otherwise "IDENTITY".
-     * @param mmd Metadata for the identity
+     * @param idmd Metadata for the identity
      * @return The field name
      */
     public static String getFieldName(IdentityMetaData idmd)
@@ -132,6 +133,25 @@
     }
 
     /**
+     * Accessor for the MongoDB "field" name to store the discriminator under. Takes the column name if provided
+     * otherwise "DISCRIM".
+     * @param discmd Metadata for the discriminator
+     * @return The field name
+     */
+    public static String getFieldName(DiscriminatorMetaData discmd)
+    {
+        // Try the first column if specified
+        ColumnMetaData colmd = discmd.getColumnMetaData();
+        if (colmd != null)
+        {
+            return colmd.getName();
+        }
+
+        // Fallback to "DISCRIM"
+        return "DISCRIM";
+    }
+
+    /**
      * Accessor for the MongoDB field for the field of this embedded field.
      * Uses the column name from the embedded definition (if present), otherwise falls back to
      * the column name of the field in its own class definition, otherwise uses its field name.
@@ -187,6 +207,11 @@
                 }
                 query.put(MongoDBUtils.getFieldName(pkMmd), value);
             }
+            if (cmd.hasDiscriminatorStrategy())
+            {
+                query.put(MongoDBUtils.getFieldName(cmd.getDiscriminatorMetaData()), cmd.getDiscriminatorValue());
+            }
+
             DBCursor curs = dbCollection.find(query);
             if (!curs.hasNext())
             {
@@ -212,6 +237,11 @@
             {
                 query.put(MongoDBUtils.getFieldName(cmd.getIdentityMetaData()), value);
             }
+            if (cmd.hasDiscriminatorStrategy())
+            {
+                query.put(MongoDBUtils.getFieldName(cmd.getDiscriminatorMetaData()), cmd.getDiscriminatorValue());
+            }
+
             DBCursor curs = dbCollection.find(query);
             if (!curs.hasNext())
             {
@@ -305,8 +335,15 @@
             NucleusLogger.DATASTORE_RETRIEVE.debug("Fetching instances of collection " + MongoDBUtils.getCollectionName(cmd) +
                 " fields=" + fieldsSelection);
         }
-        DBCursor curs = db.getCollection(MongoDBUtils.getCollectionName(cmd)).find(new BasicDBObject(), fieldsSelection);
 
+        BasicDBObject query = new BasicDBObject();
+        if (cmd.hasDiscriminatorStrategy())
+        {
+            // Discriminator present : Add restriction on the discriminator value for this class
+            query.put(MongoDBUtils.getFieldName(cmd.getDiscriminatorMetaData()), cmd.getDiscriminatorValue());
+        }
+
+        DBCursor curs = db.getCollection(MongoDBUtils.getCollectionName(cmd)).find(query, fieldsSelection);
         if (cmd.getIdentityType() == IdentityType.APPLICATION)
         {
             while (curs.hasNext())


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12107
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=12107&view=rev
Author:   andy_jefferson
Date:     2011-02-07 10:40:37 +0000 (Mon, 07 Feb 2011)

Log Message:
-----------
[NUCMONGODB-7] Fix equality BSON. Enable use of compiled filter object when it is complete

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java

Added Paths:
-----------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/MongoDBQueryCompilation.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-07 10:25:18 UTC (rev 12106)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-07 10:40:37 UTC (rev 12107)
@@ -18,7 +18,9 @@
 package org.datanucleus.store.mongodb;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.FetchPlan;
@@ -264,15 +266,16 @@
      * @param subclasses Whether to include subclasses
      * @param ignoreCache Ignore the cache?
      * @param fp FetchPlan when retrieving the objects
+     * @param filterObject Optional filter object
      * @return List of all candidate objects
      */
     public static List getObjectsOfCandidateType(ExecutionContext ec, DB db, Class candidateClass, 
-            boolean subclasses, boolean ignoreCache, FetchPlan fp)
+            boolean subclasses, boolean ignoreCache, FetchPlan fp, BasicDBObject filterObject)
     {
         ClassLoaderResolver clr = ec.getClassLoaderResolver();
 
         AbstractClassMetaData cmd = ec.getMetaDataManager().getMetaDataForClass(candidateClass, clr);
-        List results = getObjectsOfType(cmd, db, ec, ignoreCache, fp);
+        List results = getObjectsOfType(cmd, db, ec, ignoreCache, fp, filterObject);
 
         if (subclasses)
         {
@@ -283,7 +286,7 @@
                 for (int i=0;i<subclassNames.length;i++)
                 {
                     AbstractClassMetaData subcmd = ec.getMetaDataManager().getMetaDataForClass(subclassNames[i], clr);
-                    results.addAll(getObjectsOfType(subcmd, db, ec, ignoreCache, fp));
+                    results.addAll(getObjectsOfType(subcmd, db, ec, ignoreCache, fp, filterObject));
                 }
             }
         }
@@ -292,7 +295,7 @@
     }
 
     protected static List getObjectsOfType(AbstractClassMetaData cmd, DB db, ExecutionContext ec, boolean ignoreCache,
-            FetchPlan fp)
+            FetchPlan fp, BasicDBObject filterObject)
     {
         List results = new ArrayList();
 
@@ -330,19 +333,28 @@
             fieldsSelection.append(MongoDBUtils.getFieldName(cmd.getVersionMetaData()), 1);
         }
 
-        if (NucleusLogger.DATASTORE_RETRIEVE.isDebugEnabled())
+        BasicDBObject query = new BasicDBObject();
+        if (filterObject != null)
         {
-            NucleusLogger.DATASTORE_RETRIEVE.debug("Fetching instances of collection " + MongoDBUtils.getCollectionName(cmd) +
-                " fields=" + fieldsSelection);
+            Iterator<Map.Entry<String, Object>> entryIter = filterObject.entrySet().iterator();
+            while (entryIter.hasNext())
+            {
+                Map.Entry<String, Object> entry = entryIter.next();
+                query.put(entry.getKey(), entry.getValue());
+            }
         }
-
-        BasicDBObject query = new BasicDBObject();
         if (cmd.hasDiscriminatorStrategy())
         {
             // Discriminator present : Add restriction on the discriminator value for this class
             query.put(MongoDBUtils.getFieldName(cmd.getDiscriminatorMetaData()), cmd.getDiscriminatorValue());
         }
 
+        if (NucleusLogger.DATASTORE_RETRIEVE.isDebugEnabled())
+        {
+            NucleusLogger.DATASTORE_RETRIEVE.debug("Fetching instances of collection " + MongoDBUtils.getCollectionName(cmd) +
+                " fields=" + fieldsSelection + " with filter=" + query);
+        }
+
         DBCursor curs = db.getCollection(MongoDBUtils.getCollectionName(cmd)).find(query, fieldsSelection);
         if (cmd.getIdentityType() == IdentityType.APPLICATION)
         {

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java	2011-02-07 10:25:18 UTC (rev 12106)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java	2011-02-07 10:40:37 UTC (rev 12107)
@@ -23,15 +23,20 @@
 import java.util.List;
 import java.util.Map;
 
+import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.query.evaluator.JDOQLEvaluator;
 import org.datanucleus.query.evaluator.JavaQueryEvaluator;
 import org.datanucleus.store.ExecutionContext;
+import org.datanucleus.store.StoreManager;
 import org.datanucleus.store.connection.ManagedConnection;
 import org.datanucleus.store.mongodb.MongoDBUtils;
 import org.datanucleus.store.query.AbstractJDOQLQuery;
+import org.datanucleus.store.query.Query;
+import org.datanucleus.store.query.QueryManager;
 import org.datanucleus.util.NucleusLogger;
 
+import com.mongodb.BasicDBObject;
 import com.mongodb.DB;
 
 /**
@@ -39,6 +44,9 @@
  */
 public class JDOQLQuery extends AbstractJDOQLQuery
 {
+    /** The compilation of the query for this datastore. Not applicable if totally in-memory. */
+    protected transient MongoDBQueryCompilation datastoreCompilation = null;
+
     /**
      * Constructs a new query instance that uses the given execution context.
      * @param ec Execution Context
@@ -68,6 +76,134 @@
         super(ec, query);
     }
 
+    /**
+     * Utility to remove any previous compilation of this Query.
+     */
+    protected void discardCompiled()
+    {
+        super.discardCompiled();
+
+        datastoreCompilation = null;
+    }
+
+    /**
+     * Method to return if the query is compiled.
+     * @return Whether it is compiled
+     */
+    protected boolean isCompiled()
+    {
+        if (evaluateInMemory())
+        {
+            // Don't need datastore compilation here since evaluating in-memory
+            return compilation != null;
+        }
+        else
+        {
+            // Need both to be present to say "compiled"
+            if (compilation == null || datastoreCompilation == null)
+            {
+                return false;
+            }
+            return true;
+        }
+    }
+
+    /**
+     * Convenience method to return whether the query should be evaluated in-memory.
+     * @return Use in-memory evaluation?
+     */
+    protected boolean evaluateInMemory()
+    {
+        if (candidateCollection != null)
+        {
+            if (compilation != null && compilation.getSubqueryAliases() != null)
+            {
+                // TODO In-memory evaluation of subqueries isn't fully implemented yet, so remove this when it is
+                NucleusLogger.QUERY.warn("In-memory evaluator doesn't currently handle subqueries completely so evaluating in datastore");
+                return false;
+            }
+
+            Object val = getExtension("datanucleus.query.evaluateInMemory");
+            if (val == null)
+            {
+                return true;
+            }
+            Boolean bool = Boolean.valueOf((String)val);
+            if (bool != null && !bool.booleanValue())
+            {
+                // User has explicitly said to not evaluate in-memory
+                return false;
+            }
+            return true;
+        }
+        return super.evaluateInMemory();
+    }
+
+    /**
+     * Method to compile the JDOQL query.
+     * Uses the superclass to compile the generic query populating the "compilation", and then generates
+     * the datastore-specific "datastoreCompilation".
+     * @param parameterValues Map of param values keyed by param name (if available at compile time)
+     */
+    protected synchronized void compileInternal(Map parameterValues)
+    {
+        if (isCompiled())
+        {
+            return;
+        }
+
+        // Compile the generic query expressions
+        super.compileInternal(parameterValues);
+
+        boolean inMemory = evaluateInMemory();
+        if (candidateCollection != null && inMemory)
+        {
+            // Querying a candidate collection in-memory, so just return now (don't need datastore compilation)
+            // TODO Maybe apply the result class checks ?
+            return;
+        }
+
+        if (candidateClass == null)
+        {
+            throw new NucleusUserException(LOCALISER.msg("021009", candidateClassName));
+        }
+
+        // Make sure any persistence info is loaded
+        ec.hasPersistenceInformationForClass(candidateClass);
+        AbstractClassMetaData cmd = getObjectManager().getMetaDataManager().getMetaDataForClass(candidateClass, clr);
+
+        QueryManager qm = getQueryManager();
+        StoreManager storeMgr = ec.getStoreManager();
+        String datastoreKey = storeMgr.getQueryCacheKey();
+        if (useCaching())
+        {
+            // Allowing caching so try to find compiled (datastore) query
+            datastoreCompilation = (MongoDBQueryCompilation)qm.getDatastoreQueryCompilation(datastoreKey,
+                getLanguage(), toString());
+            if (datastoreCompilation != null)
+            {
+                // Cached compilation exists for this datastore so reuse it
+                setResultDistinct(compilation.getResultDistinct());
+                return;
+            }
+        }
+
+        datastoreCompilation = new MongoDBQueryCompilation();
+        synchronized (datastoreCompilation)
+        {
+            if (inMemory)
+            {
+                // Generate statement to just retrieve all candidate objects for later processing
+            }
+            else
+            {
+                // Try to generate statement to perform the full query in the datastore
+                compileQueryFull(parameterValues, cmd);
+            }
+        }
+        // TODO Complete this
+    }
+    
     protected Object performExecute(Map parameters)
     {
         ManagedConnection mconn = ec.getStoreManager().getConnection(ec);
@@ -96,17 +232,18 @@
             }
             else
             {
-                // Compile the query to MongoDB
-                AbstractClassMetaData cmd = getObjectManager().getMetaDataManager().getMetaDataForClass(candidateClass, clr);
-                QueryToMongoDBMapper mapper = new QueryToMongoDBMapper(db, compilation, parameters, cmd, ec, this);
-                mapper.compile();
-                if (mapper.isDatastoreExecution())
+                BasicDBObject filterObject = null;
+                if (datastoreCompilation != null)
                 {
-                    // TODO Execute in datastore only to get candidates
+                    if (datastoreCompilation.isFilterComplete())
+                    {
+                        filterObject = datastoreCompilation.getFilter();
+                    }
                 }
 
+                // Execute as much as possible in the datastore
                 candidates = MongoDBUtils.getObjectsOfCandidateType(ec, db, candidateClass, subclasses,
-                    ignoreCache, getFetchPlan());
+                    ignoreCache, getFetchPlan(), filterObject);
             }
 
             // Apply any result restrictions to the results
@@ -127,4 +264,52 @@
             mconn.release();
         }
     }
+    /**
+     * Method to compile the query for the datastore attempting to evaluate the whole query in the datastore
+     * if possible. Sets the components of the "datastoreCompilation".
+     * @param parameters Input parameters (if known)
+     * @param candidateCmd Metadata for the candidate class
+     */
+    private void compileQueryFull(Map parameters, AbstractClassMetaData candidateCmd)
+    {
+        if (type != Query.SELECT)
+        {
+            return;
+        }
+
+        long startTime = 0;
+        if (NucleusLogger.QUERY.isDebugEnabled())
+        {
+            startTime = System.currentTimeMillis();
+            NucleusLogger.QUERY.debug(LOCALISER.msg("021083", getLanguage(), toString()));
+        }
+
+        // Generate statement for candidate(s)
+
+        // Update the SQLStatement with filter, ordering, result etc
+        QueryToMongoDBMapper mapper = new QueryToMongoDBMapper(compilation, parameters, candidateCmd, ec, this);
+        mapper.compile();
+        datastoreCompilation.setFilterComplete(mapper.isFilterComplete());
+        datastoreCompilation.setFilter(mapper.getFilterObject());
+        datastoreCompilation.setResultComplete(mapper.isResultComplete());
+        datastoreCompilation.setResult(mapper.getResultObject());
+
+        if (candidateCollection != null)
+        {
+            // Restrict to the supplied candidate ids
+        }
+
+        // Apply any range
+        if (range != null)
+        {
+        }
+
+        // Set any extensions (TODO Support locking if possible with MongoDB)
+
+
+        if (NucleusLogger.QUERY.isDebugEnabled())
+        {
+            NucleusLogger.QUERY.debug(LOCALISER.msg("021084", getLanguage(), System.currentTimeMillis()-startTime));
+        }
+    }
 }
\ No newline at end of file

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java	2011-02-07 10:25:18 UTC (rev 12106)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java	2011-02-07 10:40:37 UTC (rev 12107)
@@ -84,7 +84,7 @@
             if (candidateCollection == null)
             {
                 candidates = MongoDBUtils.getObjectsOfCandidateType(ec, db, candidateClass, subclasses,
-                    ignoreCache, getFetchPlan());
+                    ignoreCache, getFetchPlan(), null);
             }
             else
             {

Added: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/MongoDBQueryCompilation.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/MongoDBQueryCompilation.java	                        (rev 0)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/MongoDBQueryCompilation.java	2011-02-07 10:40:37 UTC (rev 12107)
@@ -0,0 +1,80 @@
+/**********************************************************************
+Copyright (c) 2011 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.store.mongodb.query;
+
+import com.mongodb.BasicDBObject;
+
+/**
+ * Datastore-specific (MongoDB) compilation information for a java query.
+ */
+public class MongoDBQueryCompilation
+{
+    boolean filterComplete = true;
+
+    /** Object defining the filter (if any). */
+    BasicDBObject filterObject;
+
+    boolean resultComplete = true;
+
+    /** Object defining document fields to be returned (if any). */
+    BasicDBObject resultObject;
+
+    public MongoDBQueryCompilation()
+    {
+    }
+
+    public boolean isFilterComplete()
+    {
+        return filterComplete;
+    }
+
+    public void setFilterComplete(boolean complete)
+    {
+        this.filterComplete = complete;
+    }
+
+    public void setFilter(BasicDBObject filter)
+    {
+        this.filterObject = filter;
+    }
+
+    public BasicDBObject getFilter()
+    {
+        return filterObject;
+    }
+
+    public boolean isResultComplete()
+    {
+        return resultComplete;
+    }
+
+    public void setResultComplete(boolean complete)
+    {
+        this.resultComplete = complete;
+    }
+
+    public void setResult(BasicDBObject result)
+    {
+        this.resultObject = result;
+    }
+
+    public BasicDBObject getResult()
+    {
+        return resultObject;
+    }
+}
\ No newline at end of file

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java	2011-02-07 10:25:18 UTC (rev 12106)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java	2011-02-07 10:40:37 UTC (rev 12107)
@@ -45,15 +45,12 @@
 import org.datanucleus.util.StringUtils;
 
 import com.mongodb.BasicDBObject;
-import com.mongodb.DB;
 
 /**
  * Class which maps a compiled (generic) query to an MongoDB query.
  */
 public class QueryToMongoDBMapper extends AbstractExpressionEvaluator
 {
-    final DB db;
-
     final ExecutionContext ec;
 
     final String candidateAlias;
@@ -70,22 +67,24 @@
     /** State variable for the component being compiled. */
     CompilationComponent compileComponent;
 
-    /** Flag for whether the execution is possible completely in the datastore. */
-    boolean datastoreExecution = true;
+    /** Whether the filter clause is completely evaluatable in the datastore. */
+    boolean filterComplete = true;
 
     /** The filter object. If no filter is required then this will be an empty object. */
     BasicDBObject filterObject;
 
+    /** Whether the result clause is completely evaluatable in the datastore. */
+    boolean resultComplete = true;
+
     /** The result object. If no result is required then this will be null. */
     BasicDBObject resultObject;
 
     /** Stack of mongo expressions, used for compilation of the query into MongoDB objects. */
     Stack<MongoExpression> stack = new Stack();
 
-    public QueryToMongoDBMapper(DB db, QueryCompilation compilation, Map parameters, AbstractClassMetaData cmd,
+    public QueryToMongoDBMapper(QueryCompilation compilation, Map parameters, AbstractClassMetaData cmd,
             ExecutionContext ec, Query q)
     {
-        this.db = db;
         this.ec = ec;
         this.query = q;
         this.compilation = compilation;
@@ -94,6 +93,16 @@
         this.candidateAlias = compilation.getCandidateAlias();
     }
 
+    public boolean isFilterComplete()
+    {
+        return filterComplete;
+    }
+
+    public boolean isResultComplete()
+    {
+        return resultComplete;
+    }
+
     public BasicDBObject getFilterObject()
     {
         return filterObject;
@@ -104,11 +113,6 @@
         return resultObject;
     }
 
-    public boolean isDatastoreExecution()
-    {
-        return datastoreExecution;
-    }
-
     public void compile()
     {
         compileFrom();
@@ -126,7 +130,7 @@
     {
         if (query.isSubclasses())
         {
-            datastoreExecution = false; // TODO Remove this when we cater for subclasses too
+            // TODO Can we handle this?
         }
         if (compilation.getExprFrom() != null)
         {
@@ -149,8 +153,6 @@
         {
             compileComponent = CompilationComponent.FILTER;
 
-            filterObject = new BasicDBObject();
-
             try
             {
                 compilation.getExprFilter().evaluate(this);
@@ -158,9 +160,11 @@
                 if (!(mongoExpr instanceof MongoBooleanExpression))
                 {
                     NucleusLogger.QUERY.error(">> invalid compilation : filter compiled to " + mongoExpr);
+                    filterComplete = false;
                 }
                 else
                 {
+                    filterObject = new BasicDBObject();
                     MongoBooleanExpression mbExpr = (MongoBooleanExpression) mongoExpr;
                     filterObject.put(mbExpr.getKey(), mbExpr.getValue());
                 }
@@ -168,12 +172,12 @@
             }
             catch (Exception e)
             {
+                filterComplete = false;
                 NucleusLogger.QUERY.debug(">> compileFilter caught exception ", e);
                 // TODO Remove this try-catch when all is working with datastoreExecution
             }
 
             compileComponent = null;
-            datastoreExecution = false; // TODO Remove this when compilation done
         }
     }
 
@@ -196,7 +200,6 @@
             }
         }
         // TODO Handle distinct
-        datastoreExecution = false; // TODO Remove this when compilation done
         compileComponent = null;
     }
 
@@ -217,6 +220,7 @@
             compileComponent = null;
         }
     }
+
     /**
      * Method to compile the having clause of the query
      */
@@ -278,12 +282,11 @@
     {
         Object right = stack.pop();
         Object left = stack.pop();
-        NucleusLogger.GENERAL.info(">> processEq : left=" + left +" right=" + right);
         if (left instanceof MongoLiteral && right instanceof MongoFieldExpression)
         {
             String field = ((MongoFieldExpression)right).getFieldName();
             Object value = ((MongoLiteral)left).getValue();
-            MongoExpression mongoExpr = new MongoBooleanExpression(field, new BasicDBObject("$eq", value));
+            MongoExpression mongoExpr = new MongoBooleanExpression(field, value);
             stack.push(mongoExpr);
             return mongoExpr;
         }
@@ -291,10 +294,11 @@
         {
             String field = ((MongoFieldExpression)left).getFieldName();
             Object value = ((MongoLiteral)right).getValue();
-            MongoExpression mongoExpr = new MongoBooleanExpression(field, new BasicDBObject("$eq", value));
+            MongoExpression mongoExpr = new MongoBooleanExpression(field, value);
             stack.push(mongoExpr);
             return mongoExpr;
         }
+        NucleusLogger.GENERAL.info(">> processEq : left=" + left +" right=" + right);
 
         // TODO Auto-generated method stub
         return super.processEqExpression(expr);
@@ -308,7 +312,6 @@
     {
         Object right = stack.pop();
         Object left = stack.pop();
-        NucleusLogger.GENERAL.info(">> processNoteq : left=" + left +" right=" + right);
         if (left instanceof MongoLiteral && right instanceof MongoFieldExpression)
         {
             String field = ((MongoFieldExpression)right).getFieldName();
@@ -325,6 +328,7 @@
             stack.push(mongoExpr);
             return mongoExpr;
         }
+        NucleusLogger.GENERAL.info(">> processNoteq : left=" + left +" right=" + right);
 
         // TODO Auto-generated method stub
         return super.processNoteqExpression(expr);
@@ -338,7 +342,6 @@
     {
         Object right = stack.pop();
         Object left = stack.pop();
-        NucleusLogger.GENERAL.info(">> processGt : left=" + left +" right=" + right);
         if (left instanceof MongoLiteral && right instanceof MongoFieldExpression)
         {
             String field = ((MongoFieldExpression)right).getFieldName();
@@ -355,6 +358,7 @@
             stack.push(mongoExpr);
             return mongoExpr;
         }
+        NucleusLogger.GENERAL.info(">> processGt : left=" + left +" right=" + right);
 
         // TODO Auto-generated method stub
         return super.processGtExpression(expr);
@@ -368,7 +372,6 @@
     {
         Object right = stack.pop();
         Object left = stack.pop();
-        NucleusLogger.GENERAL.info(">> processLt : left=" + left +" right=" + right);
         if (left instanceof MongoLiteral && right instanceof MongoFieldExpression)
         {
             String field = ((MongoFieldExpression)right).getFieldName();
@@ -385,6 +388,7 @@
             stack.push(mongoExpr);
             return mongoExpr;
         }
+        NucleusLogger.GENERAL.info(">> processLt : left=" + left +" right=" + right);
 
         // TODO Auto-generated method stub
         return super.processLtExpression(expr);
@@ -398,7 +402,6 @@
     {
         Object right = stack.pop();
         Object left = stack.pop();
-        NucleusLogger.GENERAL.info(">> processGteq : left=" + left +" right=" + right);
         if (left instanceof MongoLiteral && right instanceof MongoFieldExpression)
         {
             String field = ((MongoFieldExpression)right).getFieldName();
@@ -415,6 +418,7 @@
             stack.push(mongoExpr);
             return mongoExpr;
         }
+        NucleusLogger.GENERAL.info(">> processGteq : left=" + left +" right=" + right);
 
         // TODO Auto-generated method stub
         return super.processGteqExpression(expr);
@@ -428,7 +432,6 @@
     {
         Object right = stack.pop();
         Object left = stack.pop();
-        NucleusLogger.GENERAL.info(">> processLteq : left=" + left +" right=" + right);
         if (left instanceof MongoLiteral && right instanceof MongoFieldExpression)
         {
             String field = ((MongoFieldExpression)right).getFieldName();
@@ -445,6 +448,7 @@
             stack.push(mongoExpr);
             return mongoExpr;
         }
+        NucleusLogger.GENERAL.info(">> processLteq : left=" + left +" right=" + right);
 
         // TODO Auto-generated method stub
         return super.processLteqExpression(expr);
@@ -456,7 +460,6 @@
     @Override
     protected Object processPrimaryExpression(PrimaryExpression expr)
     {
-        NucleusLogger.GENERAL.info(">> processPrimary " + expr);
         Expression left = expr.getLeft();
         if (left == null)
         {
@@ -464,7 +467,14 @@
             String fieldName = getFieldNameForPrimary(tuples);
             if (fieldName == null)
             {
-                datastoreExecution = false;
+                if (compileComponent == CompilationComponent.FILTER)
+                {
+                    filterComplete = false;
+                }
+                else if (compileComponent == CompilationComponent.RESULT)
+                {
+                    resultComplete = false;
+                }
                 NucleusLogger.QUERY.debug(">> Primary " + expr +
                     " is not stored in this document, so unexecutable in datastore");
             }
@@ -475,6 +485,7 @@
                 return fieldExpr;
             }
         }
+        NucleusLogger.GENERAL.info(">> processPrimary " + expr);
 
         // TODO Auto-generated method stub
         return super.processPrimaryExpression(expr);
@@ -567,7 +578,14 @@
                 }
                 else
                 {
-                    datastoreExecution = false;
+                    if (compileComponent == CompilationComponent.FILTER)
+                    {
+                        filterComplete = false;
+                    }
+                    else if (compileComponent == CompilationComponent.RESULT)
+                    {
+                        resultComplete = false;
+                    }
                     NucleusLogger.QUERY.debug("Query has reference to " +
                         StringUtils.collectionToString(tuples) + " and " + mmd.getFullFieldName() +
                         " is not persisted into this document, so unexecutable in the datastore");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12117
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=12117&view=rev
Author:   andy_jefferson
Date:     2011-02-08 11:46:49 +0000 (Tue, 08 Feb 2011)

Log Message:
-----------
[NUCMONGODB-18] Support persisting of embedded 1-1/N-1 objects as nested in the MongoDB JSON document of the owner. Not handling any owner field in the embedded

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchEmbeddedFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java

Added Paths:
-----------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/package.html
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/overview.html
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/package.html
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/package.html

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-08 07:39:08 UTC (rev 12116)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-08 11:46:49 UTC (rev 12117)
@@ -310,12 +310,30 @@
             {
                 AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fpMembers[i]);
                 int relationType = mmd.getRelationType(clr);
-                if (mmd.isEmbedded() && 
-                    (relationType == Relation.ONE_TO_ONE_UNI || relationType == Relation.ONE_TO_ONE_BI ||
-                     relationType == Relation.MANY_TO_ONE_BI || relationType == Relation.MANY_TO_ONE_UNI))
+                if (mmd.isEmbedded() && relationType != Relation.NONE)
                 {
-                    // Embedded field, so add all fields of sub-objects
-                    selectAllFieldsOfEmbeddedObject(mmd, fieldsSelection, ec, clr);
+                    if (relationType == Relation.ONE_TO_ONE_UNI || relationType == Relation.ONE_TO_ONE_BI ||
+                        relationType == Relation.MANY_TO_ONE_BI || relationType == Relation.MANY_TO_ONE_UNI)
+                    {
+                        boolean nested = true;
+                        String nestedStr = mmd.getValueForExtension("nested");
+                        if (nestedStr != null && nestedStr.equalsIgnoreCase("false"))
+                        {
+                            nested = false;
+                        }
+
+                        if (nested)
+                        {
+                            // Nested Embedded field, so include field
+                            String fieldName = MongoDBUtils.getFieldName(mmd);
+                            fieldsSelection.append(fieldName, 1);
+                        }
+                        else
+                        {
+                            // Flat Embedded field, so add all fields of sub-objects
+                            selectAllFieldsOfEmbeddedObject(mmd, fieldsSelection, ec, clr);
+                        }
+                    }
                 }
                 else
                 {

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchEmbeddedFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchEmbeddedFieldManager.java	2011-02-08 07:39:08 UTC (rev 12116)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchEmbeddedFieldManager.java	2011-02-08 11:46:49 UTC (rev 12117)
@@ -43,6 +43,8 @@
 
 /**
  * FieldManager for the retrieval of a related embedded object (1-1 relation).
+ * This handles flat embedding of related embedded objects, where the field of the embedded object become
+ * a field in the owner document.
  */
 public class FetchEmbeddedFieldManager extends AbstractFieldManager
 {

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2011-02-08 07:39:08 UTC (rev 12116)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2011-02-08 11:46:49 UTC (rev 12117)
@@ -54,12 +54,18 @@
 
     private AbstractClassMetaData acmd;
 
+    boolean embedded = false;
+
     public FetchFieldManager(ObjectProvider sm, DBObject dbObject, AbstractClassMetaData acmd)
     {
         this.sm = sm;
         this.ec = sm.getExecutionContext();
         this.dbObject = dbObject;
         this.acmd = acmd;
+        if (sm.getEmbeddedOwners() != null)
+        {
+            embedded = true;
+        }
     }
 
     public FetchFieldManager(ExecutionContext ec, DBObject dbObject, AbstractClassMetaData acmd)
@@ -154,39 +160,83 @@
         AbstractMemberMetaData mmd = acmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
         ClassLoaderResolver clr = ec.getClassLoaderResolver();
         int relationType = mmd.getRelationType(clr);
-        if ((relationType == Relation.ONE_TO_ONE_UNI || relationType == Relation.ONE_TO_ONE_BI) && mmd.isEmbedded())
+
+        boolean embedded = (relationType != Relation.NONE && mmd.isEmbedded());
+        if (this.embedded)
         {
-            // Persistable object embedded into table of this object
-            Class embcls = mmd.getType();
-            AbstractClassMetaData embcmd = ec.getMetaDataManager().getMetaDataForClass(embcls, clr);
-            if (embcmd != null)
+            embedded = true;
+        }
+
+        if (embedded)
+        {
+            if (relationType == Relation.ONE_TO_ONE_BI || relationType == Relation.ONE_TO_ONE_UNI)
             {
-                // Check for null value (currently need all columns to return null)
-                // TODO Cater for null (use embmd.getNullIndicatorColumn/Value)
-                EmbeddedMetaData embmd = mmd.getEmbeddedMetaData();
-                AbstractMemberMetaData[] embmmds = embmd.getMemberMetaData();
-                boolean isNull = true;
-                for (int i=0;i<embmmds.length;i++)
+                // Embedded PC object
+                Class embcls = mmd.getType();
+                AbstractClassMetaData embcmd = ec.getMetaDataManager().getMetaDataForClass(embcls, clr);
+                if (embcmd == null)
                 {
-                    String embFieldName = MongoDBUtils.getFieldName(mmd, i);
-                    if (dbObject.containsField(embFieldName))
+                    throw new NucleusUserException("Field " + mmd.getFullFieldName() +
+                        " marked as embedded but no such metadata");
+                }
+                boolean nested = true;
+                String nestedStr = mmd.getValueForExtension("nested");
+                if (nestedStr != null && nestedStr.equalsIgnoreCase("false"))
+                {
+                    nested = false;
+                }
+
+                if (nested)
+                {
+                    // Nested embedding, as nested document
+                    String fieldName = MongoDBUtils.getFieldName(mmd);
+                    if (!dbObject.containsField(fieldName))
                     {
-                        isNull = false;
-                        break;
+                        return null;
                     }
+
+                    DBObject embeddedValue = (DBObject)dbObject.get(fieldName);
+                    ObjectProvider embSM = ec.newObjectProviderForMember(mmd, embcmd);
+                    embSM.addEmbeddedOwner(sm, fieldNumber);
+                    FetchFieldManager ffm = new FetchFieldManager(embSM, embeddedValue, embcmd);
+                    ffm.embedded = true;
+                    embSM.replaceFields(embcmd.getAllMemberPositions(), ffm);
+                    return embSM.getObject();
                 }
-                if (isNull)
+                else
                 {
-                    return null;
+                    // Flat embedding as fields of the owning document
+
+                    // TODO Cater for null (use embmd.getNullIndicatorColumn/Value)
+                    EmbeddedMetaData embmd = mmd.getEmbeddedMetaData();
+                    AbstractMemberMetaData[] embmmds = embmd.getMemberMetaData();
+                    boolean isNull = true;
+                    for (int i=0;i<embmmds.length;i++)
+                    {
+                        String embFieldName = MongoDBUtils.getFieldName(mmd, i);
+                        if (dbObject.containsField(embFieldName))
+                        {
+                            isNull = false;
+                            break;
+                        }
+                    }
+                    if (isNull)
+                    {
+                        return null;
+                    }
+
+                    ObjectProvider embSM = ec.newObjectProviderForMember(mmd, embcmd);
+                    embSM.addEmbeddedOwner(sm, fieldNumber);
+                    FieldManager ffm = new FetchEmbeddedFieldManager(embSM, dbObject, mmd);
+                    embSM.replaceFields(embcmd.getAllMemberPositions(), ffm);
+                    return embSM.getObject();
                 }
-
-                ObjectProvider embSM = ec.newObjectProviderForMember(mmd, embcmd);
-                embSM.addEmbeddedOwner(sm, fieldNumber);
-                FieldManager ffm = new FetchEmbeddedFieldManager(embSM, dbObject, mmd);
-                embSM.replaceFields(embcmd.getAllMemberPositions(), ffm);
-                return embSM.getObject();
             }
-            throw new NucleusUserException("Field " + mmd.getFullFieldName() + " marked as embedded but no such metadata");
+            else if (relationType == Relation.ONE_TO_MANY_UNI || relationType == Relation.ONE_TO_MANY_BI ||
+                    relationType == Relation.MANY_TO_MANY_BI)
+            {
+                // TODO Support embedded collections/arrays/maps
+            }
         }
 
         String fieldName = MongoDBUtils.getFieldName(mmd);

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java	2011-02-08 07:39:08 UTC (rev 12116)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java	2011-02-08 11:46:49 UTC (rev 12117)
@@ -41,6 +41,8 @@
 
 /**
  * FieldManager for the persistence of a related embedded object (1-1 relation).
+ * This handles flat embedding of related embedded objects, where the field of the embedded object become
+ * a field in the owner document.
  */
 public class StoreEmbeddedFieldManager extends AbstractFieldManager
 {
@@ -135,6 +137,7 @@
         if ((relationType == Relation.ONE_TO_ONE_BI || relationType == Relation.ONE_TO_ONE_UNI) && embMmd.isEmbedded())
         {
             // (Nested) Embedded PC object
+            // This performs "flat embedding" as fields in the same document
             Class embcls = embMmd.getType();
             AbstractClassMetaData embcmd = ec.getMetaDataManager().getMetaDataForClass(embcls, clr);
             if (embcmd != null)
@@ -172,7 +175,7 @@
             relationType == Relation.MANY_TO_ONE_BI || relationType == Relation.MANY_TO_ONE_UNI)
         {
             // PC object, so make sure it is persisted
-            Object valuePC = sm.getExecutionContext().persistObjectInternal(value, sm, fieldNumber, -1);
+            Object valuePC = sm.getExecutionContext().persistObjectInternal(value, null, -1, -1);
             Object valueId = ec.getApiAdapter().getIdForObject(valuePC);
             dbObject.put(fieldName, valueId.toString()); // Store the id String form
         }
@@ -188,7 +191,7 @@
                 while (collIter.hasNext())
                 {
                     Object element = collIter.next();
-                    Object elementPC = sm.getExecutionContext().persistObjectInternal(element, sm, fieldNumber, -1);
+                    Object elementPC = sm.getExecutionContext().persistObjectInternal(element, null, -1, -1);
                     Object elementID = sm.getExecutionContext().getApiAdapter().getIdForObject(elementPC);
                     collIds.add(elementID.toString());
                 }
@@ -207,7 +210,7 @@
                     StringBuffer entryStr = new StringBuffer();
                     if (ec.getApiAdapter().isPersistable(mapKey))
                     {
-                        Object pc = ec.persistObjectInternal(mapKey, sm, fieldNumber, -1);
+                        Object pc = ec.persistObjectInternal(mapKey, null, -1, -1);
                         Object keyID = sm.getExecutionContext().getApiAdapter().getIdForObject(pc);
                         entryStr.append(keyID.toString());
                     }
@@ -220,7 +223,7 @@
 
                     if (ec.getApiAdapter().isPersistable(mapValue))
                     {
-                        Object pc = ec.persistObjectInternal(mapValue, sm, fieldNumber, -1);
+                        Object pc = ec.persistObjectInternal(mapValue, null, -1, -1);
                         Object valueID = sm.getExecutionContext().getApiAdapter().getIdForObject(pc);
                         entryStr.append(valueID.toString());
                     }
@@ -239,7 +242,7 @@
                 for (int i=0;i<Array.getLength(value);i++)
                 {
                     Object element = Array.get(value, i);
-                    Object elementPC = ec.persistObjectInternal(element, sm, fieldNumber, -1);
+                    Object elementPC = ec.persistObjectInternal(element, null, -1, -1);
                     Object elementID = ec.getApiAdapter().getIdForObject(elementPC);
                     collIds.add(elementID.toString());
                 }

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2011-02-08 07:39:08 UTC (rev 12116)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2011-02-08 11:46:49 UTC (rev 12117)
@@ -24,6 +24,7 @@
 import java.util.Iterator;
 import java.util.Map;
 
+import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 
 import org.datanucleus.ClassLoaderResolver;
@@ -48,20 +49,20 @@
 
     private DBObject dbObject;
 
-    private AbstractClassMetaData acmd;
+    private AbstractClassMetaData cmd;
 
     public StoreFieldManager(ObjectProvider sm, DBObject dbObject, AbstractClassMetaData acmd)
     {
         super();
         this.sm = sm;
         this.dbObject = dbObject;
-        this.acmd = acmd;
+        this.cmd = acmd;
     }
 
     @Override
     public void storeBooleanField(int fieldNumber, boolean value)
     {
-        AbstractMemberMetaData ammd = acmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+        AbstractMemberMetaData ammd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
         String fieldName = MongoDBUtils.getFieldName(ammd);
         dbObject.put(fieldName, new Boolean(value));
     }
@@ -70,7 +71,7 @@
     @Override
     public void storeCharField(int fieldNumber, char value)
     {
-        AbstractMemberMetaData ammd = acmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+        AbstractMemberMetaData ammd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
         String fieldName = MongoDBUtils.getFieldName(ammd);
         dbObject.put(fieldName, new Character(value));
     }
@@ -78,7 +79,7 @@
     @Override
     public void storeByteField(int fieldNumber, byte value)
     {
-        AbstractMemberMetaData ammd = acmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+        AbstractMemberMetaData ammd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
         String fieldName = MongoDBUtils.getFieldName(ammd);
         dbObject.put(fieldName, new Byte(value));
     }
@@ -86,7 +87,7 @@
     @Override
     public void storeShortField(int fieldNumber, short value)
     {
-        AbstractMemberMetaData ammd = acmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+        AbstractMemberMetaData ammd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
         String fieldName = MongoDBUtils.getFieldName(ammd);
         dbObject.put(fieldName, new Short(value));
     }
@@ -94,7 +95,7 @@
     @Override
     public void storeIntField(int fieldNumber, int value)
     {
-        AbstractMemberMetaData ammd = acmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+        AbstractMemberMetaData ammd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
         String fieldName = MongoDBUtils.getFieldName(ammd);
         dbObject.put(fieldName, new Integer(value));
     }
@@ -102,7 +103,7 @@
     @Override
     public void storeLongField(int fieldNumber, long value)
     {
-        AbstractMemberMetaData ammd = acmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+        AbstractMemberMetaData ammd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
         String fieldName = MongoDBUtils.getFieldName(ammd);
         dbObject.put(fieldName, new Long(value));
     }
@@ -110,7 +111,7 @@
     @Override
     public void storeFloatField(int fieldNumber, float value)
     {
-        AbstractMemberMetaData ammd = acmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+        AbstractMemberMetaData ammd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
         String fieldName = MongoDBUtils.getFieldName(ammd);
         dbObject.put(fieldName, new Float(value));
     }
@@ -118,7 +119,7 @@
     @Override
     public void storeDoubleField(int fieldNumber, double value)
     {
-        AbstractMemberMetaData ammd = acmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+        AbstractMemberMetaData ammd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
         String fieldName = MongoDBUtils.getFieldName(ammd);
         dbObject.put(fieldName, new Double(value));
     }
@@ -126,7 +127,7 @@
     @Override
     public void storeStringField(int fieldNumber, String value)
     {
-        AbstractMemberMetaData ammd = acmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+        AbstractMemberMetaData ammd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
         String fieldName = MongoDBUtils.getFieldName(ammd);
         if (value == null)
         {
@@ -140,36 +141,86 @@
     @Override
     public void storeObjectField(int fieldNumber, Object value)
     {
-        AbstractMemberMetaData mmd = acmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+        AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+        String fieldName = MongoDBUtils.getFieldName(mmd);
+
         ExecutionContext ec = sm.getExecutionContext();
         ClassLoaderResolver clr = ec.getClassLoaderResolver();
         int relationType = mmd.getRelationType(clr);
-        if ((relationType == Relation.ONE_TO_ONE_BI || relationType == Relation.ONE_TO_ONE_UNI) && mmd.isEmbedded())
+
+        boolean embedded = (relationType != Relation.NONE && mmd.isEmbedded());
+        if (sm.getEmbeddedOwners() != null)
         {
-            // Embedded PC object
-            Class embcls = mmd.getType();
-            AbstractClassMetaData embcmd = ec.getMetaDataManager().getMetaDataForClass(embcls, clr);
-            if (embcmd != null)
+            embedded = true;
+        }
+
+        if (embedded)
+        {
+            if (relationType == Relation.ONE_TO_ONE_BI || relationType == Relation.ONE_TO_ONE_UNI)
             {
+                // Embedded PC object
+                Class embcls = mmd.getType();
+                AbstractClassMetaData embcmd = ec.getMetaDataManager().getMetaDataForClass(embcls, clr);
+                if (embcmd == null)
+                {
+                    throw new NucleusUserException("Field " + mmd.getFullFieldName() +
+                        " specified as embedded but metadata not found for the class of type " + mmd.getTypeName());
+                }
+                boolean nested = true;
+                String nestedStr = mmd.getValueForExtension("nested");
+                if (nestedStr != null && nestedStr.equalsIgnoreCase("false"))
+                {
+                    nested = false;
+                }
+
                 if (value == null)
                 {
-                    // TODO Delete any fields for the embedded object
-                    return;
+                    if (nested)
+                    {
+                        dbObject.removeField(MongoDBUtils.getFieldName(mmd));
+                        return;
+                    }
+                    else
+                    {
+                        // TODO Delete any fields for the embedded object
+                        return;
+                    }
                 }
+
                 ObjectProvider embSM = ec.findObjectProviderForEmbedded(value, sm, mmd);
                 embSM.addEmbeddedOwner(sm, fieldNumber);
-                FieldManager ffm = new StoreEmbeddedFieldManager(embSM, dbObject, mmd);
-                embSM.provideFields(embcmd.getAllMemberPositions(), ffm);
-                return;
+
+                if (nested)
+                {
+                    // Nested embedding, as nested document
+                    BasicDBObject embeddedObject = new BasicDBObject();
+                    FieldManager ffm = new StoreFieldManager(embSM, embeddedObject, embcmd);
+                    embSM.provideFields(embcmd.getAllMemberPositions(), ffm);
+                    dbObject.put(fieldName, embeddedObject);
+                    return;
+                }
+                else
+                {
+                    // Flat embedding as fields of the owning document
+                    FieldManager ffm = new StoreEmbeddedFieldManager(embSM, dbObject, mmd);
+                    embSM.provideFields(embcmd.getAllMemberPositions(), ffm);
+                    return;
+                }
             }
-            else
+            else if (relationType == Relation.ONE_TO_MANY_UNI || relationType == Relation.ONE_TO_MANY_BI ||
+                    relationType == Relation.MANY_TO_MANY_BI)
             {
-                throw new NucleusUserException("Field " + mmd.getFullFieldName() +
-                    " specified as embedded but metadata not found for the class of type " + mmd.getTypeName());
+                if (value == null)
+                {
+                    dbObject.removeField(MongoDBUtils.getFieldName(mmd));
+                    return;
+                }
+
+                // TODO Support embedded collections/arrays/maps
+                throw new NucleusUserException("Dont currently support embedded collection at " + mmd.getFullFieldName());
             }
         }
 
-        String fieldName = MongoDBUtils.getFieldName(mmd);
         if (value == null)
         {
             if (dbObject.containsField(fieldName))
@@ -183,7 +234,7 @@
             relationType == Relation.MANY_TO_ONE_BI || relationType == Relation.MANY_TO_ONE_UNI)
         {
             // PC object, so make sure it is persisted
-            Object valuePC = sm.getExecutionContext().persistObjectInternal(value, sm, fieldNumber, -1);
+            Object valuePC = sm.getExecutionContext().persistObjectInternal(value, null, -1, -1);
             Object valueId = ec.getApiAdapter().getIdForObject(valuePC);
             dbObject.put(fieldName, valueId.toString()); // Store the id String form
         }
@@ -199,7 +250,7 @@
                 while (collIter.hasNext())
                 {
                     Object element = collIter.next();
-                    Object elementPC = sm.getExecutionContext().persistObjectInternal(element, sm, fieldNumber, -1);
+                    Object elementPC = sm.getExecutionContext().persistObjectInternal(element, null, -1, -1);
                     Object elementID = sm.getExecutionContext().getApiAdapter().getIdForObject(elementPC);
                     collIds.add(elementID.toString());
                 }
@@ -218,7 +269,7 @@
                     StringBuffer entryStr = new StringBuffer();
                     if (ec.getApiAdapter().isPersistable(mapKey))
                     {
-                        Object pc = ec.persistObjectInternal(mapKey, sm, fieldNumber, -1);
+                        Object pc = ec.persistObjectInternal(mapKey, null, -1, -1);
                         Object keyID = sm.getExecutionContext().getApiAdapter().getIdForObject(pc);
                         entryStr.append(keyID.toString());
                     }
@@ -231,7 +282,7 @@
 
                     if (ec.getApiAdapter().isPersistable(mapValue))
                     {
-                        Object pc = ec.persistObjectInternal(mapValue, sm, fieldNumber, -1);
+                        Object pc = ec.persistObjectInternal(mapValue, null, -1, -1);
                         Object valueID = sm.getExecutionContext().getApiAdapter().getIdForObject(pc);
                         entryStr.append(valueID.toString());
                     }
@@ -250,7 +301,7 @@
                 for (int i=0;i<Array.getLength(value);i++)
                 {
                     Object element = Array.get(value, i);
-                    Object elementPC = ec.persistObjectInternal(element, sm, fieldNumber, -1);
+                    Object elementPC = ec.persistObjectInternal(element, null, -1, -1);
                     Object elementID = ec.getApiAdapter().getIdForObject(elementPC);
                     collIds.add(elementID.toString());
                 }

Added: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/package.html
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/package.html	                        (rev 0)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/package.html	2011-02-08 11:46:49 UTC (rev 12117)
@@ -0,0 +1,4 @@
+<BODY>
+    Package providing field management for MongoDB datastores. FieldManagers in this case cater for
+    putting field values into MongoDB document "fields", and retrieving values from MongoDB document "fields".
+</BODY>
\ No newline at end of file

Added: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/overview.html
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/overview.html	                        (rev 0)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/overview.html	2011-02-08 11:46:49 UTC (rev 12117)
@@ -0,0 +1,12 @@
+<BODY>
+    <P>
+        DataNucleus "MongoDB" provides persistence of Java objects to MongoDB datastores. It builds on top
+        of the DataNucleus "core" jar supporting specific features of MongoDN datastores. It provides querying 
+        capabilities using JDOQL/JPQL. The code can be utilised with either JDO or JPA persistence APIs.
+    </P> 
+    <P>
+        Support for this persistence layer is provided by way of a 
+        <A HREF="http://forum.datanucleus.org">Forum</A> at 
+        <A HREF="http://www.datanucleus.org">http://www.datanucleus.org</A>.
+    </P>
+</BODY>
\ No newline at end of file

Added: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/package.html
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/package.html	                        (rev 0)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/package.html	2011-02-08 11:46:49 UTC (rev 12117)
@@ -0,0 +1,4 @@
+<BODY>
+    Package providing management of the persistence to MongoDB datastores.
+    All subpackages below this level are specific to MongoDB.
+</BODY>
\ No newline at end of file

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java	2011-02-08 07:39:08 UTC (rev 12116)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java	2011-02-08 11:46:49 UTC (rev 12117)
@@ -572,9 +572,22 @@
                     (relationType == Relation.ONE_TO_ONE_UNI || relationType == Relation.ONE_TO_ONE_BI ||
                      relationType == Relation.MANY_TO_ONE_UNI || relationType == Relation.MANY_TO_ONE_BI))
                 {
-                    // Embedded PC into this document, so navigate to embedded class
-                    cmd = ec.getMetaDataManager().getMetaDataForClass(mmd.getType(), clr);
-                    embMmd = mmd;
+                    boolean nested = true;
+                    String nestedStr = mmd.getValueForExtension("nested");
+                    if (nestedStr != null && nestedStr.equalsIgnoreCase("false"))
+                    {
+                        nested = false;
+                    }
+                    if (nested)
+                    {
+                        // TODO Cater for nested embedded field
+                    }
+                    else
+                    {
+                        // Embedded PC into this document, so navigate to embedded class
+                        cmd = ec.getMetaDataManager().getMetaDataForClass(mmd.getType(), clr);
+                        embMmd = mmd;
+                    }
                 }
                 else
                 {

Added: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/package.html
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/package.html	                        (rev 0)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/package.html	2011-02-08 11:46:49 UTC (rev 12117)
@@ -0,0 +1,5 @@
+<BODY>
+    Package providing querying of MongoDB datastores.
+    The QueryToMongoDBMapper takes the generic query expression trees and tries to convert them into
+    MongoDB JSON queries (where the feature is supported by JSON querying).
+</BODY>
\ No newline at end of file


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12133
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=12133&view=rev
Author:   andy_jefferson
Date:     2011-02-09 13:40:37 +0000 (Wed, 09 Feb 2011)

Log Message:
-----------
use of Relation

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-09 11:18:25 UTC (rev 12132)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-09 13:40:37 UTC (rev 12133)
@@ -310,30 +310,26 @@
             {
                 AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fpMembers[i]);
                 int relationType = mmd.getRelationType(clr);
-                if (mmd.isEmbedded() && relationType != Relation.NONE)
+                if (mmd.isEmbedded() && Relation.isRelationSingleValued(relationType))
                 {
-                    if (relationType == Relation.ONE_TO_ONE_UNI || relationType == Relation.ONE_TO_ONE_BI ||
-                        relationType == Relation.MANY_TO_ONE_BI || relationType == Relation.MANY_TO_ONE_UNI)
+                    boolean nested = true;
+                    String nestedStr = mmd.getValueForExtension("nested");
+                    if (nestedStr != null && nestedStr.equalsIgnoreCase("false"))
                     {
-                        boolean nested = true;
-                        String nestedStr = mmd.getValueForExtension("nested");
-                        if (nestedStr != null && nestedStr.equalsIgnoreCase("false"))
-                        {
-                            nested = false;
-                        }
+                        nested = false;
+                    }
 
-                        if (nested)
-                        {
-                            // Nested Embedded field, so include field
-                            String fieldName = MongoDBUtils.getFieldName(mmd);
-                            fieldsSelection.append(fieldName, 1);
-                        }
-                        else
-                        {
-                            // Flat Embedded field, so add all fields of sub-objects
-                            selectAllFieldsOfEmbeddedObject(mmd, fieldsSelection, ec, clr);
-                        }
+                    if (nested)
+                    {
+                        // Nested Embedded field, so include field
+                        String fieldName = MongoDBUtils.getFieldName(mmd);
+                        fieldsSelection.append(fieldName, 1);
                     }
+                    else
+                    {
+                        // Flat Embedded field, so add all fields of sub-objects
+                        selectAllFieldsOfEmbeddedObject(mmd, fieldsSelection, ec, clr);
+                    }
                 }
                 else
                 {
@@ -401,9 +397,7 @@
         for (int i=0;i<embmmds.length;i++)
         {
             int relationType = embmmds[i].getRelationType(clr);
-            if (embmmds[i].isEmbedded() &&
-                (relationType == Relation.ONE_TO_ONE_UNI || relationType == Relation.ONE_TO_ONE_BI ||
-                 relationType == Relation.MANY_TO_ONE_BI || relationType == Relation.MANY_TO_ONE_UNI))
+            if (embmmds[i].isEmbedded() && Relation.isRelationSingleValued(relationType))
             {
                 selectAllFieldsOfEmbeddedObject(embmmds[i], fieldsSelection, ec, clr);
             }

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java	2011-02-09 11:18:25 UTC (rev 12132)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java	2011-02-09 13:40:37 UTC (rev 12133)
@@ -569,8 +569,7 @@
                 }
                 else if (mmd.isEmbedded())
                 {
-                    if (relationType == Relation.ONE_TO_ONE_UNI || relationType == Relation.ONE_TO_ONE_BI ||
-                     relationType == Relation.MANY_TO_ONE_UNI || relationType == Relation.MANY_TO_ONE_BI)
+                    if (Relation.isRelationSingleValued(relationType))
                     {
                         boolean nested = true;
                         String nestedStr = mmd.getValueForExtension("nested");
@@ -601,8 +600,7 @@
                             }
                         }
                     }
-                    else if (relationType == Relation.ONE_TO_MANY_UNI || relationType == Relation.ONE_TO_MANY_BI ||
-                            relationType == Relation.MANY_TO_MANY_BI)
+                    else if (Relation.isRelationMultiValued(relationType))
                     {
                         throw new NucleusUserException("Dont currently support querying of embedded collection fields at " + mmd.getFullFieldName());
                     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12143
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=12143&view=rev
Author:   andy_jefferson
Date:     2011-02-10 08:58:29 +0000 (Thu, 10 Feb 2011)

Log Message:
-----------
[NUCMONGODB-20] Allow running queries on slave

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-09 19:42:21 UTC (rev 12142)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-10 08:58:29 UTC (rev 12143)
@@ -267,15 +267,17 @@
      * @param ignoreCache Ignore the cache?
      * @param fp FetchPlan when retrieving the objects
      * @param filterObject Optional filter object
+     * @param options Set of options for controlling this query
      * @return List of all candidate objects
      */
     public static List getObjectsOfCandidateType(ExecutionContext ec, DB db, Class candidateClass, 
-            boolean subclasses, boolean ignoreCache, FetchPlan fp, BasicDBObject filterObject)
+            boolean subclasses, boolean ignoreCache, FetchPlan fp, BasicDBObject filterObject,
+            Map<String, Object> options)
     {
         ClassLoaderResolver clr = ec.getClassLoaderResolver();
 
         AbstractClassMetaData cmd = ec.getMetaDataManager().getMetaDataForClass(candidateClass, clr);
-        List results = getObjectsOfType(cmd, db, ec, ignoreCache, fp, filterObject);
+        List results = getObjectsOfType(cmd, db, ec, ignoreCache, fp, filterObject, options);
 
         if (subclasses)
         {
@@ -286,7 +288,7 @@
                 for (int i=0;i<subclassNames.length;i++)
                 {
                     AbstractClassMetaData subcmd = ec.getMetaDataManager().getMetaDataForClass(subclassNames[i], clr);
-                    results.addAll(getObjectsOfType(subcmd, db, ec, ignoreCache, fp, filterObject));
+                    results.addAll(getObjectsOfType(subcmd, db, ec, ignoreCache, fp, filterObject, options));
                 }
             }
         }
@@ -295,7 +297,7 @@
     }
 
     protected static List getObjectsOfType(AbstractClassMetaData cmd, DB db, ExecutionContext ec, boolean ignoreCache,
-            FetchPlan fp, BasicDBObject filterObject)
+            FetchPlan fp, BasicDBObject filterObject, Map<String, Object> options)
     {
         List results = new ArrayList();
 
@@ -369,7 +371,13 @@
                 " fields=" + fieldsSelection + " with filter=" + query);
         }
 
-        DBCursor curs = db.getCollection(MongoDBUtils.getCollectionName(cmd)).find(query, fieldsSelection);
+        DBCollection dbColl = db.getCollection(MongoDBUtils.getCollectionName(cmd));
+        Object val = (options != null ? options.get("slave-ok") : Boolean.FALSE);
+        if (val == Boolean.TRUE)
+        {
+            dbColl.slaveOk();
+        }
+        DBCursor curs = dbColl.find(query, fieldsSelection);
         if (cmd.getIdentityType() == IdentityType.APPLICATION)
         {
             while (curs.hasNext())

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java	2011-02-09 19:42:21 UTC (rev 12142)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java	2011-02-10 08:58:29 UTC (rev 12143)
@@ -19,6 +19,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -241,9 +242,15 @@
                     }
                 }
 
+                Map<String, Object> options = new HashMap();
+                if (getBooleanExtensionProperty("slave-ok", false))
+                {
+                    options.put("slave-ok", true);
+                }
+
                 // Execute as much as possible in the datastore
                 candidates = MongoDBUtils.getObjectsOfCandidateType(ec, db, candidateClass, subclasses,
-                    ignoreCache, getFetchPlan(), filterObject);
+                    ignoreCache, getFetchPlan(), filterObject, options);
             }
 
             // Apply any result restrictions to the results

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java	2011-02-09 19:42:21 UTC (rev 12142)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java	2011-02-10 08:58:29 UTC (rev 12143)
@@ -19,6 +19,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -233,9 +234,15 @@
                     }
                 }
 
+                Map<String, Object> options = new HashMap();
+                if (getBooleanExtensionProperty("slave-ok", false))
+                {
+                    options.put("slave-ok", true);
+                }
+
                 // Execute as much as possible in the datastore
                 candidates = MongoDBUtils.getObjectsOfCandidateType(ec, db, candidateClass, subclasses,
-                    ignoreCache, getFetchPlan(), filterObject);
+                    ignoreCache, getFetchPlan(), filterObject, options);
             }
 
             // Apply any result restrictions to the results


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12151
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=12151&view=rev
Author:   andy_jefferson
Date:     2011-02-10 14:30:59 +0000 (Thu, 10 Feb 2011)

Log Message:
-----------
improvements to logging so we show any datastore-generated id, and log to correct category

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation.properties
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation_es.properties
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation.properties
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation.properties	2011-02-10 13:44:34 UTC (rev 12150)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation.properties	2011-02-10 14:30:59 UTC (rev 12151)
@@ -21,7 +21,9 @@
 
 MongoDB.Insert.Start=Object "{0}" being inserted into MongoDB with all reachable objects
 MongoDB.Insert.ObjectWithIdAlreadyExists=Object "{0}" being inserted has id "{1}" yet an object with this id already exists in the datastore!
+MongoDB.Insert.ObjectPersisted=Object "{0}" (id="{1}) persisted to MongoDB
 MongoDB.Insert.ObjectPersistedWithVersion=Object "{0}" (id="{1}) persisted to MongoDB with version "{2}"
+MongoDB.Insert.ObjectPersistedWithIdentity=Object "{0}" persisted to MongoDB has had identity set to "{1}"
 MongoDB.Update.Start=Object "{0}" (id="{1}") being updated in MongoDB (for fields "{2}") with all reachable objects
 MongoDB.Delete.Start=Object "{0}" (id="{1}") being deleted from MongoDB with all dependent objects
 MongoDB.Delete.ObjectDeleted=Object "{0}" (id="{1}") has been deleted

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation_es.properties
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation_es.properties	2011-02-10 13:44:34 UTC (rev 12150)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation_es.properties	2011-02-10 14:30:59 UTC (rev 12151)
@@ -21,13 +21,16 @@
 
 MongoDB.Insert.Start=Objeto "{0}" va a estar puesto en MongoDB con todos los objetos alcanzables
 MongoDB.Insert.ObjectWithIdAlreadyExists=Objeto "{0}" tiene identidad "{1}" pero un objeto con esta identidad existe en la base de datos!
+MongoDB.Insert.ObjectPersisted=Objeto "{0}" (identidad="{1}) persistido a MongoDB
 MongoDB.Insert.ObjectPersistedWithVersion=Objeto "{0}" (identidad="{1}) persistido a MongoDB con la version "{2}"
+MongoDB.Insert.ObjectPersistedWithIdentity=Objeto "{0}" persistido a MongoDB ha tenido la identidad puesto como "{1}"
 MongoDB.Update.Start=Objeto "{0}" (identidad="{1}") va a ser cambiado en MongoDB (para los campos "{2}") con todos los objetos alcanzables
 MongoDB.Delete.Start=Objeto "{0}" (identidad="{1}") va a ser borrado en MongoDB con todos los objetos alcanzables
 MongoDB.Delete.ObjectDeleted=Objeto "{0}" (identidad="{1}") ha sido borrado
 MongoDB.Fetch.Start=Objeto "{0}" (identidad="{1}") va a ser obtenido de MongoDB
 MongoDB.ExecutionTime=Tiempo de ejecuci\xF3n = {0} ms
 
+
 MongoDB.SchemaCreate.Class=Creando el esquema para la clase "{0}" en la colleccion "{1}"
 MongoDB.SchemaCreate.Class.Field=Creando campo "{0}" para la colleccion "{1}"
 MongoDB.SchemaCreate.Class.Index=Creando indice "{0}" para la colleccion "{1}" como "{2}"

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-10 13:44:34 UTC (rev 12150)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-10 14:30:59 UTC (rev 12151)
@@ -151,15 +151,17 @@
                 dbObject.put(fieldName, discVal);
             }
 
+            String versionStr = null;
             if (cmd.hasVersionStrategy())
             {
                 if (cmd.getVersionMetaData().getVersionStrategy() == VersionStrategy.VERSION_NUMBER)
                 {
                     long versionNumber = 1;
                     sm.setTransactionalVersion(Long.valueOf(versionNumber));
-                    if (NucleusLogger.DATASTORE.isDebugEnabled())
+                    versionStr = "" + versionNumber;
+                    if (NucleusLogger.DATASTORE_PERSIST.isDebugEnabled())
                     {
-                        NucleusLogger.DATASTORE.debug(LOCALISER.msg("MongoDB.Insert.ObjectPersistedWithVersion",
+                        NucleusLogger.DATASTORE_PERSIST.debug(LOCALISER.msg("MongoDB.Insert.ObjectPersistedWithVersion",
                             sm.toPrintableID(), sm.getInternalObjectId(), "" + versionNumber));
                     }
 
@@ -186,12 +188,8 @@
                     Date date = new Date();
                     Timestamp ts = new Timestamp(date.getTime());
                     sm.setTransactionalVersion(ts);
+                    versionStr = "" + ts;
 
-                    if (NucleusLogger.DATASTORE.isDebugEnabled())
-                    {
-                        NucleusLogger.DATASTORE.debug(LOCALISER.msg("MongoDB.Insert.ObjectPersistedWithVersion",
-                            sm.toPrintableID(), sm.getInternalObjectId(), "" + ts));
-                    }
                     if (cmd.getVersionMetaData().getFieldName() != null)
                     {
                         // Version field
@@ -211,13 +209,32 @@
             sm.provideFields(cmd.getAllMemberPositions(), fieldManager);
             collection.insert(dbObject);
 
-            // Set datastore id when using IDENTITY
+            if (NucleusLogger.DATASTORE_PERSIST.isDebugEnabled())
+            {
+                if (versionStr != null)
+                {
+                    NucleusLogger.DATASTORE_PERSIST.debug(LOCALISER.msg("MongoDB.Insert.ObjectPersistedWithVersion",
+                        sm.toPrintableID(), sm.getInternalObjectId(), versionStr));
+                }
+                else
+                {
+                    NucleusLogger.DATASTORE_PERSIST.debug(LOCALISER.msg("MongoDB.Insert.ObjectPersisted",
+                        sm.toPrintableID(), sm.getInternalObjectId()));
+                }
+            }
+
+            // Retrieve any datastore-generated IDENTITY strategy value as necessary
             if (cmd.getIdentityType() == IdentityType.DATASTORE &&
                 cmd.getIdentityMetaData().getValueStrategy() == IdentityStrategy.IDENTITY)
             {
                 // Set identity from MongoDB "_id" field
                 ObjectId idKey = (ObjectId) dbObject.get("_id");
                 sm.setPostStoreNewObjectId(idKey.toString());
+                if (NucleusLogger.DATASTORE_PERSIST.isDebugEnabled())
+                {
+                    NucleusLogger.DATASTORE_PERSIST.debug(LOCALISER.msg("MongoDB.Insert.ObjectPersistedWithIdentity",
+                        sm.toPrintableID(), idKey));
+                }
             }
             else if (cmd.getIdentityType() == IdentityType.APPLICATION)
             {
@@ -235,6 +252,11 @@
                         ObjectId idKey = (ObjectId)dbObject.get("_id");
                         sm.replaceField(mmd.getAbsoluteFieldNumber(), idKey.toString());
                         sm.setPostStoreNewObjectId(idKey); // TODO This is incorrect if part of a composite PK
+                        if (NucleusLogger.DATASTORE_PERSIST.isDebugEnabled())
+                        {
+                            NucleusLogger.DATASTORE_PERSIST.debug(LOCALISER.msg("MongoDB.Insert.ObjectPersistedWithIdentity",
+                                sm.toPrintableID(), idKey));
+                        }
                     }
                 }
             }
@@ -383,7 +405,7 @@
         try
         {
             DB db = (DB)mconn.getConnection();
-            if (NucleusLogger.PERSISTENCE.isDebugEnabled())
+            if (NucleusLogger.DATASTORE_RETRIEVE.isDebugEnabled())
             {
                 // Debug information about what we are retrieving
                 StringBuffer str = new StringBuffer("Fetching object \"");
@@ -398,7 +420,7 @@
                     str.append(cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumbers[i]).getName());
                 }
                 str.append("]");
-                NucleusLogger.PERSISTENCE.debug(str);
+                NucleusLogger.DATASTORE_RETRIEVE.debug(str);
             }
 
             long startTime = System.currentTimeMillis();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12174
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=12174&view=rev
Author:   andy_jefferson
Date:     2011-02-13 19:01:47 +0000 (Sun, 13 Feb 2011)

Log Message:
-----------
[NUCMONGODB-21] Basic implementation of embedded maps.
Update persistence of maps to use array of entries with "key","value" fields to be consistent with "embedded" option

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-13 09:32:19 UTC (rev 12173)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-13 19:01:47 UTC (rev 12174)
@@ -208,6 +208,7 @@
             StoreFieldManager fieldManager = new StoreFieldManager(sm, dbObject, cmd);
             sm.provideFields(cmd.getAllMemberPositions(), fieldManager);
             collection.insert(dbObject);
+            NucleusLogger.GENERAL.info(">> insertObject " + dbObject);
 
             if (NucleusLogger.DATASTORE_PERSIST.isDebugEnabled())
             {

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2011-02-13 09:32:19 UTC (rev 12173)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2011-02-13 19:01:47 UTC (rev 12174)
@@ -41,6 +41,7 @@
 import org.datanucleus.store.types.ObjectLongConverter;
 import org.datanucleus.store.types.ObjectStringConverter;
 import org.datanucleus.store.types.sco.SCOUtils;
+import org.datanucleus.util.NucleusLogger;
 
 /**
  * Field Manager for retrieving values from MongoDB.
@@ -341,9 +342,73 @@
                 }
                 else
                 {
-                    // TODO Support embedded maps
-                    throw new NucleusUserException(
-                        "Dont currently support retrieval of nested embedded map at " + mmd.getFullFieldName());
+                    String fieldName = MongoDBUtils.getFieldName(mmd);
+                    if (!dbObject.containsField(fieldName))
+                    {
+                        return null;
+                    }
+                    Object value = dbObject.get(fieldName);
+                    Map map = null;
+                    try
+                    {
+                        Class instanceType = SCOUtils.getContainerInstanceType(mmd.getType(), null);
+                        map = (Map) instanceType.newInstance();
+                    }
+                    catch (Exception e)
+                    {
+                        throw new NucleusDataStoreException(e.getMessage(), e);
+                    }
+
+                    AbstractClassMetaData keyCmd = mmd.getMap().getKeyClassMetaData(clr, ec.getMetaDataManager());
+                    AbstractClassMetaData valCmd = mmd.getMap().getValueClassMetaData(clr, ec.getMetaDataManager());
+                    Collection<DBObject> entryColl = (Collection)value;
+                    Iterator<DBObject> entryIter = entryColl.iterator();
+                    while (entryIter.hasNext())
+                    {
+                        DBObject entryObj = entryIter.next();
+                        Object keyObj = entryObj.get("key");
+                        Object valObj = entryObj.get("value");
+
+                        Object mapKey = null;
+                        if (keyCmd != null)
+                        {
+                            // Key is embedded object
+                            DBObject keyDbObj = (DBObject)keyObj;
+                            ObjectProvider embSM = ec.newObjectProviderForMember(mmd, keyCmd);
+                            embSM.addEmbeddedOwner(sm, fieldNumber);
+                            FetchFieldManager ffm = new FetchFieldManager(embSM, keyDbObj, keyCmd);
+                            ffm.ownerMmd = mmd;
+                            ffm.embedded = true;
+                            embSM.replaceFields(keyCmd.getAllMemberPositions(), ffm);
+                            mapKey = embSM.getObject();
+                        }
+                        else
+                        {
+                            mapKey = getMapKeyForReturnValue(mmd, keyObj);
+                        }
+
+                        Object mapVal = null;
+                        if (valCmd != null)
+                        {
+                            // Value is embedded object
+                            DBObject valDbObj = (DBObject)valObj;
+                            ObjectProvider embSM = ec.newObjectProviderForMember(mmd, valCmd);
+                            embSM.addEmbeddedOwner(sm, fieldNumber);
+                            FetchFieldManager ffm = new FetchFieldManager(embSM, valDbObj, valCmd);
+                            ffm.ownerMmd = mmd;
+                            ffm.embedded = true;
+                            embSM.replaceFields(valCmd.getAllMemberPositions(), ffm);
+                            mapVal = embSM.getObject();
+                        }
+                        else
+                        {
+                            mapVal = getMapValueForReturnValue(mmd, valObj);
+                        }
+
+                        NucleusLogger.GENERAL.info(">> FetchFM entry key=" + mapKey + " val=" + mapVal);
+                        map.put(mapKey, mapVal);
+                    }
+                    return map;
                 }
             }
         }
@@ -386,7 +451,6 @@
         {
             // "a,b,c,d,..."
             Collection<Object> coll;
-            AbstractClassMetaData elemCmd = mmd.getCollection().getElementClassMetaData(clr, ec.getMetaDataManager());
             try
             {
                 Class instanceType = SCOUtils.getContainerInstanceType(mmd.getType(), mmd.getOrderMetaData() != null);
@@ -397,6 +461,7 @@
                 throw new NucleusDataStoreException(e.getMessage(), e);
             }
 
+            AbstractClassMetaData elemCmd = mmd.getCollection().getElementClassMetaData(clr, ec.getMetaDataManager());
             Collection collIds = (Collection)value;
             Iterator idIter = collIds.iterator();
             while (idIter.hasNext())
@@ -414,11 +479,11 @@
         }
         else if (mmd.hasMap())
         {
-            // "Set<String#DN#String>"
-            Map map;
+            // "List<Entry>" where the entry object has "key", "value" fields
+            Map map = null;
             try
             {
-                Class instanceType = SCOUtils.getContainerInstanceType(mmd.getType(), mmd.getOrderMetaData() != null);
+                Class instanceType = SCOUtils.getContainerInstanceType(mmd.getType(), null);
                 map = (Map) instanceType.newInstance();
             }
             catch (Exception e)
@@ -428,35 +493,34 @@
 
             AbstractClassMetaData keyCmd = mmd.getMap().getKeyClassMetaData(clr, ec.getMetaDataManager());
             AbstractClassMetaData valueCmd = mmd.getMap().getValueClassMetaData(clr, ec.getMetaDataManager());
-
-            Collection<String> collEntries = (Collection)value;
-            Iterator<String> entryIter = collEntries.iterator();
+            Collection<DBObject> collEntries = (Collection)value;
+            Iterator<DBObject> entryIter = collEntries.iterator();
             while (entryIter.hasNext())
             {
-                String entryStr = entryIter.next();
-                String keyStr = entryStr.substring(0, entryStr.indexOf("#DN#"));
-                String valueStr = entryStr.substring(entryStr.indexOf("#DN#")+4);
+                DBObject entryObj = entryIter.next();
+                Object keyObj = entryObj.get("key");
+                Object valueObj = entryObj.get("value");
 
                 Object mapKey = null;
-                Object mapVal = null;
-
                 if (keyCmd != null)
                 {
-                    mapKey = IdentityUtils.getObjectFromIdString(keyStr, keyCmd, ec, true);
+                    mapKey = IdentityUtils.getObjectFromIdString((String)keyObj, keyCmd, ec, true);
                 }
                 else
                 {
-                    mapKey = getMapKeyForStringValue(mmd, keyStr);
+                    mapKey = getMapKeyForReturnValue(mmd, keyObj);
                 }
+
+                Object mapVal = null;
                 if (valueCmd != null)
                 {
-                    mapVal = IdentityUtils.getObjectFromIdString(valueStr, valueCmd, ec, true);
+                    mapVal = IdentityUtils.getObjectFromIdString((String)valueObj, valueCmd, ec, true);
                 }
                 else
                 {
-                    mapVal = getMapValueForStringValue(mmd, valueStr);
+                    mapVal = getMapValueForReturnValue(mmd, valueObj);
                 }
-
+NucleusLogger.GENERAL.info(">> FetchFM entry key=" + mapKey + " val=" + mapVal);
                 map.put(mapKey, mapVal);
             }
 
@@ -518,52 +582,30 @@
         return returnValue;
     }
 
-    private Object getMapKeyForStringValue(AbstractMemberMetaData mmd, String value)
+    private Object getMapKeyForReturnValue(AbstractMemberMetaData mmd, Object value)
     {
         String keyType = mmd.getMap().getKeyType();
         Class keyCls = ec.getClassLoaderResolver().classForName(keyType);
-        if (keyCls == String.class)
+        if (keyCls == Long.class || keyCls == Double.class || keyCls == Float.class ||
+            keyCls == Integer.class || keyCls == Short.class || keyCls == String.class)
         {
             return value;
         }
-        else if (keyCls == Long.class)
-        {
-            return Long.valueOf(value);
-        }
-        else if (keyCls == Integer.class)
-        {
-            return Integer.valueOf(value);
-        }
-        else if (keyCls == Short.class)
-        {
-            return Short.valueOf(value);
-        }
         else
         {
             throw new NucleusException("Dont currently support persistence/retrieval of maps with keys of type " + keyType);
         }
     }
 
-    private Object getMapValueForStringValue(AbstractMemberMetaData mmd, String value)
+    private Object getMapValueForReturnValue(AbstractMemberMetaData mmd, Object value)
     {
         String valueType = mmd.getMap().getValueType();
         Class valueCls = ec.getClassLoaderResolver().classForName(valueType);
-        if (valueCls == String.class)
+        if (valueCls == Long.class || valueCls == Double.class || valueCls == Float.class ||
+                valueCls == Integer.class || valueCls == Short.class || valueCls == String.class)
         {
             return value;
         }
-        else if (valueCls == Long.class)
-        {
-            return Long.valueOf(value);
-        }
-        else if (valueCls == Integer.class)
-        {
-            return Integer.valueOf(value);
-        }
-        else if (valueCls == Short.class)
-        {
-            return Short.valueOf(value);
-        }
         else
         {
             throw new NucleusException("Dont currently support persistence/retrieval of maps with values of type " + valueType);

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java	2011-02-13 09:32:19 UTC (rev 12173)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java	2011-02-13 19:01:47 UTC (rev 12174)
@@ -112,7 +112,7 @@
         }
         else
         {
-            processContainerNonRelationField(fieldName, ec, value);
+            processContainerNonRelationField(fieldName, ec, value, dbObject);
         }
     }
 }
\ No newline at end of file

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2011-02-13 09:32:19 UTC (rev 12173)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2011-02-13 19:01:47 UTC (rev 12174)
@@ -39,6 +39,7 @@
 import org.datanucleus.store.mongodb.MongoDBUtils;
 import org.datanucleus.store.types.ObjectLongConverter;
 import org.datanucleus.store.types.ObjectStringConverter;
+import org.datanucleus.util.NucleusLogger;
 
 /**
  * Field Manager for putting values into MongoDB.
@@ -300,8 +301,53 @@
                 }
                 else
                 {
-                    // TODO Support embedded maps
-                    throw new NucleusUserException("Dont currently support embedded maps at " + mmd.getFullFieldName());
+                    AbstractClassMetaData keyCmd = mmd.getMap().getKeyClassMetaData(clr, ec.getMetaDataManager());
+                    AbstractClassMetaData valCmd = mmd.getMap().getValueClassMetaData(clr, ec.getMetaDataManager());
+                    NucleusLogger.DATASTORE_PERSIST.debug(">> embedded map at " + mmd.getFullFieldName() +
+                        " key=" + mmd.getMap().getKeyType() + " val=" + mmd.getMap().getValueType());
+
+                    Collection entryList = new ArrayList();
+                    Map valueMap = (Map)value;
+                    Iterator<Map.Entry> mapEntryIter = valueMap.entrySet().iterator();
+                    while (mapEntryIter.hasNext())
+                    {
+                        Map.Entry entry = mapEntryIter.next();
+                        BasicDBObject entryObj = new BasicDBObject();
+
+                        NucleusLogger.DATASTORE_PERSIST.debug(">> entry key=" + entry.getKey() + " val=" + entry.getValue());
+                        if (keyCmd == null)
+                        {
+                            processContainerNonRelationField("key", ec, entry.getKey(), entryObj);
+                        }
+                        else
+                        {
+                            ObjectProvider embSM = ec.findObjectProviderForEmbedded(entry.getKey(), sm, mmd);
+                            embSM.addEmbeddedOwner(sm, fieldNumber);
+                            BasicDBObject embeddedKey = new BasicDBObject();
+                            StoreFieldManager sfm = new StoreFieldManager(embSM, embeddedKey, keyCmd);
+                            sfm.ownerMmd = mmd;
+                            embSM.provideFields(keyCmd.getAllMemberPositions(), sfm);
+                            entryObj.append("key", embeddedKey);
+                        }
+
+                        if (valCmd == null)
+                        {
+                            processContainerNonRelationField("value", ec, entry.getValue(), entryObj);
+                        }
+                        else
+                        {
+                            ObjectProvider embSM = ec.findObjectProviderForEmbedded(entry.getValue(), sm, mmd);
+                            embSM.addEmbeddedOwner(sm, fieldNumber);
+                            BasicDBObject embeddedVal = new BasicDBObject();
+                            StoreFieldManager sfm = new StoreFieldManager(embSM, embeddedVal, valCmd);
+                            sfm.ownerMmd = mmd;
+                            embSM.provideFields(valCmd.getAllMemberPositions(), sfm);
+                            entryObj.append("value", embeddedVal);
+                        }
+                        entryList.add(entryObj);
+                    }
+                    dbObject.put(fieldName, entryList);
+                    return;
                 }
             }
         }
@@ -327,7 +373,7 @@
         }
         else
         {
-            processContainerNonRelationField(fieldName, ec, value);
+            processContainerNonRelationField(fieldName, ec, value, dbObject);
         }
     }
 
@@ -358,7 +404,7 @@
         }
         else if (mmd.hasMap())
         {
-            Collection<String> collEntries = new HashSet();
+            Collection<DBObject> collEntries = new HashSet();
             Map map = (Map)value;
             Iterator<Map.Entry> mapIter = map.entrySet().iterator();
             while (mapIter.hasNext())
@@ -366,34 +412,33 @@
                 Map.Entry entry = mapIter.next();
                 Object mapKey = entry.getKey();
                 Object mapValue = entry.getValue();
-                StringBuffer entryStr = new StringBuffer();
+
+                BasicDBObject entryObj = new BasicDBObject();
                 if (ec.getApiAdapter().isPersistable(mapKey))
                 {
                     Object pc = ec.persistObjectInternal(mapKey, null, -1, -1);
                     Object keyID = sm.getExecutionContext().getApiAdapter().getIdForObject(pc);
-                    entryStr.append(keyID.toString());
+                    entryObj.append("key", keyID.toString());
                 }
                 else
                 {
-                    entryStr.append(mapKey);
+                    processContainerNonRelationField("key", ec, mapKey, entryObj);
                 }
 
-                entryStr.append("#DN#");
-
                 if (ec.getApiAdapter().isPersistable(mapValue))
                 {
                     Object pc = ec.persistObjectInternal(mapValue, null, -1, -1);
                     Object valueID = sm.getExecutionContext().getApiAdapter().getIdForObject(pc);
-                    entryStr.append(valueID.toString());
+                    entryObj.append("value", valueID.toString());
                 }
                 else
                 {
-                    entryStr.append(mapValue);
+                    processContainerNonRelationField("value", ec, mapValue, entryObj);
                 }
 
-                collEntries.add(entryStr.toString());
+                collEntries.add(entryObj);
             }
-            dbObject.put(fieldName, collEntries); // Store Collection<String> of entries (with #DN# separator)
+            dbObject.put(fieldName, collEntries); // Store Collection<DBObject> of entries
         }
         else if (mmd.hasArray())
         {
@@ -409,7 +454,7 @@
         }
     }
 
-    protected void processContainerNonRelationField(String fieldName, ExecutionContext ec, Object value)
+    protected void processContainerNonRelationField(String fieldName, ExecutionContext ec, Object value, DBObject dbObject)
     {
         ObjectStringConverter strConv = 
             ec.getNucleusContext().getTypeManager().getStringConverter(value.getClass());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12177
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=12177&view=rev
Author:   andy_jefferson
Date:     2011-02-13 19:45:28 +0000 (Sun, 13 Feb 2011)

Log Message:
-----------
[NUCMONGODB-21] Completion of support for embedded maps

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-13 19:44:22 UTC (rev 12176)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-13 19:45:28 UTC (rev 12177)
@@ -208,7 +208,6 @@
             StoreFieldManager fieldManager = new StoreFieldManager(sm, dbObject, cmd);
             sm.provideFields(cmd.getAllMemberPositions(), fieldManager);
             collection.insert(dbObject);
-            NucleusLogger.GENERAL.info(">> insertObject " + dbObject);
 
             if (NucleusLogger.DATASTORE_PERSIST.isDebugEnabled())
             {

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2011-02-13 19:44:22 UTC (rev 12176)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2011-02-13 19:45:28 UTC (rev 12177)
@@ -41,7 +41,6 @@
 import org.datanucleus.store.types.ObjectLongConverter;
 import org.datanucleus.store.types.ObjectStringConverter;
 import org.datanucleus.store.types.sco.SCOUtils;
-import org.datanucleus.util.NucleusLogger;
 
 /**
  * Field Manager for retrieving values from MongoDB.
@@ -189,6 +188,13 @@
                     // Embedded collection element
                     embedded = true;
                 }
+                else if (mmd.hasMap() && 
+                        ((mmd.getKeyMetaData() != null && mmd.getKeyMetaData().getEmbeddedMetaData() != null) || 
+                        (mmd.getValueMetaData() != null && mmd.getValueMetaData().getEmbeddedMetaData() != null)))
+                {
+                    // Embedded map key/value
+                    embedded = true;
+                }
             }
         }
 
@@ -302,6 +308,7 @@
                         DBObject elementObj = (DBObject)collIter.next();
                         ObjectProvider embSM = ec.newObjectProviderForMember(mmd, elemCmd);
                         embSM.addEmbeddedOwner(sm, fieldNumber);
+                        embSM.setPcObjectType(ObjectProvider.EMBEDDED_COLLECTION_ELEMENT_PC);
                         FetchFieldManager ffm = new FetchFieldManager(embSM, elementObj, elemCmd);
                         ffm.ownerMmd = mmd;
                         ffm.embedded = true;
@@ -331,6 +338,7 @@
                         DBObject elementObj = (DBObject)Array.get(value, i);
                         ObjectProvider embSM = ec.newObjectProviderForMember(mmd, elemCmd);
                         embSM.addEmbeddedOwner(sm, fieldNumber);
+                        embSM.setPcObjectType(ObjectProvider.EMBEDDED_COLLECTION_ELEMENT_PC);
                         FetchFieldManager ffm = new FetchFieldManager(embSM, elementObj, elemCmd);
                         ffm.ownerMmd = mmd;
                         ffm.embedded = true;
@@ -376,6 +384,7 @@
                             DBObject keyDbObj = (DBObject)keyObj;
                             ObjectProvider embSM = ec.newObjectProviderForMember(mmd, keyCmd);
                             embSM.addEmbeddedOwner(sm, fieldNumber);
+                            embSM.setPcObjectType(ObjectProvider.EMBEDDED_MAP_KEY_PC);
                             FetchFieldManager ffm = new FetchFieldManager(embSM, keyDbObj, keyCmd);
                             ffm.ownerMmd = mmd;
                             ffm.embedded = true;
@@ -394,6 +403,7 @@
                             DBObject valDbObj = (DBObject)valObj;
                             ObjectProvider embSM = ec.newObjectProviderForMember(mmd, valCmd);
                             embSM.addEmbeddedOwner(sm, fieldNumber);
+                            embSM.setPcObjectType(ObjectProvider.EMBEDDED_MAP_VALUE_PC);
                             FetchFieldManager ffm = new FetchFieldManager(embSM, valDbObj, valCmd);
                             ffm.ownerMmd = mmd;
                             ffm.embedded = true;
@@ -405,9 +415,13 @@
                             mapVal = getMapValueForReturnValue(mmd, valObj);
                         }
 
-                        NucleusLogger.GENERAL.info(">> FetchFM entry key=" + mapKey + " val=" + mapVal);
                         map.put(mapKey, mapVal);
                     }
+
+                    if (sm != null)
+                    {
+                        return sm.wrapSCOField(fieldNumber, map, false, false, true);
+                    }
                     return map;
                 }
             }
@@ -520,7 +534,7 @@
                 {
                     mapVal = getMapValueForReturnValue(mmd, valueObj);
                 }
-NucleusLogger.GENERAL.info(">> FetchFM entry key=" + mapKey + " val=" + mapVal);
+
                 map.put(mapKey, mapVal);
             }
 

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2011-02-13 19:44:22 UTC (rev 12176)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2011-02-13 19:45:28 UTC (rev 12177)
@@ -39,7 +39,6 @@
 import org.datanucleus.store.mongodb.MongoDBUtils;
 import org.datanucleus.store.types.ObjectLongConverter;
 import org.datanucleus.store.types.ObjectStringConverter;
-import org.datanucleus.util.NucleusLogger;
 
 /**
  * Field Manager for putting values into MongoDB.
@@ -175,6 +174,13 @@
                     // Embedded array element
                     embedded = true;
                 }
+                else if (mmd.hasMap() && 
+                        ((mmd.getKeyMetaData() != null && mmd.getKeyMetaData().getEmbeddedMetaData() != null) || 
+                        (mmd.getValueMetaData() != null && mmd.getValueMetaData().getEmbeddedMetaData() != null)))
+                {
+                    // Embedded map key/value
+                    embedded = true;
+                }
             }
         }
 
@@ -272,6 +278,7 @@
                         Object element = collIter.next();
                         ObjectProvider embSM = ec.findObjectProviderForEmbedded(element, sm, mmd);
                         embSM.addEmbeddedOwner(sm, fieldNumber);
+                        embSM.setPcObjectType(ObjectProvider.EMBEDDED_COLLECTION_ELEMENT_PC);
                         BasicDBObject embeddedObject = new BasicDBObject();
                         StoreFieldManager sfm = new StoreFieldManager(embSM, embeddedObject, embcmd);
                         sfm.ownerMmd = mmd;
@@ -290,6 +297,7 @@
                         Object element = Array.get(value, i);
                         ObjectProvider embSM = ec.findObjectProviderForEmbedded(element, sm, mmd);
                         embSM.addEmbeddedOwner(sm, fieldNumber);
+                        embSM.setPcObjectType(ObjectProvider.EMBEDDED_COLLECTION_ELEMENT_PC);
                         BasicDBObject embeddedObject = new BasicDBObject();
                         StoreFieldManager sfm = new StoreFieldManager(embSM, embeddedObject, embcmd);
                         sfm.ownerMmd = mmd;
@@ -303,8 +311,6 @@
                 {
                     AbstractClassMetaData keyCmd = mmd.getMap().getKeyClassMetaData(clr, ec.getMetaDataManager());
                     AbstractClassMetaData valCmd = mmd.getMap().getValueClassMetaData(clr, ec.getMetaDataManager());
-                    NucleusLogger.DATASTORE_PERSIST.debug(">> embedded map at " + mmd.getFullFieldName() +
-                        " key=" + mmd.getMap().getKeyType() + " val=" + mmd.getMap().getValueType());
 
                     Collection entryList = new ArrayList();
                     Map valueMap = (Map)value;
@@ -314,7 +320,6 @@
                         Map.Entry entry = mapEntryIter.next();
                         BasicDBObject entryObj = new BasicDBObject();
 
-                        NucleusLogger.DATASTORE_PERSIST.debug(">> entry key=" + entry.getKey() + " val=" + entry.getValue());
                         if (keyCmd == null)
                         {
                             processContainerNonRelationField("key", ec, entry.getKey(), entryObj);
@@ -323,6 +328,7 @@
                         {
                             ObjectProvider embSM = ec.findObjectProviderForEmbedded(entry.getKey(), sm, mmd);
                             embSM.addEmbeddedOwner(sm, fieldNumber);
+                            embSM.setPcObjectType(ObjectProvider.EMBEDDED_MAP_KEY_PC);
                             BasicDBObject embeddedKey = new BasicDBObject();
                             StoreFieldManager sfm = new StoreFieldManager(embSM, embeddedKey, keyCmd);
                             sfm.ownerMmd = mmd;
@@ -338,6 +344,7 @@
                         {
                             ObjectProvider embSM = ec.findObjectProviderForEmbedded(entry.getValue(), sm, mmd);
                             embSM.addEmbeddedOwner(sm, fieldNumber);
+                            embSM.setPcObjectType(ObjectProvider.EMBEDDED_MAP_VALUE_PC);
                             BasicDBObject embeddedVal = new BasicDBObject();
                             StoreFieldManager sfm = new StoreFieldManager(embSM, embeddedVal, valCmd);
                             sfm.ownerMmd = mmd;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12218
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=12218&view=rev
Author:   andy_jefferson
Date:     2011-02-16 08:35:06 +0000 (Wed, 16 Feb 2011)

Log Message:
-----------
[NUCMONGODB-6] Add optimistic version checks

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-15 19:59:50 UTC (rev 12217)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-02-16 08:35:06 UTC (rev 12218)
@@ -28,6 +28,7 @@
 import org.bson.types.ObjectId;
 import org.datanucleus.exceptions.NucleusDataStoreException;
 import org.datanucleus.exceptions.NucleusObjectNotFoundException;
+import org.datanucleus.exceptions.NucleusOptimisticException;
 import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.identity.OID;
 import org.datanucleus.metadata.AbstractClassMetaData;
@@ -208,6 +209,7 @@
             StoreFieldManager fieldManager = new StoreFieldManager(sm, dbObject, cmd);
             sm.provideFields(cmd.getAllMemberPositions(), fieldManager);
             collection.insert(dbObject);
+            NucleusLogger.DATASTORE_PERSIST.debug("Persisting object as " + dbObject);
 
             if (NucleusLogger.DATASTORE_PERSIST.isDebugEnabled())
             {
@@ -305,10 +307,18 @@
             }
 
             DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(cmd));
-            DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, sm);
+            DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, sm, true);
             if (dbObject == null)
             {
-                throw new NucleusDataStoreException("Could not find object with id " + sm.getObjectId());
+                if (cmd.hasVersionStrategy())
+                {
+                    throw new NucleusOptimisticException("Object with id " + sm.getObjectId() + 
+                        " and version " + sm.getTransactionalVersion() + " no longer present");
+                }
+                else
+                {
+                    throw new NucleusDataStoreException("Could not find object with id " + sm.getObjectId());
+                }
             }
 
             if (cmd.hasVersionStrategy())
@@ -373,10 +383,18 @@
             }
 
             DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(cmd));
-            DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, sm);
+            DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, sm, true);
             if (dbObject == null)
             {
-                throw new NucleusDataStoreException("Could not find object with id " + sm.getObjectId());
+                if (cmd.hasVersionStrategy())
+                {
+                    throw new NucleusOptimisticException("Object with id " + sm.getObjectId() + 
+                        " and version " + sm.getTransactionalVersion() + " no longer present");
+                }
+                else
+                {
+                    throw new NucleusDataStoreException("Could not find object with id " + sm.getObjectId());
+                }
             }
             collection.remove(dbObject);
 
@@ -431,7 +449,7 @@
             }
 
             DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(cmd));
-            DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, sm);
+            DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, sm, false);
             if (dbObject == null)
             {
                 throw new NucleusDataStoreException("Could not find object with id " + sm.getObjectId());
@@ -492,7 +510,7 @@
             {
                 DB db = (DB)mconn.getConnection();
                 DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(cmd));
-                DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, sm);
+                DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, sm, false);
                 if (dbObject == null)
                 {
                     throw new NucleusObjectNotFoundException();

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-15 19:59:50 UTC (rev 12217)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-16 08:35:06 UTC (rev 12218)
@@ -191,12 +191,22 @@
         return columnName;
     }
 
-    public static DBObject getObjectForObjectProvider(DBCollection dbCollection, ObjectProvider sm)
+    /**
+     * Method to return the DBObject that equates to the provided object.
+     * @param dbCollection The collection in which it is stored
+     * @param sm The ObjectProvider
+     * @param checkVersion Whether to also check for a particular version
+     * @return The object (or null if not found)
+     */
+    public static DBObject getObjectForObjectProvider(DBCollection dbCollection, ObjectProvider sm, boolean checkVersion)
     {
+        // Build query object to use as template for the find
+        BasicDBObject query = new BasicDBObject();
         AbstractClassMetaData cmd = sm.getClassMetaData();
+
         if (cmd.getIdentityType() == IdentityType.APPLICATION)
         {
-            BasicDBObject query = new BasicDBObject();
+            // Add PK field(s) to the query object
             int[] pkPositions = cmd.getPKMemberPositions();
             for (int i=0;i<pkPositions.length;i++)
             {
@@ -209,28 +219,10 @@
                 }
                 query.put(MongoDBUtils.getFieldName(pkMmd), value);
             }
-            if (cmd.hasDiscriminatorStrategy())
-            {
-                query.put(MongoDBUtils.getFieldName(cmd.getDiscriminatorMetaData()), cmd.getDiscriminatorValue());
-            }
-
-            DBCursor curs = dbCollection.find(query);
-            try
-            {
-                if (!curs.hasNext())
-                {
-                    return null;
-                }
-                return curs.next();
-            }
-            finally
-            {
-                curs.close();
-            }
         }
         else if (cmd.getIdentityType() == IdentityType.DATASTORE)
         {
-            BasicDBObject query = new BasicDBObject();
+            // Add PK field to the query object
             OID oid = (OID) sm.getObjectId();
             if (oid == null && cmd.getIdentityMetaData().getValueStrategy() == IdentityStrategy.IDENTITY)
             {
@@ -246,30 +238,40 @@
             {
                 query.put(MongoDBUtils.getFieldName(cmd.getIdentityMetaData()), value);
             }
-            if (cmd.hasDiscriminatorStrategy())
-            {
-                query.put(MongoDBUtils.getFieldName(cmd.getDiscriminatorMetaData()), cmd.getDiscriminatorValue());
-            }
+        }
+        else
+        {
+            // TODO Support nondurable identity
+            return null;
+        }
 
-            DBCursor curs = dbCollection.find(query);
-            try
+        if (cmd.hasDiscriminatorStrategy())
+        {
+            // Add discriminator to the query object
+            query.put(MongoDBUtils.getFieldName(cmd.getDiscriminatorMetaData()), cmd.getDiscriminatorValue());
+        }
+        if (checkVersion && cmd.hasVersionStrategy())
+        {
+            // Add version to the query object
+            Object currentVersion = sm.getTransactionalVersion();
+            VersionMetaData vermd = cmd.getVersionMetaData();
+            if (vermd.getFieldName() != null)
             {
-                if (!curs.hasNext())
-                {
-                    return null;
-                }
-                return curs.next();
+                // Version field in class
+                AbstractMemberMetaData verMmd = cmd.getMetaDataForMember(cmd.getVersionMetaData().getFieldName());
+                String fieldName = MongoDBUtils.getFieldName(verMmd);
+                query.put(fieldName, currentVersion);
             }
-            finally
+            else
             {
-                curs.close();
+                // Surrogate version field
+                String fieldName = MongoDBUtils.getFieldName(cmd.getVersionMetaData());
+                query.put(fieldName, currentVersion);
             }
         }
-        else
-        {
-            // TODO Support nondurable identity
-            return null;
-        }
+
+        NucleusLogger.DATASTORE_RETRIEVE.debug("Retrieving object for " + query);
+        return dbCollection.findOne(query);
     }
 
     /**


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 12353
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=12353&view=rev
Author:   andy_jefferson
Date:     2011-02-24 19:11:46 +0000 (Thu, 24 Feb 2011)

Log Message:
-----------
[NUCMONGODB-28] Support for query of interfaces

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-24 19:11:27 UTC (rev 12352)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-02-24 19:11:46 UTC (rev 12353)
@@ -24,6 +24,7 @@
 
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.FetchPlan;
+import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.identity.IdentityUtils;
 import org.datanucleus.identity.OID;
 import org.datanucleus.identity.OIDFactory;
@@ -292,23 +293,67 @@
     {
         ClassLoaderResolver clr = ec.getClassLoaderResolver();
 
-        AbstractClassMetaData cmd = ec.getMetaDataManager().getMetaDataForClass(candidateClass, clr);
-        List results = getObjectsOfType(cmd, db, ec, ignoreCache, fp, filterObject, options);
+        List<AbstractClassMetaData> cmds = new ArrayList();
+        if (candidateClass.isInterface())
+        {
+            // Query of interface(+subclasses)
+            AbstractClassMetaData icmd = ec.getMetaDataManager().getMetaDataForInterface(candidateClass, clr);
+            if (icmd == null)
+            {
+                throw new NucleusUserException("Attempting to query an interface yet it is not declared 'persistent'." +
+                    " Define the interface in metadata as being persistent to perform this operation, and make sure" +
+                    " any implementations use the same identity and identity member(s)");
+            }
 
-        if (subclasses)
+            String[] impls = ec.getMetaDataManager().getClassesImplementingInterface(candidateClass.getName(), clr);
+            for (int i=0;i<impls.length;i++)
+            {
+                AbstractClassMetaData implCmd = ec.getMetaDataManager().getMetaDataForClass(impls[i], clr);
+                cmds.add(implCmd);
+                if (subclasses)
+                {
+                    String[] subclassNames = 
+                        ec.getMetaDataManager().getSubclassesForClass(implCmd.getFullClassName(), true);
+                    if (subclassNames != null && subclassNames.length > 0)
+                    {
+                        for (int j=0;j<subclassNames.length;j++)
+                        {
+                            AbstractClassMetaData subcmd = 
+                                ec.getMetaDataManager().getMetaDataForClass(subclassNames[j], clr);
+                            cmds.add(subcmd);
+                        }
+                    }
+                }
+            }
+        }
+        else
         {
-            // TODO Cater for inheritance here - maybe they persist all into the same table, with discriminator?
-            String[] subclassNames = ec.getMetaDataManager().getSubclassesForClass(candidateClass.getName(), true);
-            if (subclassNames != null && subclassNames.length > 0)
+            // Query of candidate(+subclasses)
+            AbstractClassMetaData cmd = ec.getMetaDataManager().getMetaDataForClass(candidateClass, clr);
+            cmds.add(cmd);
+            if (subclasses)
             {
-                for (int i=0;i<subclassNames.length;i++)
+                String[] subclassNames = ec.getMetaDataManager().getSubclassesForClass(candidateClass.getName(), true);
+                if (subclassNames != null && subclassNames.length > 0)
                 {
-                    AbstractClassMetaData subcmd = ec.getMetaDataManager().getMetaDataForClass(subclassNames[i], clr);
-                    results.addAll(getObjectsOfType(subcmd, db, ec, ignoreCache, fp, filterObject, options));
+                    for (int j=0;j<subclassNames.length;j++)
+                    {
+                        AbstractClassMetaData subcmd = 
+                            ec.getMetaDataManager().getMetaDataForClass(subclassNames[j], clr);
+                        cmds.add(subcmd);
+                    }
                 }
             }
         }
 
+        Iterator<AbstractClassMetaData> cmdIter = cmds.iterator();
+        List results = new ArrayList();
+        while (cmdIter.hasNext())
+        {
+            AbstractClassMetaData acmd = cmdIter.next();
+            results.addAll(getObjectsOfType(acmd, db, ec, ignoreCache, fp, filterObject, options));
+        }
+
         return results;
     }
 

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java	2011-02-24 19:11:27 UTC (rev 12352)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java	2011-02-24 19:11:46 UTC (rev 12353)
@@ -171,7 +171,27 @@
 
         // Make sure any persistence info is loaded
         ec.hasPersistenceInformationForClass(candidateClass);
-        AbstractClassMetaData cmd = getObjectManager().getMetaDataManager().getMetaDataForClass(candidateClass, clr);
+        AbstractClassMetaData cmd = ec.getMetaDataManager().getMetaDataForClass(candidateClass, clr);
+        if (candidateClass.isInterface())
+        {
+            // Query of interface
+            String[] impls = ec.getMetaDataManager().getClassesImplementingInterface(candidateClass.getName(), clr);
+            if (impls.length == 1 && cmd.isImplementationOfPersistentDefinition())
+            {
+                // Only the generated implementation, so just use its metadata
+            }
+            else
+            {
+                // Use metadata for the persistent interface
+                cmd = ec.getMetaDataManager().getMetaDataForInterface(candidateClass, clr);
+                if (cmd == null)
+                {
+                    throw new NucleusUserException("Attempting to query an interface yet it is not declared 'persistent'." +
+                        " Define the interface in metadata as being persistent to perform this operation, and make sure" +
+                    " any implementations use the same identity and identity member(s)");
+                }
+            }
+        }
 
         QueryManager qm = getQueryManager();
         StoreManager storeMgr = ec.getStoreManager();

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java	2011-02-24 19:11:27 UTC (rev 12352)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java	2011-02-24 19:11:46 UTC (rev 12353)
@@ -172,7 +172,7 @@
 
         // Make sure any persistence info is loaded
         ec.hasPersistenceInformationForClass(candidateClass);
-        AbstractClassMetaData cmd = getObjectManager().getMetaDataManager().getMetaDataForClass(candidateClass, clr);
+        AbstractClassMetaData cmd = ec.getMetaDataManager().getMetaDataForClass(candidateClass, clr);
 
         QueryManager qm = getQueryManager();
         StoreManager storeMgr = ec.getStoreManager();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13230
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=13230&view=rev
Author:   andy_jefferson
Date:     2011-07-05 07:13:34 +0000 (Tue, 05 Jul 2011)

Log Message:
-----------
[NUCMONGODB-45] Use _id

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-07-04 19:26:54 UTC (rev 13229)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-07-05 07:13:34 UTC (rev 13230)
@@ -384,6 +384,7 @@
             }
         }
 
+        // TODO If using IDENTITY on a field really should omit it from the put since not using it
         StoreFieldManager fieldManager = new StoreFieldManager(op, dbObject, cmd);
         op.provideFields(cmd.getAllMemberPositions(), fieldManager);
 

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java	2011-07-04 19:26:54 UTC (rev 13229)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java	2011-07-05 07:13:34 UTC (rev 13230)
@@ -235,18 +235,27 @@
                 // Add unique index on PK
                 BasicDBObject query = new BasicDBObject();
                 int[] pkFieldNumbers = cmd.getPKMemberPositions();
+                boolean applyIndex = true;
                 for (int i=0;i<pkFieldNumbers.length;i++)
                 {
                     AbstractMemberMetaData pkMmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(pkFieldNumbers[i]);
+                    if (pkMmd.getValueStrategy() == IdentityStrategy.IDENTITY)
+                    {
+                        applyIndex = false;
+                        break;
+                    }
                     query.append(MongoDBUtils.getFieldName(pkMmd), 1);
                 }
-                String pkName = (cmd.getPrimaryKeyMetaData() != null ? cmd.getPrimaryKeyMetaData().getName() : cmd.getName() + "_PK");
-                if (NucleusLogger.DATASTORE_SCHEMA.isDebugEnabled())
+                if (applyIndex)
                 {
-                    NucleusLogger.DATASTORE_SCHEMA.debug(LOCALISER.msg("MongoDB.SchemaCreate.Class.Index",
-                        pkName, MongoDBUtils.getCollectionName(cmd), query));
+                    String pkName = (cmd.getPrimaryKeyMetaData() != null ? cmd.getPrimaryKeyMetaData().getName() : cmd.getName() + "_PK");
+                    if (NucleusLogger.DATASTORE_SCHEMA.isDebugEnabled())
+                    {
+                        NucleusLogger.DATASTORE_SCHEMA.debug(LOCALISER.msg("MongoDB.SchemaCreate.Class.Index",
+                            pkName, MongoDBUtils.getCollectionName(cmd), query));
+                    }
+                    collection.ensureIndex(query, pkName, true);
                 }
-                collection.ensureIndex(query, pkName, true);
             }
             else if (cmd.getIdentityType() == IdentityType.DATASTORE)
             {

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-07-04 19:26:54 UTC (rev 13229)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-07-05 07:13:34 UTC (rev 13230)
@@ -22,6 +22,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.bson.types.ObjectId;
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.FetchPlan;
 import org.datanucleus.identity.IdentityUtils;
@@ -218,7 +219,14 @@
                     // PK field not yet set, so return null (needs to be attributed in the datastore)
                     return null;
                 }
-                query.put(MongoDBUtils.getFieldName(pkMmd), value);
+                if (pkMmd.getValueStrategy() == IdentityStrategy.IDENTITY)
+                {
+                    query.put("_id", new ObjectId((String)value));
+                }
+                else
+                {
+                    query.put(MongoDBUtils.getFieldName(pkMmd), value);
+                }
             }
         }
         else if (cmd.getIdentityType() == IdentityType.DATASTORE)

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2011-07-04 19:26:54 UTC (rev 13229)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2011-07-05 07:13:34 UTC (rev 13230)
@@ -36,6 +36,7 @@
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.EmbeddedMetaData;
+import org.datanucleus.metadata.IdentityStrategy;
 import org.datanucleus.metadata.Relation;
 import org.datanucleus.store.ExecutionContext;
 import org.datanucleus.store.ObjectProvider;
@@ -142,10 +143,17 @@
     @Override
     public String fetchStringField(int fieldNumber)
     {
+        AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+        if (mmd.getValueStrategy() == IdentityStrategy.IDENTITY)
+        {
+            // Return the "_id" value since not using this field as such
+            Object id = dbObject.get("_id");
+            return (String)(id.toString());
+        }
         String fieldName = getFieldName(fieldNumber);
         if (dbObject.containsField(fieldName))
         {
-            return (String)dbObject.get(fieldName);
+            return (String)(dbObject.get(fieldName));
         }
         else
         {

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2011-07-04 19:26:54 UTC (rev 13229)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2011-07-05 07:13:34 UTC (rev 13230)
@@ -37,6 +37,7 @@
 import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
+import org.datanucleus.metadata.IdentityStrategy;
 import org.datanucleus.metadata.Relation;
 import org.datanucleus.store.ExecutionContext;
 import org.datanucleus.store.ObjectProvider;
@@ -128,6 +129,13 @@
     @Override
     public void storeStringField(int fieldNumber, String value)
     {
+        AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+        if (mmd.getValueStrategy() == IdentityStrategy.IDENTITY)
+        {
+            // Using "_id" to represent this field so don't put it
+            return;
+        }
+
         String fieldName = getFieldName(fieldNumber);
         if (value == null)
         {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13358
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=13358&view=rev
Author:   andy_jefferson
Date:     2011-07-26 06:40:49 +0000 (Tue, 26 Jul 2011)

Log Message:
-----------
[NUCMONGODB-51] Support "insertable"/"updateable"

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-07-26 06:40:05 UTC (rev 13357)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2011-07-26 06:40:49 UTC (rev 13358)
@@ -368,7 +368,7 @@
         }
 
         // TODO If using IDENTITY on a field really should omit it from the put since not using it
-        StoreFieldManager fieldManager = new StoreFieldManager(op, dbObject, cmd);
+        StoreFieldManager fieldManager = new StoreFieldManager(op, dbObject, cmd, true);
         op.provideFields(cmd.getAllMemberPositions(), fieldManager);
 
         return dbObject;
@@ -438,7 +438,7 @@
                 }
             }
 
-            StoreFieldManager fieldManager = new StoreFieldManager(op, dbObject, cmd);
+            StoreFieldManager fieldManager = new StoreFieldManager(op, dbObject, cmd, false);
             op.provideFields(cmd.getAllMemberPositions(), fieldManager);
             collection.save(dbObject);
 

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java	2011-07-26 06:40:05 UTC (rev 13357)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java	2011-07-26 06:40:49 UTC (rev 13358)
@@ -38,9 +38,9 @@
 {
     private final AbstractMemberMetaData ownerMmd;
 
-    public StoreEmbeddedFieldManager(ObjectProvider sm, DBObject dbObject, AbstractMemberMetaData ownerMmd)
+    public StoreEmbeddedFieldManager(ObjectProvider sm, DBObject dbObject, AbstractMemberMetaData ownerMmd, boolean insert)
     {
-        super(sm, dbObject, null);
+        super(sm, dbObject, null, insert);
         this.ownerMmd = ownerMmd;
     }
 
@@ -53,6 +53,11 @@
     public void storeObjectField(int fieldNumber, Object value)
     {
         AbstractMemberMetaData embMmd = ownerMmd.getEmbeddedMetaData().getMemberMetaData()[fieldNumber];
+        if (!isStorable(embMmd))
+        {
+            return;
+        }
+
         ExecutionContext ec = sm.getExecutionContext();
         ClassLoaderResolver clr = ec.getClassLoaderResolver();
         int relationType = embMmd.getRelationType(clr);
@@ -84,7 +89,7 @@
 
             // Process all fields of the embedded object
             ObjectProvider embSM = ec.findObjectProviderForEmbedded(value, sm, embMmd);
-            FieldManager ffm = new StoreEmbeddedFieldManager(embSM, dbObject, embMmd);
+            FieldManager ffm = new StoreEmbeddedFieldManager(embSM, dbObject, embMmd, insert);
             embSM.provideFields(embcmd.getAllMemberPositions(), ffm);
             return;
         }

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2011-07-26 06:40:05 UTC (rev 13357)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2011-07-26 06:40:49 UTC (rev 13358)
@@ -61,17 +61,42 @@
     /** Metadata of the owner field if this is for an embedded object. */
     protected AbstractMemberMetaData ownerMmd = null;
 
-    public StoreFieldManager(ObjectProvider sm, DBObject dbObject, AbstractClassMetaData cmd)
+    protected boolean insert;
+
+    public StoreFieldManager(ObjectProvider sm, DBObject dbObject, AbstractClassMetaData cmd, boolean insert)
     {
         super();
         this.sm = sm;
         this.dbObject = dbObject;
         this.cmd = cmd;
+        this.insert = insert;
     }
 
+    protected boolean isStorable(int fieldNumber)
+    {
+        AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+        return isStorable(mmd);
+    }
+
+    protected boolean isStorable(AbstractMemberMetaData mmd)
+    {
+        if ((insert && mmd.isInsertable()) || (!insert && mmd.isUpdateable()))
+        {
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
     @Override
     public void storeBooleanField(int fieldNumber, boolean value)
     {
+        if (!isStorable(fieldNumber))
+        {
+            return;
+        }
         String fieldName = getFieldName(fieldNumber);
         dbObject.put(fieldName, Boolean.valueOf(value));
     }
@@ -80,6 +105,10 @@
     @Override
     public void storeCharField(int fieldNumber, char value)
     {
+        if (!isStorable(fieldNumber))
+        {
+            return;
+        }
         String fieldName = getFieldName(fieldNumber);
         dbObject.put(fieldName, Character.valueOf(value));
     }
@@ -87,6 +116,10 @@
     @Override
     public void storeByteField(int fieldNumber, byte value)
     {
+        if (!isStorable(fieldNumber))
+        {
+            return;
+        }
         String fieldName = getFieldName(fieldNumber);
         dbObject.put(fieldName, Byte.valueOf(value));
     }
@@ -94,6 +127,10 @@
     @Override
     public void storeShortField(int fieldNumber, short value)
     {
+        if (!isStorable(fieldNumber))
+        {
+            return;
+        }
         String fieldName = getFieldName(fieldNumber);
         dbObject.put(fieldName, Short.valueOf(value));
     }
@@ -101,6 +138,10 @@
     @Override
     public void storeIntField(int fieldNumber, int value)
     {
+        if (!isStorable(fieldNumber))
+        {
+            return;
+        }
         String fieldName = getFieldName(fieldNumber);
         dbObject.put(fieldName, Integer.valueOf(value));
     }
@@ -108,6 +149,10 @@
     @Override
     public void storeLongField(int fieldNumber, long value)
     {
+        if (!isStorable(fieldNumber))
+        {
+            return;
+        }
         String fieldName = getFieldName(fieldNumber);
         dbObject.put(fieldName, Long.valueOf(value));
     }
@@ -115,6 +160,10 @@
     @Override
     public void storeFloatField(int fieldNumber, float value)
     {
+        if (!isStorable(fieldNumber))
+        {
+            return;
+        }
         String fieldName = getFieldName(fieldNumber);
         dbObject.put(fieldName, Float.valueOf(value));
     }
@@ -122,6 +171,10 @@
     @Override
     public void storeDoubleField(int fieldNumber, double value)
     {
+        if (!isStorable(fieldNumber))
+        {
+            return;
+        }
         String fieldName = getFieldName(fieldNumber);
         dbObject.put(fieldName, Double.valueOf(value));
     }
@@ -130,6 +183,11 @@
     public void storeStringField(int fieldNumber, String value)
     {
         AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+        if (!isStorable(mmd))
+        {
+            return;
+        }
+
         if (mmd.getValueStrategy() == IdentityStrategy.IDENTITY)
         {
             // Using "_id" to represent this field so don't put it
@@ -155,6 +213,11 @@
     public void storeObjectField(int fieldNumber, Object value)
     {
         AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+        if (!isStorable(mmd))
+        {
+            return;
+        }
+
         String fieldName = MongoDBUtils.getFieldName(mmd);
         ExecutionContext ec = sm.getExecutionContext();
         ClassLoaderResolver clr = ec.getClassLoaderResolver();
@@ -246,7 +309,7 @@
                 {
                     // Nested embedding, as nested document
                     BasicDBObject embeddedObject = new BasicDBObject();
-                    StoreFieldManager sfm = new StoreFieldManager(embSM, embeddedObject, embcmd);
+                    StoreFieldManager sfm = new StoreFieldManager(embSM, embeddedObject, embcmd, insert);
                     sfm.ownerMmd = mmd;
                     embSM.provideFields(embcmd.getAllMemberPositions(), sfm);
                     dbObject.put(fieldName, embeddedObject);
@@ -255,7 +318,7 @@
                 else
                 {
                     // Flat embedding as fields of the owning document
-                    FieldManager ffm = new StoreEmbeddedFieldManager(embSM, dbObject, mmd);
+                    FieldManager ffm = new StoreEmbeddedFieldManager(embSM, dbObject, mmd, insert);
                     embSM.provideFields(embcmd.getAllMemberPositions(), ffm);
                     return;
                 }
@@ -291,7 +354,7 @@
                         ObjectProvider embSM = ec.findObjectProviderForEmbedded(element, sm, mmd);
                         embSM.setPcObjectType(ObjectProvider.EMBEDDED_COLLECTION_ELEMENT_PC);
                         BasicDBObject embeddedObject = new BasicDBObject();
-                        StoreFieldManager sfm = new StoreFieldManager(embSM, embeddedObject, embcmd);
+                        StoreFieldManager sfm = new StoreFieldManager(embSM, embeddedObject, embcmd, insert);
                         sfm.ownerMmd = mmd;
                         embSM.provideFields(embcmd.getAllMemberPositions(), sfm);
                         coll.add(embeddedObject);
@@ -309,7 +372,7 @@
                         ObjectProvider embSM = ec.findObjectProviderForEmbedded(element, sm, mmd);
                         embSM.setPcObjectType(ObjectProvider.EMBEDDED_COLLECTION_ELEMENT_PC);
                         BasicDBObject embeddedObject = new BasicDBObject();
-                        StoreFieldManager sfm = new StoreFieldManager(embSM, embeddedObject, embcmd);
+                        StoreFieldManager sfm = new StoreFieldManager(embSM, embeddedObject, embcmd, insert);
                         sfm.ownerMmd = mmd;
                         embSM.provideFields(embcmd.getAllMemberPositions(), sfm);
                         array[i] = embeddedObject;
@@ -339,7 +402,7 @@
                             ObjectProvider embSM = ec.findObjectProviderForEmbedded(entry.getKey(), sm, mmd);
                             embSM.setPcObjectType(ObjectProvider.EMBEDDED_MAP_KEY_PC);
                             BasicDBObject embeddedKey = new BasicDBObject();
-                            StoreFieldManager sfm = new StoreFieldManager(embSM, embeddedKey, keyCmd);
+                            StoreFieldManager sfm = new StoreFieldManager(embSM, embeddedKey, keyCmd, insert);
                             sfm.ownerMmd = mmd;
                             embSM.provideFields(keyCmd.getAllMemberPositions(), sfm);
                             entryObj.append("key", embeddedKey);
@@ -354,7 +417,7 @@
                             ObjectProvider embSM = ec.findObjectProviderForEmbedded(entry.getValue(), sm, mmd);
                             embSM.setPcObjectType(ObjectProvider.EMBEDDED_MAP_VALUE_PC);
                             BasicDBObject embeddedVal = new BasicDBObject();
-                            StoreFieldManager sfm = new StoreFieldManager(embSM, embeddedVal, valCmd);
+                            StoreFieldManager sfm = new StoreFieldManager(embSM, embeddedVal, valCmd, insert);
                             sfm.ownerMmd = mmd;
                             embSM.provideFields(valCmd.getAllMemberPositions(), sfm);
                             entryObj.append("value", embeddedVal);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13528
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=13528&view=rev
Author:   andy_jefferson
Date:     2011-09-05 12:50:06 +0000 (Mon, 05 Sep 2011)
Log Message:
-----------
[NUCMONGODB-55] Support for schema evolution : new fields

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-09-02 18:45:04 UTC (rev 13527)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-09-05 12:50:06 UTC (rev 13528)
@@ -57,6 +57,22 @@
 public class MongoDBUtils
 {
     /**
+     * Accessor for the default value specified for the provided member.
+     * If no defaultValue is provided on the column then returns null.
+     * @param mmd Metadata for the member
+     * @return The default value
+     */
+    public static String getDefaultValueForMember(AbstractMemberMetaData mmd)
+    {
+        ColumnMetaData[] colmds = mmd.getColumnMetaData();
+        if (colmds == null || colmds.length < 1)
+        {
+            return null;
+        }
+        return colmds[0].getDefaultValue();
+    }
+
+    /**
      * Accessor for the MongoDB collection name for this class.
      * Takes the table name if provided, otherwise uses the (short-form) class name
      * @param cmd Metadata for the class

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2011-09-02 18:45:04 UTC (rev 13527)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2011-09-05 12:50:06 UTC (rev 13528)
@@ -89,27 +89,74 @@
     public boolean fetchBooleanField(int fieldNumber)
     {
         String fieldName = getFieldName(fieldNumber);
-        return ((Boolean)dbObject.get(fieldName)).booleanValue();
+        if (!dbObject.containsField(fieldName))
+        {
+            AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+            String dflt = MongoDBUtils.getDefaultValueForMember(mmd);
+            if (dflt != null)
+            {
+                return Boolean.valueOf(dflt);
+            }
+            return false;
+        }
+
+        Object value = dbObject.get(fieldName);
+        return ((Boolean)value).booleanValue();
     }
 
     @Override
     public byte fetchByteField(int fieldNumber)
     {
         String fieldName = getFieldName(fieldNumber);
-        return ((Byte)dbObject.get(fieldName)).byteValue();
+        if (!dbObject.containsField(fieldName))
+        {
+            AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+            String dflt = MongoDBUtils.getDefaultValueForMember(mmd);
+            if (dflt != null)
+            {
+                return Byte.valueOf(dflt);
+            }
+            return 0;
+        }
+
+        Object value = dbObject.get(fieldName);
+        return ((Byte)value).byteValue();
     }
 
     @Override
     public char fetchCharField(int fieldNumber)
     {
         String fieldName = getFieldName(fieldNumber);
-        return ((Character)dbObject.get(fieldName)).charValue();
+        if (!dbObject.containsField(fieldName))
+        {
+            AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+            String dflt = MongoDBUtils.getDefaultValueForMember(mmd);
+            if (dflt != null && dflt.length() > 0)
+            {
+                return dflt.charAt(0);
+            }
+            return 0;
+        }
+
+        Object value = dbObject.get(fieldName);
+        return ((Character)value).charValue();
     }
 
     @Override
     public double fetchDoubleField(int fieldNumber)
     {
         String fieldName = getFieldName(fieldNumber);
+        if (!dbObject.containsField(fieldName))
+        {
+            AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+            String dflt = MongoDBUtils.getDefaultValueForMember(mmd);
+            if (dflt != null)
+            {
+                return Double.valueOf(dflt);
+            }
+            return 0;
+        }
+
         Object value = dbObject.get(fieldName);
         if (value instanceof Float)
         {
@@ -133,6 +180,17 @@
     public float fetchFloatField(int fieldNumber)
     {
         String fieldName = getFieldName(fieldNumber);
+        if (!dbObject.containsField(fieldName))
+        {
+            AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+            String dflt = MongoDBUtils.getDefaultValueForMember(mmd);
+            if (dflt != null)
+            {
+                return Float.valueOf(dflt);
+            }
+            return 0;
+        }
+
         Object value = dbObject.get(fieldName);
         if (value instanceof Double)
         {
@@ -156,6 +214,17 @@
     public int fetchIntField(int fieldNumber)
     {
         String fieldName = getFieldName(fieldNumber);
+        if (!dbObject.containsField(fieldName))
+        {
+            AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+            String dflt = MongoDBUtils.getDefaultValueForMember(mmd);
+            if (dflt != null)
+            {
+                return Integer.valueOf(dflt);
+            }
+            return 0;
+        }
+
         Object value = dbObject.get(fieldName);
         if (value instanceof Short)
         {
@@ -183,6 +252,17 @@
     public long fetchLongField(int fieldNumber)
     {
         String fieldName = getFieldName(fieldNumber);
+        if (!dbObject.containsField(fieldName))
+        {
+            AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+            String dflt = MongoDBUtils.getDefaultValueForMember(mmd);
+            if (dflt != null)
+            {
+                return Long.valueOf(dflt);
+            }
+            return 0;
+        }
+
         Object value = dbObject.get(fieldName);
         if (value instanceof Short)
         {
@@ -210,6 +290,17 @@
     public short fetchShortField(int fieldNumber)
     {
         String fieldName = getFieldName(fieldNumber);
+        if (!dbObject.containsField(fieldName))
+        {
+            AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber);
+            String dflt = MongoDBUtils.getDefaultValueForMember(mmd);
+            if (dflt != null)
+            {
+                return Short.valueOf(dflt);
+            }
+            return 0;
+        }
+
         Object value = dbObject.get(fieldName);
         if (value instanceof Long)
         {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 13729
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=13729&view=rev
Author:   andy_jefferson
Date:     2011-10-24 15:06:20 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
[NUCMONGODB-56] Extra multitenancy check.

Outline support for lazy load candidate retrieval (not yet enabled)

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java

Added Paths:
-----------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/MongoDBCandidateList.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-10-21 16:41:53 UTC (rev 13728)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2011-10-24 15:06:20 UTC (rev 13729)
@@ -228,15 +228,15 @@
     /**
      * Method to return the DBObject that equates to the provided object.
      * @param dbCollection The collection in which it is stored
-     * @param sm The ObjectProvider
+     * @param op The ObjectProvider
      * @param checkVersion Whether to also check for a particular version
      * @return The object (or null if not found)
      */
-    public static DBObject getObjectForObjectProvider(DBCollection dbCollection, ObjectProvider sm, boolean checkVersion)
+    public static DBObject getObjectForObjectProvider(DBCollection dbCollection, ObjectProvider op, boolean checkVersion)
     {
         // Build query object to use as template for the find
         BasicDBObject query = new BasicDBObject();
-        AbstractClassMetaData cmd = sm.getClassMetaData();
+        AbstractClassMetaData cmd = op.getClassMetaData();
 
         if (cmd.getIdentityType() == IdentityType.APPLICATION)
         {
@@ -245,7 +245,7 @@
             for (int i=0;i<pkPositions.length;i++)
             {
                 AbstractMemberMetaData pkMmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(pkPositions[i]);
-                Object value = sm.provideField(pkPositions[i]);
+                Object value = op.provideField(pkPositions[i]);
                 if (value == null && pkMmd.getValueStrategy() == IdentityStrategy.IDENTITY)
                 {
                     // PK field not yet set, so return null (needs to be attributed in the datastore)
@@ -264,7 +264,7 @@
         else if (cmd.getIdentityType() == IdentityType.DATASTORE)
         {
             // Add PK field to the query object
-            OID oid = (OID) sm.getObjectId();
+            OID oid = (OID) op.getObjectId();
             if (oid == null && cmd.getIdentityMetaData().getValueStrategy() == IdentityStrategy.IDENTITY)
             {
                 // Not yet set, so return null (needs to be attributed in the datastore)
@@ -280,11 +280,6 @@
                 query.put(MongoDBUtils.getFieldName(cmd.getIdentityMetaData()), value);
             }
         }
-        else
-        {
-            // TODO Support nondurable identity
-            return null;
-        }
 
         if (cmd.hasDiscriminatorStrategy())
         {
@@ -294,7 +289,7 @@
         if (checkVersion && cmd.isVersioned())
         {
             // Add version to the query object
-            Object currentVersion = sm.getTransactionalVersion();
+            Object currentVersion = op.getTransactionalVersion();
             VersionMetaData vermd = cmd.getVersionMetaDataForClass();
             if (vermd.getFieldName() != null)
             {
@@ -336,120 +331,130 @@
 
         Iterator<AbstractClassMetaData> cmdIter = cmds.iterator();
         List results = new ArrayList();
+        ClassLoaderResolver clr = ec.getClassLoaderResolver();
         while (cmdIter.hasNext())
         {
-            AbstractClassMetaData acmd = cmdIter.next();
-            results.addAll(getObjectsOfType(acmd, db, ec, ignoreCache, fp, filterObject, options));
-        }
-
-        return results;
-    }
-
-    protected static List getObjectsOfType(AbstractClassMetaData cmd, DB db, ExecutionContext ec, boolean ignoreCache,
-            FetchPlan fp, BasicDBObject filterObject, Map<String, Object> options)
-    {
-        List results = new ArrayList();
-
-        ClassLoaderResolver clr = ec.getClassLoaderResolver();
-        fp.manageFetchPlanForClass(cmd);
-        int[] fpMembers = fp.getFetchPlanForClass(cmd).getMemberNumbers();
-        BasicDBObject fieldsSelection = new BasicDBObject();
-        if (fpMembers != null && fpMembers.length > 0)
-        {
-            fieldsSelection = new BasicDBObject();
-            for (int i=0;i<fpMembers.length;i++)
+            AbstractClassMetaData cmd = cmdIter.next();
+            fp.manageFetchPlanForClass(cmd);
+            int[] fpMembers = fp.getFetchPlanForClass(cmd).getMemberNumbers();
+            BasicDBObject fieldsSelection = new BasicDBObject();
+            if (fpMembers != null && fpMembers.length > 0)
             {
-                AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fpMembers[i]);
-                int relationType = mmd.getRelationType(clr);
-                if (mmd.isEmbedded() && Relation.isRelationSingleValued(relationType))
+                fieldsSelection = new BasicDBObject();
+                for (int i=0;i<fpMembers.length;i++)
                 {
-                    boolean nested = true;
-                    String nestedStr = mmd.getValueForExtension("nested");
-                    if (nestedStr != null && nestedStr.equalsIgnoreCase("false"))
+                    AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fpMembers[i]);
+                    int relationType = mmd.getRelationType(clr);
+                    if (mmd.isEmbedded() && Relation.isRelationSingleValued(relationType))
                     {
-                        nested = false;
+                        boolean nested = true;
+                        String nestedStr = mmd.getValueForExtension("nested");
+                        if (nestedStr != null && nestedStr.equalsIgnoreCase("false"))
+                        {
+                            nested = false;
+                        }
+
+                        if (nested)
+                        {
+                            // Nested Embedded field, so include field
+                            String fieldName = MongoDBUtils.getFieldName(mmd);
+                            fieldsSelection.append(fieldName, 1);
+                        }
+                        else
+                        {
+                            // Flat Embedded field, so add all fields of sub-objects
+                            selectAllFieldsOfEmbeddedObject(mmd, fieldsSelection, ec, clr);
+                        }
                     }
-
-                    if (nested)
+                    else
                     {
-                        // Nested Embedded field, so include field
                         String fieldName = MongoDBUtils.getFieldName(mmd);
                         fieldsSelection.append(fieldName, 1);
                     }
-                    else
-                    {
-                        // Flat Embedded field, so add all fields of sub-objects
-                        selectAllFieldsOfEmbeddedObject(mmd, fieldsSelection, ec, clr);
-                    }
                 }
-                else
+            }
+            if (cmd.getIdentityType() == IdentityType.DATASTORE)
+            {
+                fieldsSelection.append(MongoDBUtils.getFieldName(cmd.getIdentityMetaData()), 1);
+            }
+            if (cmd.isVersioned())
+            {
+                fieldsSelection.append(MongoDBUtils.getFieldName(cmd.getVersionMetaDataForClass()), 1);
+            }
+
+            BasicDBObject query = new BasicDBObject();
+            if (filterObject != null)
+            {
+                Iterator<Map.Entry<String, Object>> entryIter = filterObject.entrySet().iterator();
+                while (entryIter.hasNext())
                 {
-                    String fieldName = MongoDBUtils.getFieldName(mmd);
-                    fieldsSelection.append(fieldName, 1);
+                    Map.Entry<String, Object> entry = entryIter.next();
+                    query.put(entry.getKey(), entry.getValue());
                 }
             }
-        }
-        if (cmd.getIdentityType() == IdentityType.DATASTORE)
-        {
-            fieldsSelection.append(MongoDBUtils.getFieldName(cmd.getIdentityMetaData()), 1);
-        }
-        if (cmd.isVersioned())
-        {
-            fieldsSelection.append(MongoDBUtils.getFieldName(cmd.getVersionMetaDataForClass()), 1);
-        }
 
-        BasicDBObject query = new BasicDBObject();
-        if (filterObject != null)
-        {
-            Iterator<Map.Entry<String, Object>> entryIter = filterObject.entrySet().iterator();
-            while (entryIter.hasNext())
+            if (cmd.hasDiscriminatorStrategy())
             {
-                Map.Entry<String, Object> entry = entryIter.next();
-                query.put(entry.getKey(), entry.getValue());
+                // Discriminator present : Add restriction on the discriminator value for this class
+                query.put(MongoDBUtils.getFieldName(cmd.getDiscriminatorMetaData()), cmd.getDiscriminatorValue());
             }
-        }
-        if (cmd.hasDiscriminatorStrategy())
-        {
-            // Discriminator present : Add restriction on the discriminator value for this class
-            query.put(MongoDBUtils.getFieldName(cmd.getDiscriminatorMetaData()), cmd.getDiscriminatorValue());
-        }
 
-        if (NucleusLogger.DATASTORE_RETRIEVE.isDebugEnabled())
-        {
-            NucleusLogger.DATASTORE_RETRIEVE.debug("Fetching instances of collection " + MongoDBUtils.getCollectionName(cmd) +
-                " fields=" + fieldsSelection + " with filter=" + query);
-        }
-
-        DBCollection dbColl = db.getCollection(MongoDBUtils.getCollectionName(cmd));
-        Object val = (options != null ? options.get("slave-ok") : Boolean.FALSE);
-        if (val == Boolean.TRUE)
-        {
-            dbColl.slaveOk();
-        }
-        DBCursor curs = dbColl.find(query, fieldsSelection);
-        try
-        {
-            if (cmd.getIdentityType() == IdentityType.APPLICATION)
+            if (ec.getStoreManager().getStringProperty("datanucleus.tenantId") != null)
             {
-                while (curs.hasNext())
+                // Multitenancy discriminator present : Add restriction for this tenant
+                if ("true".equalsIgnoreCase(cmd.getValueForExtension("multitenancy-disable")))
                 {
-                    final DBObject dbObject = curs.next();
-                    results.add(getObjectUsingApplicationIdForDBObject(dbObject, cmd, ec, ignoreCache, fpMembers));
+                    // Don't bother with multitenancy for this class
                 }
+                else
+                {
+                    String fieldName = MongoDBUtils.getFieldNameForMultitenancy(cmd);
+                    String value = ec.getStoreManager().getStringProperty("datanucleus.tenantID");
+                    query.put(fieldName, value);
+                }
             }
-            else if (cmd.getIdentityType() == IdentityType.DATASTORE)
+
+            if (NucleusLogger.DATASTORE_RETRIEVE.isDebugEnabled())
             {
+                NucleusLogger.DATASTORE_RETRIEVE.debug("Fetching instances of collection " + MongoDBUtils.getCollectionName(cmd) +
+                    " fields=" + fieldsSelection + " with filter=" + query);
+            }
+
+            DBCollection dbColl = db.getCollection(MongoDBUtils.getCollectionName(cmd));
+            Object val = (options != null ? options.get("slave-ok") : Boolean.FALSE);
+            if (val == Boolean.TRUE)
+            {
+                dbColl.slaveOk();
+            }
+
+            DBCursor curs = dbColl.find(query, fieldsSelection);
+
+            // Add results from this DBCursor and close it
+            try
+            {
                 while (curs.hasNext())
                 {
                     final DBObject dbObject = curs.next();
-                    results.add(getObjectUsingDatastoreIdForDBObject(dbObject, cmd, ec, ignoreCache, fpMembers));
+                    if (cmd.getIdentityType() == IdentityType.APPLICATION)
+                    {
+                        results.add(getObjectUsingApplicationIdForDBObject(dbObject, cmd, ec, ignoreCache, fpMembers));
+                    }
+                    else if (cmd.getIdentityType() == IdentityType.DATASTORE)
+                    {
+                        results.add(getObjectUsingDatastoreIdForDBObject(dbObject, cmd, ec, ignoreCache, fpMembers));
+                    }
+                    else
+                    {
+                        // TODO Support NONDURABLE
+                    }
                 }
             }
+            finally
+            {
+                curs.close();
+            }
         }
-        finally
-        {
-            curs.close();
-        }
+
         return results;
     }
 
@@ -473,7 +478,7 @@
         }
     }
 
-    protected static Object getObjectUsingApplicationIdForDBObject(final DBObject dbObject, final AbstractClassMetaData cmd,
+    public static Object getObjectUsingApplicationIdForDBObject(final DBObject dbObject, final AbstractClassMetaData cmd,
             final ExecutionContext ec, boolean ignoreCache, final int[] fpMembers)
     {
         Object id = IdentityUtils.getApplicationIdentityForResultSetRow(ec, cmd, null, 
@@ -519,7 +524,7 @@
         return pc;
     }
 
-    protected static Object getObjectUsingDatastoreIdForDBObject(final DBObject dbObject, final AbstractClassMetaData cmd,
+    public static Object getObjectUsingDatastoreIdForDBObject(final DBObject dbObject, final AbstractClassMetaData cmd,
             final ExecutionContext ec, boolean ignoreCache, final int[] fpMembers)
     {
         Object idKey = null;

Added: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/MongoDBCandidateList.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/MongoDBCandidateList.java	                        (rev 0)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/MongoDBCandidateList.java	2011-10-24 15:06:20 UTC (rev 13729)
@@ -0,0 +1,161 @@
+/**********************************************************************
+Copyright (c) 2011 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.store.mongodb.query;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.datanucleus.FetchPlan;
+import org.datanucleus.metadata.AbstractClassMetaData;
+import org.datanucleus.metadata.IdentityType;
+import org.datanucleus.store.ExecutionContext;
+import org.datanucleus.store.mongodb.MongoDBUtils;
+import org.datanucleus.store.query.AbstractCandidateLazyLoadList;
+
+import com.mongodb.DBCursor;
+import com.mongodb.DBObject;
+
+/**
+ * Wrapper for lazy-loaded list of results from a MongoDB query.
+ * Usage is as follows :-
+ * <pre>
+ * MongoDBCandidateList results = new MongoDBCandidateList(myCls, subclasses, ec, cacheType, fp, ignoreCache);
+ * results.addCandidateCursor(cmd1, curs1);
+ * results.addCandidateCursor(cmd2, curs2);
+ * results.addCandidateCursor(cmd3, curs3);
+ * ... use as a normal list now
+ * results.close();
+ * </pre>
+ * Access to the list (and any iterator for it) will lazily load the candidate instances from the provided DBCursors.
+ */
+public class MongoDBCandidateList extends AbstractCandidateLazyLoadList
+{
+    List<DBCursor> cursors = new ArrayList<DBCursor>();
+
+    int size = -1;
+
+    FetchPlan fp;
+
+    boolean ignoreCache;
+
+    /**
+     * @param cls
+     * @param subclasses
+     * @param ec
+     * @param cacheType
+     */
+    public MongoDBCandidateList(Class cls, boolean subclasses, ExecutionContext ec, String cacheType,
+            FetchPlan fp, boolean ignoreCache)
+    {
+        super(cls, subclasses, ec, cacheType);
+        this.ignoreCache = ignoreCache;
+        this.fp = fp;
+
+        // Add placeholders for the cursors (populated by addCandidateCursor)
+        for (int i=0;i<cmds.size();i++)
+        {
+            cursors.add(null);
+        }
+    }
+
+    public void addCandidateCursor(AbstractClassMetaData cmd, DBCursor cursor)
+    {
+        int position = cmds.indexOf(cmd);
+        cursors.set(position, cursor);
+    }
+
+    public void close()
+    {
+        Iterator<DBCursor> cursorIter = cursors.iterator();
+        while (cursorIter.hasNext())
+        {
+            DBCursor cursor = cursorIter.next();
+            cursor.close();
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.store.query.AbstractLazyLoadList#retrieveObjectForIndex(int)
+     */
+    @Override
+    protected Object retrieveObjectForIndex(int index)
+    {
+        Iterator<DBCursor> cursorIter = cursors.iterator();
+        Iterator<AbstractClassMetaData> cmdIter = cmds.iterator();
+        int first = 0;
+        int last = -1;
+        while (cursorIter.hasNext())
+        {
+            DBCursor cursor = cursorIter.next();
+            AbstractClassMetaData cmd = cmdIter.next();
+            last = first + cursor.count();
+            if (index >= first && index < last)
+            {
+                // Found in this cursor
+                int i= first;
+                while (cursor.hasNext())
+                {
+                    DBObject dbObject = cursor.next();
+                    if (i == index)
+                    {
+                        int[] fpMembers = fp.getFetchPlanForClass(cmd).getMemberNumbers();
+                        if (cmd.getIdentityType() == IdentityType.APPLICATION)
+                        {
+                            return MongoDBUtils.getObjectUsingApplicationIdForDBObject(dbObject, cmd, ec, ignoreCache, 
+                                fpMembers);
+                        }
+                        else if (cmd.getIdentityType() == IdentityType.DATASTORE)
+                        {
+                            return MongoDBUtils.getObjectUsingDatastoreIdForDBObject(dbObject, cmd, ec, ignoreCache, 
+                                fpMembers);
+                        }
+                    }
+                    i++;
+                }
+            }
+            else
+            {
+                first = last;
+            }
+        }
+
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.store.query.AbstractLazyLoadList#getSize()
+     */
+    @Override
+    protected int getSize()
+    {
+        if (size >= 0)
+        {
+            return size;
+        }
+
+        Iterator<DBCursor> cursorIter = cursors.iterator();
+        while (cursorIter.hasNext())
+        {
+            DBCursor cursor = cursorIter.next();
+            size += cursor.count();
+        }
+
+        return size;
+    }
+}
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14300
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=14300&view=rev
Author:   andy_jefferson
Date:     2012-02-14 09:47:24 +0000 (Tue, 14 Feb 2012)
Log Message:
-----------
Fix duplication of discriminator and multitenancy restrictions

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-02-14 08:56:29 UTC (rev 14299)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-02-14 09:47:24 UTC (rev 14300)
@@ -331,6 +331,7 @@
         List<AbstractClassMetaData> cmds = 
             MetaDataUtils.getMetaDataForCandidates(candidateClass, subclasses, ec);
 
+        // TODO Allow for subclasses sharing the same table so just doing a single query but with discriminator filtering
         Iterator<AbstractClassMetaData> cmdIter = cmds.iterator();
         List results = new ArrayList();
         ClassLoaderResolver clr = ec.getClassLoaderResolver();

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java	2012-02-14 08:56:29 UTC (rev 14299)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java	2012-02-14 09:47:24 UTC (rev 14300)
@@ -24,11 +24,8 @@
 import java.util.List;
 import java.util.Map;
 
-import org.datanucleus.PropertyNames;
 import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.metadata.AbstractClassMetaData;
-import org.datanucleus.metadata.DiscriminatorMetaData;
-import org.datanucleus.metadata.DiscriminatorStrategy;
 import org.datanucleus.query.evaluator.JDOQLEvaluator;
 import org.datanucleus.query.evaluator.JavaQueryEvaluator;
 import org.datanucleus.store.ExecutionContext;
@@ -36,7 +33,6 @@
 import org.datanucleus.store.connection.ManagedConnection;
 import org.datanucleus.store.mongodb.MongoDBUtils;
 import org.datanucleus.store.mongodb.query.expression.MongoBooleanExpression;
-import org.datanucleus.store.mongodb.query.expression.MongoOperator;
 import org.datanucleus.store.query.AbstractJDOQLQuery;
 import org.datanucleus.store.query.Query;
 import org.datanucleus.store.query.QueryManager;
@@ -251,7 +247,7 @@
                 NucleusLogger.QUERY.debug(LOCALISER.msg("021046", "JDOQL", getSingleStringQuery(), null));
             }
 
-            boolean evaluateFilter = true;
+            boolean filterInMemory = true;
             List candidates = null;
             if (candidateCollection != null)
             {
@@ -269,67 +265,7 @@
             else
             {
                 BasicDBObject filterObject = null;
-
-                MongoBooleanExpression filterExpr = null;
-                AbstractClassMetaData cmd = getCandidateClassMetaData();
-                if (cmd.hasDiscriminatorStrategy())
-                {
-                    // Add filter on discriminator for this class
-                    DiscriminatorMetaData discmd = cmd.getDiscriminatorMetaData();
-                    String fieldName = MongoDBUtils.getFieldName(discmd);
-                    Object discVal = null;
-                    if (cmd.getDiscriminatorStrategy() == DiscriminatorStrategy.CLASS_NAME)
-                    {
-                        discVal = cmd.getFullClassName();
-                    }
-                    else
-                    {
-                        discVal = discmd.getValue();
-                    }
-                    filterExpr = new MongoBooleanExpression(fieldName, discVal, MongoOperator.OP_EQ);
-                }
-                if (storeMgr.getStringProperty(PropertyNames.PROPERTY_TENANT_ID) != null)
-                {
-                    if ("true".equalsIgnoreCase(cmd.getValueForExtension("multitenancy-disable")))
-                    {
-                        // Don't bother with multitenancy for this class
-                    }
-                    else
-                    {
-                        // Add filter on discriminator for this tenant
-                        String fieldName = MongoDBUtils.getFieldNameForMultitenancy(cmd);
-                        String value = storeMgr.getStringProperty(PropertyNames.PROPERTY_TENANT_ID);
-                        MongoBooleanExpression tenancyExpr = new MongoBooleanExpression(fieldName, value, MongoOperator.OP_EQ);
-                        if (filterExpr == null)
-                        {
-                            filterExpr = tenancyExpr;
-                        }
-                        else
-                        {
-                            filterExpr = new MongoBooleanExpression(filterExpr, tenancyExpr, MongoOperator.OP_AND);
-                        }
-                    }
-                }
-                if (datastoreCompilation != null)
-                {
-                    if (datastoreCompilation.isFilterComplete())
-                    {
-                        MongoBooleanExpression userFilterExpr = datastoreCompilation.getFilterExpression();
-                        if (filterExpr == null)
-                        {
-                            filterExpr = userFilterExpr;
-                        }
-                        else if (userFilterExpr == null)
-                        {
-                            // Nothing to do
-                        }
-                        else
-                        {
-                            filterExpr = new MongoBooleanExpression(filterExpr, userFilterExpr, MongoOperator.OP_AND);
-                        }
-                    }
-                }
-
+                MongoBooleanExpression filterExpr = datastoreCompilation.getFilterExpression();
                 if (filterExpr != null)
                 {
                     filterObject = filterExpr.getDBObject();
@@ -346,14 +282,14 @@
                     ignoreCache, getFetchPlan(), filterObject, options);
                 if (filter != null && datastoreCompilation.isFilterComplete())
                 {
-                    evaluateFilter = false;
+                    filterInMemory = false;
                 }
             }
 
             // Apply any result restrictions to the results
             JavaQueryEvaluator resultMapper = new JDOQLEvaluator(this, candidates, compilation,
                 parameters, ec.getClassLoaderResolver());
-            Collection results = resultMapper.execute(evaluateFilter, true, true, true, true);
+            Collection results = resultMapper.execute(filterInMemory, true, true, true, true);
             if (candidates instanceof MongoDBCandidateList)
             {
                 ((MongoDBCandidateList)candidates).close();

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java	2012-02-14 08:56:29 UTC (rev 14299)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java	2012-02-14 09:47:24 UTC (rev 14300)
@@ -23,12 +23,9 @@
 import java.util.List;
 import java.util.Map;
 
-import org.datanucleus.PropertyNames;
 import org.datanucleus.exceptions.NucleusException;
 import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.metadata.AbstractClassMetaData;
-import org.datanucleus.metadata.DiscriminatorMetaData;
-import org.datanucleus.metadata.DiscriminatorStrategy;
 import org.datanucleus.query.evaluator.JPQLEvaluator;
 import org.datanucleus.query.evaluator.JavaQueryEvaluator;
 import org.datanucleus.store.ExecutionContext;
@@ -36,7 +33,6 @@
 import org.datanucleus.store.connection.ManagedConnection;
 import org.datanucleus.store.mongodb.MongoDBUtils;
 import org.datanucleus.store.mongodb.query.expression.MongoBooleanExpression;
-import org.datanucleus.store.mongodb.query.expression.MongoOperator;
 import org.datanucleus.store.query.AbstractJPQLQuery;
 import org.datanucleus.store.query.Query;
 import org.datanucleus.store.query.QueryManager;
@@ -230,7 +226,7 @@
                 NucleusLogger.QUERY.debug(LOCALISER.msg("021046", "JPQL", getSingleStringQuery(), null));
             }
 
-            boolean evaluateFilter = true;
+            boolean filterInMemory = true;
             List candidates = null;
             if (candidateCollection != null)
             {
@@ -239,67 +235,7 @@
             else
             {
                 BasicDBObject filterObject = null;
-
-                MongoBooleanExpression filterExpr = null;
-                AbstractClassMetaData cmd = ec.getMetaDataManager().getMetaDataForClass(candidateClass, clr);
-                if (cmd.hasDiscriminatorStrategy())
-                {
-                    // Add filter on discriminator for this class
-                    DiscriminatorMetaData discmd = cmd.getDiscriminatorMetaData();
-                    String fieldName = MongoDBUtils.getFieldName(discmd);
-                    Object discVal = null;
-                    if (cmd.getDiscriminatorStrategy() == DiscriminatorStrategy.CLASS_NAME)
-                    {
-                        discVal = cmd.getFullClassName();
-                    }
-                    else
-                    {
-                        discVal = discmd.getValue();
-                    }
-                    filterExpr = new MongoBooleanExpression(fieldName, discVal, MongoOperator.OP_EQ);
-                }
-                if (storeMgr.getStringProperty(PropertyNames.PROPERTY_TENANT_ID) != null)
-                {
-                    if ("true".equalsIgnoreCase(cmd.getValueForExtension("multitenancy-disable")))
-                    {
-                        // Don't bother with multitenancy for this class
-                    }
-                    else
-                    {
-                        // Add filter on discriminator for this tenant
-                        String fieldName = MongoDBUtils.getFieldNameForMultitenancy(cmd);
-                        String value = storeMgr.getStringProperty(PropertyNames.PROPERTY_TENANT_ID);
-                        MongoBooleanExpression tenancyExpr = new MongoBooleanExpression(fieldName, value, MongoOperator.OP_EQ);
-                        if (filterExpr == null)
-                        {
-                            filterExpr = tenancyExpr;
-                        }
-                        else
-                        {
-                            filterExpr = new MongoBooleanExpression(filterExpr, tenancyExpr, MongoOperator.OP_AND);
-                        }
-                    }
-                }
-                if (datastoreCompilation != null)
-                {
-                    if (datastoreCompilation.isFilterComplete())
-                    {
-                        MongoBooleanExpression userFilterExpr = datastoreCompilation.getFilterExpression();
-                        if (filterExpr == null)
-                        {
-                            filterExpr = userFilterExpr;
-                        }
-                        else if (userFilterExpr == null)
-                        {
-                            // Nothing to do
-                        }
-                        else
-                        {
-                            filterExpr = new MongoBooleanExpression(filterExpr, userFilterExpr, MongoOperator.OP_AND);
-                        }
-                    }
-                }
-
+                MongoBooleanExpression filterExpr = datastoreCompilation.getFilterExpression();
                 if (filterExpr != null)
                 {
                     filterObject = filterExpr.getDBObject();
@@ -316,14 +252,14 @@
                     ignoreCache, getFetchPlan(), filterObject, options);
                 if (filter != null && datastoreCompilation.isFilterComplete())
                 {
-                    evaluateFilter = false;
+                    filterInMemory = false;
                 }
             }
 
             // Apply any result restrictions to the results
             JavaQueryEvaluator resultMapper = new JPQLEvaluator(this, candidates, compilation, 
                 parameters, ec.getClassLoaderResolver());
-            Collection results = resultMapper.execute(evaluateFilter, true, true, true, true);
+            Collection results = resultMapper.execute(filterInMemory, true, true, true, true);
             if (candidates instanceof MongoDBCandidateList)
             {
                 ((MongoDBCandidateList)candidates).close();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14316
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=14316&view=rev
Author:   andy_jefferson
Date:     2012-02-17 14:21:27 +0000 (Fri, 17 Feb 2012)
Log Message:
-----------
[NUCMONGODB-50] Make use of NamingFactory for getting table/column names, now respecting JDO/JPA conventions

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2012-02-17 14:19:34 UTC (rev 14315)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2012-02-17 14:21:27 UTC (rev 14316)
@@ -57,6 +57,7 @@
 import org.datanucleus.store.fieldmanager.DeleteFieldManager;
 import org.datanucleus.store.mongodb.fieldmanager.FetchFieldManager;
 import org.datanucleus.store.mongodb.fieldmanager.StoreFieldManager;
+import org.datanucleus.store.schema.naming.ColumnType;
 import org.datanucleus.util.Localiser;
 import org.datanucleus.util.NucleusLogger;
 import org.datanucleus.util.StringUtils;
@@ -117,7 +118,7 @@
                 AbstractClassMetaData cmd = ops[i].getClassMetaData();
                 if (!cmd.pkUsesIdentityValueGenerator())
                 {
-                    String tableName = MongoDBUtils.getCollectionName(cmd);
+                    String tableName = storeMgr.getNamingFactory().getTableName(cmd);
                     Set<ObjectProvider> opsForTable = opsByTable.get(tableName);
                     if (opsForTable == null)
                     {
@@ -237,7 +238,7 @@
                     op.toPrintableID(), op.getInternalObjectId()));
             }
 
-            DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(cmd));
+            DBCollection collection = db.getCollection(storeMgr.getNamingFactory().getTableName(cmd));
             DBObject dbObject = getDBObjectForObjectProviderToInsert(op, !cmd.pkUsesIdentityValueGenerator());
 
             NucleusLogger.DATASTORE_NATIVE.debug("Persisting object " + op + " as " + dbObject);
@@ -337,7 +338,7 @@
             cmd.getIdentityMetaData().getValueStrategy() != IdentityStrategy.IDENTITY)
         {
             // Add surrogate datastore identity field (if using identity then just uses "_id" MongoDB special)
-            String fieldName = MongoDBUtils.getFieldName(cmd.getIdentityMetaData());
+            String fieldName = storeMgr.getNamingFactory().getColumnName(cmd, ColumnType.DATASTOREID_COLUMN);
             OID oid = (OID) op.getInternalObjectId();
             Object key = oid.getKeyValue();
             dbObject.put(fieldName, key);
@@ -347,7 +348,7 @@
         {
             // Add discriminator field
             DiscriminatorMetaData discmd = cmd.getDiscriminatorMetaData();
-            String fieldName = MongoDBUtils.getFieldName(discmd);
+            String fieldName = storeMgr.getNamingFactory().getColumnName(cmd, ColumnType.DISCRIMINATOR_COLUMN);
             Object discVal = null;
             if (cmd.getDiscriminatorStrategy() == DiscriminatorStrategy.CLASS_NAME)
             {
@@ -369,7 +370,7 @@
             }
             else
             {
-                String fieldName = MongoDBUtils.getFieldNameForMultitenancy(cmd);
+                String fieldName = storeMgr.getNamingFactory().getColumnName(cmd, ColumnType.MULTITENANCY_COLUMN);
                 dbObject.put(fieldName, storeMgr.getStringProperty(PropertyNames.PROPERTY_TENANT_ID));
             }
         }
@@ -401,7 +402,7 @@
                 else
                 {
                     // Surrogate version
-                    String fieldName = MongoDBUtils.getFieldName(vermd);
+                    String fieldName = storeMgr.getNamingFactory().getColumnName(cmd, ColumnType.VERSION_COLUMN);
                     dbObject.put(fieldName, new Long(versionNumber));
                 }
             }
@@ -420,7 +421,7 @@
                 else
                 {
                     // Surrogate version
-                    String fieldName = MongoDBUtils.getFieldName(vermd);
+                    String fieldName = storeMgr.getNamingFactory().getColumnName(cmd, ColumnType.VERSION_COLUMN);
                     dbObject.put(fieldName, ts);
                 }
             }
@@ -465,7 +466,7 @@
                     op.toPrintableID(), op.getInternalObjectId(), fieldStr.toString()));
             }
 
-            DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(cmd));
+            DBCollection collection = db.getCollection(storeMgr.getNamingFactory().getTableName(cmd));
             DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, op, true);
             if (dbObject == null)
             {
@@ -497,7 +498,7 @@
                 else
                 {
                     // Update the stored surrogate value
-                    String fieldName = MongoDBUtils.getFieldName(vermd);
+                    String fieldName = storeMgr.getNamingFactory().getColumnName(cmd, ColumnType.VERSION_COLUMN);
                     dbObject.put(fieldName, nextVersion);
                 }
             }
@@ -556,7 +557,7 @@
                     op.toPrintableID(), op.getInternalObjectId()));
             }
 
-            DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(cmd));
+            DBCollection collection = db.getCollection(storeMgr.getNamingFactory().getTableName(cmd));
             DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, op, true);
             if (dbObject == null)
             {
@@ -633,7 +634,7 @@
                     op.toPrintableID(), op.getInternalObjectId()));
             }
 
-            DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(cmd));
+            DBCollection collection = db.getCollection(storeMgr.getNamingFactory().getTableName(cmd));
             DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, op, false);
             if (dbObject == null)
             {
@@ -654,7 +655,7 @@
                 else
                 {
                     // Surrogate version
-                    String fieldName = MongoDBUtils.getFieldName(vermd);
+                    String fieldName = storeMgr.getNamingFactory().getColumnName(cmd, ColumnType.VERSION_COLUMN);
                     Object datastoreVersion = dbObject.get(fieldName);
                     op.setVersion(datastoreVersion);
                 }
@@ -695,7 +696,7 @@
             try
             {
                 DB db = (DB)mconn.getConnection();
-                DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(cmd));
+                DBCollection collection = db.getCollection(storeMgr.getNamingFactory().getTableName(cmd));
                 DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, op, false);
                 if (dbObject == null)
                 {

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java	2012-02-17 14:19:34 UTC (rev 14315)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java	2012-02-17 14:21:27 UTC (rev 14316)
@@ -42,6 +42,7 @@
 import org.datanucleus.store.StoreData;
 import org.datanucleus.store.connection.ManagedConnection;
 import org.datanucleus.store.schema.SchemaAwareStoreManager;
+import org.datanucleus.store.schema.naming.ColumnType;
 import org.datanucleus.util.Localiser;
 import org.datanucleus.util.NucleusLogger;
 
@@ -181,7 +182,7 @@
 
     protected void createSchemaForClass(AbstractClassMetaData cmd, DB db)
     {
-        String collectionName = MongoDBUtils.getCollectionName(cmd);
+        String collectionName = getNamingFactory().getTableName(cmd);
         DBCollection collection = null;
         if (autoCreateTables)
         {
@@ -213,7 +214,7 @@
                     if (NucleusLogger.DATASTORE_SCHEMA.isDebugEnabled())
                     {
                         NucleusLogger.DATASTORE_SCHEMA.debug(LOCALISER.msg("MongoDB.SchemaCreate.Class.Index",
-                            idxmds[i].getName(), MongoDBUtils.getCollectionName(cmd), idxObj));
+                            idxmds[i].getName(), collectionName, idxObj));
                     }
                     collection.ensureIndex(idxObj, idxmds[i].getName(), idxmds[i].isUnique());
                 }
@@ -227,7 +228,7 @@
                     if (NucleusLogger.DATASTORE_SCHEMA.isDebugEnabled())
                     {
                         NucleusLogger.DATASTORE_SCHEMA.debug(LOCALISER.msg("MongoDB.SchemaCreate.Class.Index",
-                            unimds[i].getName(), MongoDBUtils.getCollectionName(cmd), uniObj));
+                            unimds[i].getName(), collectionName, uniObj));
                     }
                     collection.ensureIndex(uniObj, unimds[i].getName(), true);
                 }
@@ -247,7 +248,7 @@
                         applyIndex = false;
                         break;
                     }
-                    query.append(MongoDBUtils.getFieldName(pkMmd), 1);
+                    query.append(getNamingFactory().getColumnName(pkMmd, ColumnType.COLUMN), 1);
                 }
                 if (applyIndex)
                 {
@@ -255,7 +256,7 @@
                     if (NucleusLogger.DATASTORE_SCHEMA.isDebugEnabled())
                     {
                         NucleusLogger.DATASTORE_SCHEMA.debug(LOCALISER.msg("MongoDB.SchemaCreate.Class.Index",
-                            pkName, MongoDBUtils.getCollectionName(cmd), query));
+                            pkName, collectionName, query));
                     }
                     collection.ensureIndex(query, pkName, true);
                 }
@@ -269,12 +270,12 @@
                 else
                 {
                     BasicDBObject query = new BasicDBObject();
-                    query.append(MongoDBUtils.getFieldName(cmd.getIdentityMetaData()), 1);
+                    query.append(getNamingFactory().getColumnName(cmd, ColumnType.DATASTOREID_COLUMN), 1);
                     String pkName = (cmd.getPrimaryKeyMetaData() != null ? cmd.getPrimaryKeyMetaData().getName() : cmd.getName() + "_PK");
                     if (NucleusLogger.DATASTORE_SCHEMA.isDebugEnabled())
                     {
                         NucleusLogger.DATASTORE_SCHEMA.debug(LOCALISER.msg("MongoDB.SchemaCreate.Class.Index",
-                            pkName, MongoDBUtils.getCollectionName(cmd), query));
+                            pkName, collectionName, query));
                     }
                     collection.ensureIndex(query, pkName, true);
                 }
@@ -285,15 +286,16 @@
             {
                 for (int i=0;i<mmds.length;i++)
                 {
+                    String colName = getNamingFactory().getColumnName(mmds[i], ColumnType.COLUMN);
                     IndexMetaData idxmd = mmds[i].getIndexMetaData();
                     if (idxmd != null)
                     {
                         BasicDBObject query = new BasicDBObject();
-                        query.append(MongoDBUtils.getFieldName(mmds[i]), 1);
+                        query.append(colName, 1);
                         if (NucleusLogger.DATASTORE_SCHEMA.isDebugEnabled())
                         {
                             NucleusLogger.DATASTORE_SCHEMA.debug(LOCALISER.msg("MongoDB.SchemaCreate.Class.Index",
-                                idxmd.getName(), MongoDBUtils.getCollectionName(cmd), query));
+                                idxmd.getName(), collectionName, query));
                         }
                         collection.ensureIndex(query, idxmd.getName(), idxmd.isUnique());
                     }
@@ -301,11 +303,11 @@
                     if (unimd != null)
                     {
                         BasicDBObject query = new BasicDBObject();
-                        query.append(MongoDBUtils.getFieldName(mmds[i]), 1);
+                        query.append(colName, 1);
                         if (NucleusLogger.DATASTORE_SCHEMA.isDebugEnabled())
                         {
                             NucleusLogger.DATASTORE_SCHEMA.debug(LOCALISER.msg("MongoDB.SchemaCreate.Class.Index",
-                                unimd.getName(), MongoDBUtils.getCollectionName(cmd), query));
+                                unimd.getName(), collectionName, query));
                         }
                         collection.ensureIndex(query, unimd.getName(), true);
                     }
@@ -332,7 +334,7 @@
             {
                 String memberName = idxmmds[j].getName();
                 AbstractMemberMetaData mmd = cmd.getMetaDataForMember(memberName);
-                idxObj.append(MongoDBUtils.getFieldName(mmd), 1);
+                idxObj.append(getNamingFactory().getColumnName(mmd, ColumnType.COLUMN), 1);
             }
         }
         return idxObj;
@@ -356,7 +358,7 @@
             {
                 String memberName = unimmds[j].getName();
                 AbstractMemberMetaData mmd = cmd.getMetaDataForMember(memberName);
-                uniObj.append(MongoDBUtils.getFieldName(mmd), 1);
+                uniObj.append(getNamingFactory().getColumnName(mmd, ColumnType.COLUMN), 1);
             }
         }
         return uniObj;
@@ -380,7 +382,7 @@
                 AbstractClassMetaData cmd = getMetaDataManager().getMetaDataForClass(className, clr);
                 if (cmd != null)
                 {
-                    DBCollection collection = db.getCollection(MongoDBUtils.getCollectionName(cmd));
+                    DBCollection collection = db.getCollection(getNamingFactory().getTableName(cmd));
                     collection.dropIndexes();
                     collection.drop();
                 }
@@ -412,7 +414,7 @@
                 if (cmd != null)
                 {
                     // Validate the schema for the class
-                    String tableName = MongoDBUtils.getCollectionName(cmd);
+                    String tableName = getNamingFactory().getTableName(cmd);
                     if (!db.collectionExists(tableName))
                     {
                         success = false;
@@ -484,7 +486,7 @@
                         for (int i=0;i<pkFieldNumbers.length;i++)
                         {
                             AbstractMemberMetaData pkMmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(pkFieldNumbers[i]);
-                            query.append(MongoDBUtils.getFieldName(pkMmd), 1);
+                            query.append(getNamingFactory().getColumnName(pkMmd, ColumnType.COLUMN), 1);
                         }
                         String pkName = (cmd.getPrimaryKeyMetaData() != null ? cmd.getPrimaryKeyMetaData().getName() : cmd.getName() + "_PK");
                         DBObject indexObj = getIndexObjectForIndex(indices, pkName, query, true);
@@ -512,7 +514,7 @@
                         {
                             // Check unique index on PK
                             BasicDBObject query = new BasicDBObject();
-                            query.append(MongoDBUtils.getFieldName(cmd.getIdentityMetaData()), 1);
+                            query.append(getNamingFactory().getColumnName(cmd, ColumnType.DATASTOREID_COLUMN), 1);
                             String pkName = (cmd.getPrimaryKeyMetaData() != null ? cmd.getPrimaryKeyMetaData().getName() : cmd.getName() + "_PK");
                             DBObject indexObj = getIndexObjectForIndex(indices, pkName, query, true);
                             if (indexObj != null)
@@ -540,7 +542,7 @@
                             if (idxmd != null)
                             {
                                 BasicDBObject query = new BasicDBObject();
-                                query.append(MongoDBUtils.getFieldName(mmds[i]), 1);
+                                query.append(getNamingFactory().getColumnName(mmds[i], ColumnType.COLUMN), 1);
                                 DBObject indexObj = getIndexObjectForIndex(indices, idxmd.getName(), query, true);
                                 if (indexObj != null)
                                 {
@@ -560,7 +562,7 @@
                             if (unimd != null)
                             {
                                 BasicDBObject query = new BasicDBObject();
-                                query.append(MongoDBUtils.getFieldName(mmds[i]), 1);
+                                query.append(getNamingFactory().getColumnName(mmds[i], ColumnType.COLUMN), 1);
                                 DBObject indexObj = getIndexObjectForIndex(indices, unimd.getName(), query, true);
                                 if (indexObj != null)
                                 {

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-02-17 14:19:34 UTC (rev 14315)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-02-17 14:21:27 UTC (rev 14316)
@@ -33,9 +33,7 @@
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.ColumnMetaData;
-import org.datanucleus.metadata.DiscriminatorMetaData;
 import org.datanucleus.metadata.EmbeddedMetaData;
-import org.datanucleus.metadata.IdentityMetaData;
 import org.datanucleus.metadata.IdentityStrategy;
 import org.datanucleus.metadata.IdentityType;
 import org.datanucleus.metadata.MetaDataUtils;
@@ -44,7 +42,9 @@
 import org.datanucleus.store.ExecutionContext;
 import org.datanucleus.store.FieldValues;
 import org.datanucleus.store.ObjectProvider;
+import org.datanucleus.store.StoreManager;
 import org.datanucleus.store.mongodb.fieldmanager.FetchFieldManager;
+import org.datanucleus.store.schema.naming.ColumnType;
 import org.datanucleus.util.NucleusLogger;
 
 import com.mongodb.BasicDBObject;
@@ -75,121 +75,6 @@
     }
 
     /**
-     * Accessor for the MongoDB collection name for this class.
-     * Takes the table name if provided, otherwise uses the (short-form) class name
-     * @param cmd Metadata for the class
-     * @return The collection name
-     */
-    public static String getCollectionName(AbstractClassMetaData cmd)
-    {
-        if (cmd.getTable() != null)
-        {
-            return cmd.getTable();
-        }
-        return cmd.getName();
-    }
-
-    /**
-     * Accessor for the MongoDB "field" name to store this member under. Takes the column name if provided
-     * otherwise the (short-form) member name.
-     * @param mmd Metadata for the member
-     * @return The field name
-     */
-    public static String getFieldName(AbstractMemberMetaData mmd)
-    {
-        // Try the first column if specified
-        ColumnMetaData[] colmds = mmd.getColumnMetaData();
-        if (colmds != null && colmds.length > 1)
-        {
-            return colmds[0].getName();
-        }
-
-        // Fallback to the member name
-        return mmd.getName();
-    }
-
-    /**
-     * Accessor for the MongoDB "field" name to store the datastore id under. Takes the column name if provided
-     * otherwise "IDENTITY".
-     * @param idmd Metadata for the identity
-     * @return The field name
-     */
-    public static String getFieldName(IdentityMetaData idmd)
-    {
-        if (idmd.getValueStrategy() == IdentityStrategy.IDENTITY)
-        {
-            // Make use of MongoDB "_id" field
-            return "_id";
-        }
-        else
-        {
-            ColumnMetaData colmd = idmd.getColumnMetaData();
-            if (colmd != null && colmd.getName() != null)
-            {
-                return colmd.getName();
-            }
-
-            // Fallback to "IDENTITY"
-            return "IDENTITY";
-        }
-    }
-
-    /**
-     * Accessor for the MongoDB "field" name to store the surrogate version under. Takes the column name if provided
-     * otherwise "VERSION".
-     * @param mmd Metadata for the version
-     * @return The field name
-     */
-    public static String getFieldName(VersionMetaData vermd)
-    {
-        ColumnMetaData colmd = vermd.getColumnMetaData();
-        if (colmd != null && colmd.getName() != null)
-        {
-            return colmd.getName();
-        }
-
-        // Fallback to "VERSION"
-        return "VERSION";
-    }
-
-    /**
-     * Accessor for the MongoDB "field" name to store the discriminator under. Takes the column name if provided
-     * otherwise "DISCRIM".
-     * @param discmd Metadata for the discriminator
-     * @return The field name
-     */
-    public static String getFieldName(DiscriminatorMetaData discmd)
-    {
-        // Try the first column if specified
-        ColumnMetaData colmd = discmd.getColumnMetaData();
-        if (colmd != null && colmd.getName() != null)
-        {
-            return colmd.getName();
-        }
-
-        // Fallback to "DISCRIM"
-        return "DISCRIM";
-    }
-
-    /**
-     * Accessor for the MongoDB "field" name to store the multitenancy discriminator under. 
-     * Takes the column name if provided otherwise "TENANT_ID".
-     * @param cmd Metadata for the class
-     * @return The field name
-     */
-    public static String getFieldNameForMultitenancy(AbstractClassMetaData cmd)
-    {
-        // Try the first column if specified
-        if (cmd.hasExtension("multitenancy-column-name"))
-        {
-            return cmd.getValueForExtension("multitenancy-column-name");
-        }
-
-        // Fallback to "TENANT_ID"
-        return "TENANT_ID";
-    }
-
-    /**
      * Accessor for the MongoDB field for the field of this embedded field.
      * Uses the column name from the embedded definition (if present), otherwise falls back to
      * the column name of the field in its own class definition, otherwise uses its field name.
@@ -239,6 +124,7 @@
         // Build query object to use as template for the find
         BasicDBObject query = new BasicDBObject();
         AbstractClassMetaData cmd = op.getClassMetaData();
+        StoreManager storeMgr = op.getExecutionContext().getStoreManager();
 
         if (cmd.getIdentityType() == IdentityType.APPLICATION)
         {
@@ -259,7 +145,7 @@
                 }
                 else
                 {
-                    query.put(MongoDBUtils.getFieldName(pkMmd), value);
+                    query.put(storeMgr.getNamingFactory().getColumnName(pkMmd, ColumnType.COLUMN), value);
                 }
             }
         }
@@ -279,14 +165,14 @@
             }
             else
             {
-                query.put(MongoDBUtils.getFieldName(cmd.getIdentityMetaData()), value);
+                query.put(storeMgr.getNamingFactory().getColumnName(cmd, ColumnType.DATASTOREID_COLUMN), value);
             }
         }
 
         if (cmd.hasDiscriminatorStrategy())
         {
             // Add discriminator to the query object
-            query.put(MongoDBUtils.getFieldName(cmd.getDiscriminatorMetaData()), cmd.getDiscriminatorValue());
+            query.put(storeMgr.getNamingFactory().getColumnName(cmd, ColumnType.DISCRIMINATOR_COLUMN), cmd.getDiscriminatorValue());
         }
         if (checkVersion && cmd.isVersioned())
         {
@@ -297,13 +183,13 @@
             {
                 // Version field in class
                 AbstractMemberMetaData verMmd = cmd.getMetaDataForMember(vermd.getFieldName());
-                String fieldName = MongoDBUtils.getFieldName(verMmd);
+                String fieldName = storeMgr.getNamingFactory().getColumnName(verMmd, ColumnType.COLUMN);
                 query.put(fieldName, currentVersion);
             }
             else
             {
                 // Surrogate version field
-                String fieldName = MongoDBUtils.getFieldName(vermd);
+                String fieldName = storeMgr.getNamingFactory().getColumnName(cmd, ColumnType.VERSION_COLUMN);
                 query.put(fieldName, currentVersion);
             }
         }
@@ -334,6 +220,7 @@
         // TODO Allow for subclasses sharing the same table so just doing a single query but with discriminator filtering
         Iterator<AbstractClassMetaData> cmdIter = cmds.iterator();
         List results = new ArrayList();
+        StoreManager storeMgr = ec.getStoreManager();
         ClassLoaderResolver clr = ec.getClassLoaderResolver();
         while (cmdIter.hasNext())
         {
@@ -360,7 +247,7 @@
                         if (nested)
                         {
                             // Nested Embedded field, so include field
-                            String fieldName = MongoDBUtils.getFieldName(mmd);
+                            String fieldName = storeMgr.getNamingFactory().getColumnName(mmd, ColumnType.COLUMN);
                             fieldsSelection.append(fieldName, 1);
                         }
                         else
@@ -371,18 +258,18 @@
                     }
                     else
                     {
-                        String fieldName = MongoDBUtils.getFieldName(mmd);
+                        String fieldName = storeMgr.getNamingFactory().getColumnName(mmd, ColumnType.COLUMN);
                         fieldsSelection.append(fieldName, 1);
                     }
                 }
             }
             if (cmd.getIdentityType() == IdentityType.DATASTORE)
             {
-                fieldsSelection.append(MongoDBUtils.getFieldName(cmd.getIdentityMetaData()), 1);
+                fieldsSelection.append(storeMgr.getNamingFactory().getColumnName(cmd, ColumnType.DATASTOREID_COLUMN), 1);
             }
             if (cmd.isVersioned())
             {
-                fieldsSelection.append(MongoDBUtils.getFieldName(cmd.getVersionMetaDataForClass()), 1);
+                fieldsSelection.append(storeMgr.getNamingFactory().getColumnName(cmd, ColumnType.VERSION_COLUMN), 1);
             }
 
             BasicDBObject query = new BasicDBObject();
@@ -399,10 +286,10 @@
             if (cmd.hasDiscriminatorStrategy())
             {
                 // Discriminator present : Add restriction on the discriminator value for this class
-                query.put(MongoDBUtils.getFieldName(cmd.getDiscriminatorMetaData()), cmd.getDiscriminatorValue());
+                query.put(storeMgr.getNamingFactory().getColumnName(cmd, ColumnType.DISCRIMINATOR_COLUMN), cmd.getDiscriminatorValue());
             }
 
-            if (ec.getStoreManager().getStringProperty(PropertyNames.PROPERTY_TENANT_ID) != null)
+            if (storeMgr.getStringProperty(PropertyNames.PROPERTY_TENANT_ID) != null)
             {
                 // Multitenancy discriminator present : Add restriction for this tenant
                 if ("true".equalsIgnoreCase(cmd.getValueForExtension("multitenancy-disable")))
@@ -411,19 +298,20 @@
                 }
                 else
                 {
-                    String fieldName = MongoDBUtils.getFieldNameForMultitenancy(cmd);
-                    String value = ec.getStoreManager().getStringProperty(PropertyNames.PROPERTY_TENANT_ID);
+                    String fieldName = storeMgr.getNamingFactory().getColumnName(cmd, ColumnType.MULTITENANCY_COLUMN);
+                    String value = storeMgr.getStringProperty(PropertyNames.PROPERTY_TENANT_ID);
                     query.put(fieldName, value);
                 }
             }
 
+            String collectionName = storeMgr.getNamingFactory().getTableName(cmd);
             if (NucleusLogger.DATASTORE_RETRIEVE.isDebugEnabled())
             {
-                NucleusLogger.DATASTORE_RETRIEVE.debug("Fetching instances of collection " + MongoDBUtils.getCollectionName(cmd) +
+                NucleusLogger.DATASTORE_RETRIEVE.debug("Fetching instances of collection " + collectionName +
                     " fields=" + fieldsSelection + " with filter=" + query);
             }
 
-            DBCollection dbColl = db.getCollection(MongoDBUtils.getCollectionName(cmd));
+            DBCollection dbColl = db.getCollection(collectionName);
             Object val = (options != null ? options.get("slave-ok") : Boolean.FALSE);
             if (val == Boolean.TRUE)
             {
@@ -487,6 +375,7 @@
         Object id = IdentityUtils.getApplicationIdentityForResultSetRow(ec, cmd, null, 
             false, new FetchFieldManager(ec, dbObject, cmd));
 
+        StoreManager storeMgr = ec.getStoreManager();
         Class type = ec.getClassLoaderResolver().classForName(cmd.getFullClassName());
         Object pc = ec.findObject(id, 
             new FieldValues()
@@ -520,7 +409,7 @@
             else
             {
                 // Get the surrogate version from the datastore
-                version = dbObject.get(MongoDBUtils.getFieldName(vermd));
+                version = dbObject.get(storeMgr.getNamingFactory().getColumnName(cmd, ColumnType.VERSION_COLUMN));
             }
             sm.setVersion(version);
         }
@@ -531,6 +420,7 @@
             final ExecutionContext ec, boolean ignoreCache, final int[] fpMembers)
     {
         Object idKey = null;
+        StoreManager storeMgr = ec.getStoreManager();
         if (cmd.getIdentityMetaData().getValueStrategy() == IdentityStrategy.IDENTITY)
         {
             idKey = dbObject.get("_id");
@@ -541,7 +431,7 @@
         }
         else
         {
-            idKey = dbObject.get(MongoDBUtils.getFieldName(cmd.getIdentityMetaData()));
+            idKey = dbObject.get(storeMgr.getNamingFactory().getColumnName(cmd, ColumnType.DATASTOREID_COLUMN));
         }
         OID oid = OIDFactory.getInstance(ec.getNucleusContext(), cmd.getFullClassName(), idKey);
         Class type = ec.getClassLoaderResolver().classForName(cmd.getFullClassName());
@@ -578,7 +468,7 @@
             else
             {
                 // Get the surrogate version from the datastore
-                version = dbObject.get(MongoDBUtils.getFieldName(vermd));
+                version = dbObject.get(storeMgr.getNamingFactory().getColumnName(cmd, ColumnType.VERSION_COLUMN));
             }
             sm.setVersion(version);
         }
@@ -611,6 +501,7 @@
         {
             // Set the version on the retrieved object
             ObjectProvider sm = ec.findObjectProvider(pc);
+            StoreManager storeMgr = ec.getStoreManager();
             Object version = null;
             VersionMetaData vermd = cmd.getVersionMetaDataForClass();
             if (vermd.getFieldName() != null)
@@ -622,7 +513,7 @@
             else
             {
                 // Get the surrogate version from the datastore
-                version = dbObject.get(MongoDBUtils.getFieldName(vermd));
+                version = dbObject.get(storeMgr.getNamingFactory().getColumnName(cmd, ColumnType.VERSION_COLUMN));
             }
             sm.setVersion(version);
         }

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2012-02-17 14:19:34 UTC (rev 14315)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2012-02-17 14:21:27 UTC (rev 14316)
@@ -45,6 +45,7 @@
 import org.datanucleus.store.fieldmanager.AbstractFieldManager;
 import org.datanucleus.store.fieldmanager.FieldManager;
 import org.datanucleus.store.mongodb.MongoDBUtils;
+import org.datanucleus.store.schema.naming.ColumnType;
 import org.datanucleus.store.types.converters.TypeConverter;
 import org.datanucleus.store.types.sco.SCOUtils;
 import org.datanucleus.util.NucleusLogger;
@@ -348,7 +349,8 @@
 
     protected String getFieldName(int fieldNumber)
     {
-        return MongoDBUtils.getFieldName(cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber));
+        return ec.getStoreManager().getNamingFactory().getColumnName(
+            cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber), ColumnType.COLUMN);
     }
 
     @Override
@@ -432,7 +434,7 @@
                         }
                     }
 
-                    String fieldName = MongoDBUtils.getFieldName(mmd);
+                    String fieldName = ec.getStoreManager().getNamingFactory().getColumnName(mmd, ColumnType.COLUMN);
                     if (!dbObject.containsField(fieldName))
                     {
                         return null;
@@ -478,7 +480,7 @@
             {
                 if (mmd.hasCollection())
                 {
-                    String fieldName = MongoDBUtils.getFieldName(mmd);
+                    String fieldName = ec.getStoreManager().getNamingFactory().getColumnName(mmd, ColumnType.COLUMN);
                     if (!dbObject.containsField(fieldName))
                     {
                         return null;
@@ -518,7 +520,7 @@
                 }
                 else if (mmd.hasArray())
                 {
-                    String fieldName = MongoDBUtils.getFieldName(mmd);
+                    String fieldName = ec.getStoreManager().getNamingFactory().getColumnName(mmd, ColumnType.COLUMN);
                     if (!dbObject.containsField(fieldName))
                     {
                         return null;
@@ -543,7 +545,7 @@
                 }
                 else
                 {
-                    String fieldName = MongoDBUtils.getFieldName(mmd);
+                    String fieldName = ec.getStoreManager().getNamingFactory().getColumnName(mmd, ColumnType.COLUMN);
                     if (!dbObject.containsField(fieldName))
                     {
                         return null;
@@ -618,7 +620,7 @@
             }
         }
 
-        String fieldName = MongoDBUtils.getFieldName(mmd);
+        String fieldName = ec.getStoreManager().getNamingFactory().getColumnName(mmd, ColumnType.COLUMN);
         if (!dbObject.containsField(fieldName))
         {
             return null;

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2012-02-17 14:19:34 UTC (rev 14315)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2012-02-17 14:21:27 UTC (rev 14316)
@@ -43,7 +43,7 @@
 import org.datanucleus.store.ObjectProvider;
 import org.datanucleus.store.fieldmanager.AbstractFieldManager;
 import org.datanucleus.store.fieldmanager.FieldManager;
-import org.datanucleus.store.mongodb.MongoDBUtils;
+import org.datanucleus.store.schema.naming.ColumnType;
 import org.datanucleus.store.types.TypeManager;
 import org.datanucleus.store.types.converters.TypeConverter;
 
@@ -205,7 +205,8 @@
 
     protected String getFieldName(int fieldNumber)
     {
-        return MongoDBUtils.getFieldName(cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber));
+        return op.getExecutionContext().getStoreManager().getNamingFactory().getColumnName(
+            cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumber), ColumnType.COLUMN);
     }
 
     @Override
@@ -217,8 +218,8 @@
             return;
         }
 
-        String fieldName = MongoDBUtils.getFieldName(mmd);
         ExecutionContext ec = op.getExecutionContext();
+        String fieldName = ec.getStoreManager().getNamingFactory().getColumnName(mmd, ColumnType.COLUMN);
         ClassLoaderResolver clr = ec.getClassLoaderResolver();
         int relationType = mmd.getRelationType(clr);
 
@@ -292,7 +293,7 @@
                 {
                     if (nested)
                     {
-                        dbObject.removeField(MongoDBUtils.getFieldName(mmd));
+                        dbObject.removeField(fieldName);
                         return;
                     }
                     else
@@ -326,7 +327,7 @@
             {
                 if (value == null)
                 {
-                    dbObject.removeField(MongoDBUtils.getFieldName(mmd));
+                    dbObject.removeField(fieldName);
                     return;
                 }
 

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java	2012-02-17 14:19:34 UTC (rev 14315)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java	2012-02-17 14:21:27 UTC (rev 14316)
@@ -41,6 +41,7 @@
 import org.datanucleus.store.mongodb.query.expression.MongoLiteral;
 import org.datanucleus.store.mongodb.query.expression.MongoOperator;
 import org.datanucleus.store.query.Query;
+import org.datanucleus.store.schema.naming.ColumnType;
 import org.datanucleus.util.NucleusLogger;
 import org.datanucleus.util.StringUtils;
 
@@ -556,10 +557,10 @@
                         }
                         else
                         {
-                            return embeddedNestedField + "." + MongoDBUtils.getFieldName(mmd);
+                            return embeddedNestedField + "." + ec.getStoreManager().getNamingFactory().getColumnName(mmd, ColumnType.COLUMN);
                         }
                     }
-                    return MongoDBUtils.getFieldName(mmd);
+                    return ec.getStoreManager().getNamingFactory().getColumnName(mmd, ColumnType.COLUMN);
                 }
                 else if (mmd.isEmbedded())
                 {
@@ -578,11 +579,11 @@
                         {
                             if (embeddedNestedField == null)
                             {
-                                embeddedNestedField = MongoDBUtils.getFieldName(mmd);
+                                embeddedNestedField = ec.getStoreManager().getNamingFactory().getColumnName(mmd, ColumnType.COLUMN);
                             }
                             else
                             {
-                                embeddedNestedField += ("." + MongoDBUtils.getFieldName(mmd));
+                                embeddedNestedField += ("." + ec.getStoreManager().getNamingFactory().getColumnName(mmd, ColumnType.COLUMN));
                             }
                         }
                         else

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14451
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=14451&view=rev
Author:   andy_jefferson
Date:     2012-03-22 18:15:44 +0000 (Thu, 22 Mar 2012)
Log Message:
-----------
[NUCMONGODB-68] Apply Chris patch for count()

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/MongoDBQueryCompilation.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java

Added Paths:
-----------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/MongoDBResult.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-03-22 13:45:23 UTC (rev 14450)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-03-22 18:15:44 UTC (rev 14451)
@@ -13,6 +13,7 @@
 limitations under the License.
 
 Contributors:
+2012 Chris Rued - patch for MapReduceCount
    ...
 **********************************************************************/
 package org.datanucleus.store.mongodb;
@@ -52,12 +53,64 @@
 import com.mongodb.DBCollection;
 import com.mongodb.DBCursor;
 import com.mongodb.DBObject;
+import com.mongodb.MapReduceCommand;
+import com.mongodb.MongoException;
+import java.util.LinkedList;
+import java.util.Random;
 
 /**
  * Utilities for MongoDB.
  */
 public class MongoDBUtils
 {
+    private static final String COUNT_QUERY_MAP_JS_FUNCTION_TEMPLATE = "function() { emit(%s,{c:1}); }";
+    private static final String COUNT_QUERY_REDUCE_JS_FUNCTION = 
+            "function(k,v) {"
+            + "    var t=0;"
+            + "    for(var i=0 ; i<v.length ; i++) {"
+            + "        t+=v[i].c;"
+            + "    }"
+            + "    return{c:t}"
+            + "}";
+    private static final Random random = new Random(System.currentTimeMillis());
+
+    public static LinkedList<Long> performMapReduceCount(DB db, BasicDBObject filterObject, Class candidateClass,
+        boolean subclasses, ExecutionContext ec) 
+    throws MongoException 
+    {
+        StoreManager storeMgr = ec.getStoreManager();
+        String groupByJsExpression = String.format("{ countClass : '%s' }", candidateClass.getSimpleName()); // TODO properly support GROUP BY
+        String mapJsFunction = String.format(COUNT_QUERY_MAP_JS_FUNCTION_TEMPLATE, groupByJsExpression);
+        String reduceJsFunction = COUNT_QUERY_REDUCE_JS_FUNCTION;
+        String outputTarget = "dn_mr_" + candidateClass.getSimpleName() + "_" + System.nanoTime() + "_" + random.nextInt(1073676287);
+        for (AbstractClassMetaData cmd : MetaDataUtils.getMetaDataForCandidates(candidateClass, subclasses, ec)) 
+        {
+            String collectionName = storeMgr.getNamingFactory().getTableName(cmd);
+            db.getCollection(collectionName).mapReduce(mapJsFunction, reduceJsFunction, outputTarget, MapReduceCommand.OutputType.REDUCE, filterObject);
+        }
+        LinkedList<Long> results =  new LinkedList<Long>();
+        DBCursor find = db.getCollection(outputTarget).find();
+        try
+        {
+            while (find.hasNext())
+            {
+                DBObject next = find.next();
+                // TODO FOR PROPER GROUP BY SUPPORT, we'll want to add any
+                // result fields, which must be in the GROUP BY and need to
+                // be part of the mapReduce key
+                // String key = String.valueOf(next.get("_id"));
+                BasicDBObject value = (BasicDBObject) next.get("value");
+                results.add(value.getLong("c"));
+            }
+        }
+        finally
+        {
+            find.close();
+            db.getCollection(outputTarget).drop();
+        }
+        return results;
+    }
+
     /**
      * Accessor for the default value specified for the provided member.
      * If no defaultValue is provided on the column then returns null.

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java	2012-03-22 13:45:23 UTC (rev 14450)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java	2012-03-22 18:15:44 UTC (rev 14451)
@@ -280,18 +280,28 @@
                     filterObject = filterExpr.getDBObject();
                 }
 
-                Map<String, Object> options = new HashMap();
-                if (getBooleanExtensionProperty("slave-ok", false))
+                MongoDBResult resultObject = datastoreCompilation.getResult();
+                // TODO properly support GROUP BY
+                if (resultObject != null && resultObject.isCountOnly() && datastoreCompilation.isFilterComplete() && 
+                    grouping == null) 
                 {
-                    options.put("slave-ok", true);
-                }
+                    return MongoDBUtils.performMapReduceCount(db, filterObject, candidateClass, subclasses, ec);
+                } 
+                else 
+                {
+                    Map<String, Object> options = new HashMap();
+                    if (getBooleanExtensionProperty("slave-ok", false))
+                    {
+                        options.put("slave-ok", true);
+                    }
 
-                // Execute as much as possible in the datastore
-                candidates = MongoDBUtils.getObjectsOfCandidateType(ec, db, candidateClass, subclasses,
-                    ignoreCache, getFetchPlan(), filterObject, options);
-                if (filter != null && datastoreCompilation.isFilterComplete())
-                {
-                    filterInMemory = false;
+                    // Execute as much as possible in the datastore
+                    candidates = MongoDBUtils.getObjectsOfCandidateType(ec, db, candidateClass, subclasses,
+                        ignoreCache, getFetchPlan(), filterObject, options);
+                    if (filter != null && datastoreCompilation.isFilterComplete())
+                    {
+                        filterInMemory = false;
+                    }
                 }
             }
 

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java	2012-03-22 13:45:23 UTC (rev 14450)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java	2012-03-22 18:15:44 UTC (rev 14451)
@@ -248,19 +248,29 @@
                 {
                     filterObject = filterExpr.getDBObject();
                 }
-
-                Map<String, Object> options = new HashMap();
-                if (getBooleanExtensionProperty("slave-ok", false))
+                
+                MongoDBResult resultObject = datastoreCompilation.getResult();
+                // TODO properly support GROUP BY
+                if (resultObject != null && resultObject.isCountOnly() && datastoreCompilation.isFilterComplete() && 
+                    grouping == null) 
                 {
-                    options.put("slave-ok", true);
-                }
+                    return MongoDBUtils.performMapReduceCount(db, filterObject, candidateClass, subclasses, ec);
+                } 
+                else 
+                {
+                    Map<String, Object> options = new HashMap();
+                    if (getBooleanExtensionProperty("slave-ok", false))
+                    {
+                        options.put("slave-ok", true);
+                    }
 
-                // Execute as much as possible in the datastore
-                candidates = MongoDBUtils.getObjectsOfCandidateType(ec, db, candidateClass, subclasses,
-                    ignoreCache, getFetchPlan(), filterObject, options);
-                if (filter != null && datastoreCompilation.isFilterComplete())
-                {
-                    filterInMemory = false;
+                    // Execute as much as possible in the datastore
+                    candidates = MongoDBUtils.getObjectsOfCandidateType(ec, db, candidateClass, subclasses,
+                        ignoreCache, getFetchPlan(), filterObject, options);
+                    if (filter != null && datastoreCompilation.isFilterComplete())
+                    {
+                        filterInMemory = false;
+                    }
                 }
             }
 

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/MongoDBQueryCompilation.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/MongoDBQueryCompilation.java	2012-03-22 13:45:23 UTC (rev 14450)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/MongoDBQueryCompilation.java	2012-03-22 18:15:44 UTC (rev 14451)
@@ -17,7 +17,6 @@
 **********************************************************************/
 package org.datanucleus.store.mongodb.query;
 
-import com.mongodb.BasicDBObject;
 import org.datanucleus.store.mongodb.query.expression.MongoBooleanExpression;
 
 /**
@@ -35,7 +34,7 @@
     boolean precompilable = true;
 
     /** Object defining document fields to be returned (if any). */
-    BasicDBObject resultObject;
+    MongoDBResult resultObject;
 
     public MongoDBQueryCompilation()
     {
@@ -81,12 +80,12 @@
         this.resultComplete = complete;
     }
 
-    public void setResult(BasicDBObject result)
+    public void setResult(MongoDBResult result)
     {
         this.resultObject = result;
     }
 
-    public BasicDBObject getResult()
+    public MongoDBResult getResult()
     {
         return resultObject;
     }

Added: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/MongoDBResult.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/MongoDBResult.java	                        (rev 0)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/MongoDBResult.java	2012-03-22 18:15:44 UTC (rev 14451)
@@ -0,0 +1,63 @@
+/**********************************************************************
+Copyright (c) 2012 Chris Rued and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+   ...
+**********************************************************************/
+package org.datanucleus.store.mongodb.query;
+
+import com.mongodb.BasicDBObject;
+
+public class MongoDBResult
+{
+    private boolean countOnly;
+
+    private BasicDBObject mongoDbObject;
+
+    public MongoDBResult()
+    {
+        this(null, false);
+    }
+
+    public MongoDBResult(BasicDBObject mongoDbObject)
+    {
+        this(mongoDbObject, false);
+    }
+
+    public MongoDBResult(BasicDBObject mongoDbObject, boolean countOnly)
+    {
+        this.countOnly = countOnly;
+        this.mongoDbObject = mongoDbObject;
+    }
+
+    public boolean isCountOnly()
+    {
+        return countOnly;
+    }
+
+    public void setCountOnly(boolean countOnly)
+    {
+        this.countOnly = countOnly;
+    }
+
+    public BasicDBObject getMongoDbObject()
+    {
+        return mongoDbObject;
+    }
+
+    public void setMongoDbObject(BasicDBObject mongoDbObject)
+    {
+        this.mongoDbObject = mongoDbObject;
+    }
+}

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java	2012-03-22 13:45:23 UTC (rev 14450)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java	2012-03-22 18:15:44 UTC (rev 14451)
@@ -17,8 +17,6 @@
 **********************************************************************/
 package org.datanucleus.store.mongodb.query;
 
-import com.mongodb.BasicDBObject;
-
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -32,6 +30,7 @@
 import org.datanucleus.query.compiler.QueryCompilation;
 import org.datanucleus.query.evaluator.AbstractExpressionEvaluator;
 import org.datanucleus.query.expression.Expression;
+import org.datanucleus.query.expression.InvokeExpression;
 import org.datanucleus.query.expression.Literal;
 import org.datanucleus.query.expression.ParameterExpression;
 import org.datanucleus.query.expression.PrimaryExpression;
@@ -81,7 +80,7 @@
     boolean resultComplete = true;
 
     /** The result object. If no result is required then this will be null. */
-    BasicDBObject resultObject;
+    MongoDBResult resultObject;
 
     boolean precompilable = true;
 
@@ -119,7 +118,7 @@
         return filterExpr;
     }
 
-    public BasicDBObject getResultObject()
+    public MongoDBResult getResultObject()
     {
         return resultObject;
     }
@@ -196,14 +195,27 @@
         if (compilation.getExprResult() != null)
         {
             compileComponent = CompilationComponent.RESULT;
+            resultObject = new MongoDBResult();
 
-            resultObject = new BasicDBObject();
-
             // Select any result expressions
             Expression[] resultExprs = compilation.getExprResult();
-            for (int i=0;i<resultExprs.length;i++)
+            for (Expression expr :  resultExprs)
             {
-                // TODO Compile this
+                if (expr instanceof InvokeExpression)
+                {
+                    if ("count".equalsIgnoreCase(((InvokeExpression) expr).getOperation()) && resultExprs.length == 1)
+                    {
+                        resultObject.setCountOnly(true);
+                    }
+                    else
+                    {
+                        
+                    }
+                }
+                else
+                {
+                    
+                }
             }
         }
         // TODO Handle distinct
@@ -776,4 +788,4 @@
 
         return null;
     }
-}
\ No newline at end of file
+}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14457
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=14457&view=rev
Author:   andy_jefferson
Date:     2012-03-24 16:25:32 +0000 (Sat, 24 Mar 2012)
Log Message:
-----------
[NUCMONGODB-70] Support read/write counting and insert/update/delete counting for new statistics api

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2012-03-24 16:22:21 UTC (rev 14456)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2012-03-24 16:25:32 UTC (rev 14457)
@@ -173,19 +173,20 @@
                         NucleusLogger.DATASTORE_NATIVE.debug("Persisting objects as " + StringUtils.objectArrayToString(dbObjects));
                     }
                     collection.insert(dbObjects, new WriteConcern(1));
+                    if (ec.getRuntime() != null)
+                    {
+                        ec.getRuntime().incrementNumWrites();
+                        for (int j=0;j<dbObjects.length;j++)
+                        {
+                            ec.getRuntime().incrementInsertCount();
+                        }
+                    }
 
                     if (NucleusLogger.DATASTORE_PERSIST.isDebugEnabled())
                     {
                         NucleusLogger.DATASTORE_PERSIST.debug(LOCALISER.msg("MongoDB.ExecutionTime", 
                             (System.currentTimeMillis() - startTime)));
                     }
-                    if (storeMgr.getRuntimeManager() != null)
-                    {
-                        for (int j=0;j<dbObjects.length;j++)
-                        {
-                            storeMgr.getRuntimeManager().incrementInsertCount();
-                        }
-                    }
                 }
                 catch (MongoException me)
                 {
@@ -243,6 +244,10 @@
 
             NucleusLogger.DATASTORE_NATIVE.debug("Persisting object " + op + " as " + dbObject);
             collection.insert(dbObject, new WriteConcern(1));
+            if (ec.getRuntime() != null)
+            {
+                ec.getRuntime().incrementNumWrites();
+            }
 
             if (cmd.pkUsesIdentityValueGenerator())
             {
@@ -292,6 +297,10 @@
                     op.provideFields(fieldNumbers, fieldManager);
                     NucleusLogger.DATASTORE_NATIVE.debug("Saving object " + op + " as " + dbObject);
                     collection.save(dbObject);
+                    if (ec.getRuntime() != null)
+                    {
+                        ec.getRuntime().incrementNumWrites();
+                    }
                 }
             }
             else
@@ -308,9 +317,9 @@
                 NucleusLogger.DATASTORE_PERSIST.debug(LOCALISER.msg("MongoDB.ExecutionTime", 
                     (System.currentTimeMillis() - startTime)));
             }
-            if (storeMgr.getRuntimeManager() != null)
+            if (ec.getRuntime() != null)
             {
-                storeMgr.getRuntimeManager().incrementInsertCount();
+                ec.getRuntime().incrementInsertCount();
             }
         }
         catch (MongoException me)
@@ -505,18 +514,22 @@
 
             StoreFieldManager fieldManager = new StoreFieldManager(op, dbObject, false);
             op.provideFields(cmd.getAllMemberPositions(), fieldManager);
-            NucleusLogger.DATASTORE_NATIVE.debug("Updating object " + op + " as " + dbObject);
+            if (NucleusLogger.DATASTORE_NATIVE.isDebugEnabled())
+            {
+                NucleusLogger.DATASTORE_NATIVE.debug("Updating object " + op + " as " + dbObject);
+            }
             collection.save(dbObject);
+            if (ec.getRuntime() != null)
+            {
+                ec.getRuntime().incrementNumWrites();
+                ec.getRuntime().incrementUpdateCount();
+            }
 
             if (NucleusLogger.DATASTORE_PERSIST.isDebugEnabled())
             {
                 NucleusLogger.DATASTORE_PERSIST.debug(LOCALISER.msg("MongoDB.ExecutionTime", 
                     (System.currentTimeMillis() - startTime)));
             }
-            if (storeMgr.getRuntimeManager() != null)
-            {
-                storeMgr.getRuntimeManager().incrementUpdateCount();
-            }
         }
         catch (MongoException me)
         {
@@ -578,16 +591,17 @@
 
             // Delete this object
             collection.remove(dbObject);
+            if (ec.getRuntime() != null)
+            {
+                ec.getRuntime().incrementNumWrites();
+                ec.getRuntime().incrementDeleteCount();
+            }
 
             if (NucleusLogger.DATASTORE_PERSIST.isDebugEnabled())
             {
                 NucleusLogger.DATASTORE_PERSIST.debug(LOCALISER.msg("MongoDB.ExecutionTime", 
                     (System.currentTimeMillis() - startTime)));
             }
-            if (storeMgr.getRuntimeManager() != null)
-            {
-                storeMgr.getRuntimeManager().incrementDeleteCount();
-            }
         }
         catch (MongoException me)
         {
@@ -669,9 +683,9 @@
                 NucleusLogger.DATASTORE_RETRIEVE.debug(LOCALISER.msg("MongoDB.ExecutionTime",
                     (System.currentTimeMillis() - startTime)));
             }
-            if (storeMgr.getRuntimeManager() != null)
+            if (ec.getRuntime() != null)
             {
-                storeMgr.getRuntimeManager().incrementFetchCount();
+                ec.getRuntime().incrementFetchCount();
             }
         }
         finally

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-03-24 16:22:21 UTC (rev 14456)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-03-24 16:25:32 UTC (rev 14457)
@@ -90,6 +90,11 @@
         }
         LinkedList<Long> results =  new LinkedList<Long>();
         DBCursor find = db.getCollection(outputTarget).find();
+        if (ec.getRuntime() != null)
+        {
+            // Add to statistics
+            ec.getRuntime().incrementNumReads();
+        }
         try
         {
             while (find.hasNext())
@@ -247,8 +252,17 @@
             }
         }
 
-        NucleusLogger.DATASTORE_RETRIEVE.debug("Retrieving object for " + query);
-        return dbCollection.findOne(query);
+        if (NucleusLogger.DATASTORE_NATIVE.isDebugEnabled())
+        {
+            NucleusLogger.DATASTORE_NATIVE.debug("Retrieving object for " + query);
+        }
+        DBObject dbObj = dbCollection.findOne(query);
+        if (op.getExecutionContext().getRuntime() != null)
+        {
+            // Add to statistics
+            op.getExecutionContext().getRuntime().incrementNumReads();
+        }
+        return dbObj;
     }
 
     /**
@@ -372,6 +386,11 @@
             }
 
             DBCursor curs = dbColl.find(query, fieldsSelection);
+            if (ec.getRuntime() != null)
+            {
+                // Add to statistics
+                ec.getRuntime().incrementNumReads();
+            }
 
             // Add results from this DBCursor and close it
             try

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14516
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=14516&view=rev
Author:   andy_jefferson
Date:     2012-03-29 14:01:31 +0000 (Thu, 29 Mar 2012)
Log Message:
-----------
[NUCMONGODB-73] Add support for determining the inheritance level of an identity

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java	2012-03-29 12:44:19 UTC (rev 14515)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java	2012-03-29 14:01:31 UTC (rev 14516)
@@ -29,6 +29,7 @@
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.NucleusContext;
 import org.datanucleus.exceptions.NucleusException;
+import org.datanucleus.identity.SCOID;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.ClassMetaData;
@@ -39,6 +40,7 @@
 import org.datanucleus.metadata.IndexMetaData;
 import org.datanucleus.metadata.UniqueMetaData;
 import org.datanucleus.store.AbstractStoreManager;
+import org.datanucleus.store.ExecutionContext;
 import org.datanucleus.store.StoreData;
 import org.datanucleus.store.connection.ManagedConnection;
 import org.datanucleus.store.schema.SchemaAwareStoreManager;
@@ -85,6 +87,36 @@
         return set;
     }
 
+    /* (non-Javadoc)
+     * @see org.datanucleus.store.AbstractStoreManager#getClassNameForObjectID(java.lang.Object, org.datanucleus.ClassLoaderResolver, org.datanucleus.store.ExecutionContext)
+     */
+    @Override
+    public String getClassNameForObjectID(Object id, ClassLoaderResolver clr, ExecutionContext ec)
+    {
+        if (id == null)
+        {
+            // User stupidity
+            return null;
+        }
+        else if (id instanceof SCOID)
+        {
+            // Object is a SCOID
+            return ((SCOID) id).getSCOClass();
+        }
+
+        String rootClassName = super.getClassNameForObjectID(id, clr, ec);
+        // TODO Allow for use of users-own PK class in multiple inheritance trees
+        String[] subclasses = getMetaDataManager().getSubclassesForClass(rootClassName, true);
+        if (subclasses == null || subclasses.length == 0)
+        {
+            // No subclasses so no need to go to the datastore
+            return rootClassName;
+        }
+
+        AbstractClassMetaData rootCmd = getMetaDataManager().getMetaDataForClass(rootClassName, clr);
+        return MongoDBUtils.getClassNameForIdentity(id, rootCmd, ec, clr);
+    }
+
     /**
      * Accessor for whether this value strategy is supported.
      * Overrides the superclass to allow for "IDENTITY" since we support it and no entry in plugins for it.

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-03-29 12:44:19 UTC (rev 14515)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-03-29 14:01:31 UTC (rev 14516)
@@ -19,9 +19,12 @@
 package org.datanucleus.store.mongodb;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.bson.types.ObjectId;
 import org.datanucleus.ClassLoaderResolver;
@@ -44,6 +47,7 @@
 import org.datanucleus.store.FieldValues;
 import org.datanucleus.store.ObjectProvider;
 import org.datanucleus.store.StoreManager;
+import org.datanucleus.store.connection.ManagedConnection;
 import org.datanucleus.store.mongodb.fieldmanager.FetchFieldManager;
 import org.datanucleus.store.schema.naming.ColumnType;
 import org.datanucleus.util.NucleusLogger;
@@ -171,6 +175,118 @@
     }
 
     /**
+     * Convenience method that tries to find the object with the specified identity from all DBCollection objects
+     * from the rootCmd and subclasses. Returns the class name of the object with this identity (or null if not found).
+     * @param id The identity
+     * @param rootCmd ClassMetaData for the root class in the inheritance tree
+     * @param ec ExecutionContext
+     * @param clr ClassLoader resolver
+     * @return The class name of the object with this id
+     */
+    public static String getClassNameForIdentity(Object id, AbstractClassMetaData rootCmd, ExecutionContext ec,
+            ClassLoaderResolver clr)
+    {
+        Map<String, Set<String>> classNamesByDbCollectionName = new HashMap<String, Set<String>>();
+        StoreManager storeMgr = ec.getStoreManager();
+        Set rootClassNames = new HashSet<String>();
+        rootClassNames.add(rootCmd.getFullClassName());
+        classNamesByDbCollectionName.put(storeMgr.getNamingFactory().getTableName(rootCmd), rootClassNames);
+        String[] subclassNames = ec.getMetaDataManager().getSubclassesForClass(rootCmd.getFullClassName(), true);
+        if (subclassNames != null)
+        {
+            for (int i=0;i<subclassNames.length;i++)
+            {
+                AbstractClassMetaData cmd = ec.getMetaDataManager().getMetaDataForClass(subclassNames[i], clr);
+                String collName = storeMgr.getNamingFactory().getTableName(cmd);
+                Set<String> classNames = classNamesByDbCollectionName.get(collName);
+                if (classNames == null)
+                {
+                    classNames = new HashSet<String>();
+                    classNamesByDbCollectionName.put(collName, classNames);
+                }
+                classNames.add(cmd.getFullClassName());
+            }
+        }
+
+        ManagedConnection mconn = storeMgr.getConnection(ec);
+        try
+        {
+            DB db = (DB)mconn.getConnection();
+
+            for (String dbCollName : classNamesByDbCollectionName.keySet())
+            {
+                // Check each DBCollection for the id PK field(s)
+                Set<String> classNames = classNamesByDbCollectionName.get(dbCollName);
+                DBCollection dbColl = db.getCollection(dbCollName);
+                BasicDBObject query = new BasicDBObject();
+                if (id instanceof OID)
+                {
+                    // TODO Really ought to use cmd of the class using this dbCollection
+                    Object key = ((OID)id).getKeyValue();
+                    if (rootCmd.getIdentityMetaData().getValueStrategy() == IdentityStrategy.IDENTITY)
+                    {
+                        query.put("_id", new ObjectId((String)key));
+                    }
+                    else
+                    {
+                        query.put(storeMgr.getNamingFactory().getColumnName(rootCmd, ColumnType.DATASTOREID_COLUMN), key);
+                    }
+                }
+                else if (ec.getApiAdapter().isSingleFieldIdentity(id))
+                {
+                    Object key = ec.getApiAdapter().getTargetKeyForSingleFieldIdentity(id);
+                    int[] pkNums = rootCmd.getPKMemberPositions();
+                    AbstractMemberMetaData pkMmd = rootCmd.getMetaDataForManagedMemberAtAbsolutePosition(pkNums[0]);
+                    String pkPropName = storeMgr.getNamingFactory().getColumnName(pkMmd, ColumnType.COLUMN);
+                    query.put(pkPropName, key);
+                }
+                else
+                {
+                    int[] pkNums = rootCmd.getPKMemberPositions();
+                    for (int i=0;i<pkNums.length;i++)
+                    {
+                        AbstractMemberMetaData pkMmd = rootCmd.getMetaDataForManagedMemberAtAbsolutePosition(pkNums[i]);
+                        String pkPropName = storeMgr.getNamingFactory().getColumnName(pkMmd, ColumnType.COLUMN);
+                        Object pkVal = IdentityUtils.getValueForMemberInId(id, pkMmd);
+                        query.put(pkPropName, pkVal);
+                    }
+                }
+
+                if (NucleusLogger.DATASTORE_NATIVE.isDebugEnabled())
+                {
+                    NucleusLogger.DATASTORE_NATIVE.debug("Retrieving object for " + query + " from DBCollection with name " + dbCollName);
+                }
+                DBObject foundObj = dbColl.findOne(query);
+                if (ec.getStatistics() != null)
+                {
+                    // Add to statistics
+                    ec.getStatistics().incrementNumReads();
+                }
+
+                if (foundObj != null)
+                {
+                    if (classNames.size() == 1)
+                    {
+                        // Only one candidate so return it
+                        return classNames.iterator().next();
+                    }
+                    else
+                    {
+                        String disPropName = storeMgr.getNamingFactory().getColumnName(rootCmd, ColumnType.DISCRIMINATOR_COLUMN);
+                        String discValue = (String)foundObj.get(disPropName);
+                        return MetaDataUtils.getClassNameFromDiscriminatorValue(discValue, rootCmd.getDiscriminatorMetaData(), ec);
+                    }
+                }
+            }
+        }
+        finally
+        {
+            mconn.release();
+        }
+        return null;
+    }
+
+    /**
      * Method to return the DBObject that equates to the provided object.
      * @param dbCollection The collection in which it is stored
      * @param op The ObjectProvider

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14577
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=14577&view=rev
Author:   andy_jefferson
Date:     2012-04-10 11:18:52 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
[NUCMONGODB-76] Support for nondurable identity

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2012-04-09 17:24:29 UTC (rev 14576)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2012-04-10 11:18:52 UTC (rev 14577)
@@ -476,7 +476,7 @@
             }
 
             DBCollection collection = db.getCollection(storeMgr.getNamingFactory().getTableName(cmd));
-            DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, op, true);
+            DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, op, true, true);
             if (dbObject == null)
             {
                 if (cmd.isVersioned())
@@ -588,7 +588,7 @@
             }
 
             DBCollection collection = db.getCollection(storeMgr.getNamingFactory().getTableName(cmd));
-            DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, op, true);
+            DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, op, true, false);
             if (dbObject == null)
             {
                 if (cmd.isVersioned())
@@ -666,7 +666,7 @@
             }
 
             DBCollection collection = db.getCollection(storeMgr.getNamingFactory().getTableName(cmd));
-            DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, op, false);
+            DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, op, false, false);
             if (dbObject == null)
             {
                 throw new NucleusObjectNotFoundException("Could not find object with id " + op.getInternalObjectId() + " op="+op);
@@ -738,7 +738,7 @@
             {
                 DB db = (DB)mconn.getConnection();
                 DBCollection collection = db.getCollection(storeMgr.getNamingFactory().getTableName(cmd));
-                DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, op, false);
+                DBObject dbObject = MongoDBUtils.getObjectForObjectProvider(collection, op, false, false);
                 if (dbObject == null)
                 {
                     throw new NucleusObjectNotFoundException();

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-04-09 17:24:29 UTC (rev 14576)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-04-10 11:18:52 UTC (rev 14577)
@@ -291,9 +291,11 @@
      * @param dbCollection The collection in which it is stored
      * @param op The ObjectProvider
      * @param checkVersion Whether to also check for a particular version
+     * @param originalValue Whether to use the original value of fields (when using nondurable id and doing update).
      * @return The object (or null if not found)
      */
-    public static DBObject getObjectForObjectProvider(DBCollection dbCollection, ObjectProvider op, boolean checkVersion)
+    public static DBObject getObjectForObjectProvider(DBCollection dbCollection, ObjectProvider op, boolean checkVersion,
+            boolean originalValue)
     {
         // Build query object to use as template for the find
         BasicDBObject query = new BasicDBObject();
@@ -302,7 +304,7 @@
 
         if (cmd.getIdentityType() == IdentityType.APPLICATION)
         {
-            // Add PK field(s) to the query object
+            // Application id - Add PK field(s) to the query object
             int[] pkPositions = cmd.getPKMemberPositions();
             for (int i=0;i<pkPositions.length;i++)
             {
@@ -325,7 +327,7 @@
         }
         else if (cmd.getIdentityType() == IdentityType.DATASTORE)
         {
-            // Add PK field to the query object
+            // Datastore id - Add "id" field to the query object
             OID oid = (OID) op.getObjectId();
             if (oid == null && cmd.getIdentityMetaData().getValueStrategy() == IdentityStrategy.IDENTITY)
             {
@@ -344,7 +346,34 @@
         }
         else
         {
-            // TODO Add all fields for nondurable
+            // Nondurable - Add all basic field(s) to the query object
+            int[] fieldNumbers = cmd.getAllMemberPositions();
+            for (int i=0;i<fieldNumbers.length;i++)
+            {
+                AbstractMemberMetaData mmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(fieldNumbers[i]);
+                int relationType = mmd.getRelationType(op.getExecutionContext().getClassLoaderResolver());
+                if (relationType == Relation.NONE)
+                {
+                    Object fieldValue = null;
+                    if (originalValue)
+                    {
+                        Object oldValue = op.getAssociatedValue("FIELD_VALUE.ORIGINAL." + fieldNumbers[i]);
+                        if (oldValue != null)
+                        {
+                            fieldValue = oldValue;
+                        }
+                        else
+                        {
+                            fieldValue = op.provideField(fieldNumbers[i]);
+                        }
+                    }
+                    else
+                    {
+                        fieldValue = op.provideField(fieldNumbers[i]);
+                    }
+                    query.put(storeMgr.getNamingFactory().getColumnName(mmd, ColumnType.COLUMN), fieldValue);
+                }
+            }
         }
 
         if (cmd.hasDiscriminatorStrategy())

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 14850
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=14850&view=rev
Author:   andy_jefferson
Date:     2012-06-15 07:20:36 +0000 (Fri, 15 Jun 2012)
Log Message:
-----------
[NUCMONGODB-80] Patch for support for query range

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-06-14 13:02:43 UTC (rev 14849)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-06-15 07:20:36 UTC (rev 14850)
@@ -380,6 +380,13 @@
         return dbObj;
     }
 
+    public static List getObjectsOfCandidateType(ExecutionContext ec, DB db, Class candidateClass, 
+            boolean subclasses, boolean ignoreCache, FetchPlan fp, BasicDBObject filterObject,
+            Map<String, Object> options)
+    {
+        return getObjectsOfCandidateType(ec, db, candidateClass, subclasses, ignoreCache, fp, filterObject, options, null, null);
+    }
+    
     /**
      * Convenience method to return all objects of the candidate type (optionally allowing subclasses).
      * @param ec Execution context
@@ -394,7 +401,7 @@
      */
     public static List getObjectsOfCandidateType(ExecutionContext ec, DB db, Class candidateClass, 
             boolean subclasses, boolean ignoreCache, FetchPlan fp, BasicDBObject filterObject,
-            Map<String, Object> options)
+            Map<String, Object> options, Integer skip, Integer limit)
     {
         List<AbstractClassMetaData> cmds = 
             MetaDataUtils.getMetaDataForCandidates(candidateClass, subclasses, ec);
@@ -508,6 +515,15 @@
             }
 
             // Add results from this DBCursor and close it
+            // TODO Pass this into a MongoDBCandidateList rather than manually loading all here
+            if (skip != null && skip > 0)
+            {
+                curs = curs.skip(skip);
+            }
+            if (limit != null && limit > 0)
+            {
+                curs = curs.limit(limit);
+            }
             try
             {
                 while (curs.hasNext())

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java	2012-06-14 13:02:43 UTC (rev 14849)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java	2012-06-15 07:20:36 UTC (rev 14850)
@@ -296,8 +296,16 @@
                     }
 
                     // Execute as much as possible in the datastore
-                    candidates = MongoDBUtils.getObjectsOfCandidateType(ec, db, candidateClass, subclasses,
-                        ignoreCache, getFetchPlan(), filterObject, options);
+                    if (ordering == null)
+                    {
+                        candidates = MongoDBUtils.getObjectsOfCandidateType(ec, db, candidateClass, subclasses, ignoreCache,
+                            getFetchPlan(), filterObject, options, (int) this.fromInclNo - 1, (int) (this.toExclNo - this.fromInclNo));
+                    }
+                    else
+                    {
+                        candidates = MongoDBUtils.getObjectsOfCandidateType(ec, db, candidateClass, subclasses, ignoreCache,
+                            getFetchPlan(), filterObject, options);
+                    }
                     if (filter != null && datastoreCompilation.isFilterComplete())
                     {
                         filterInMemory = false;

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java	2012-06-14 13:02:43 UTC (rev 14849)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java	2012-06-15 07:20:36 UTC (rev 14850)
@@ -265,8 +265,16 @@
                     }
 
                     // Execute as much as possible in the datastore
-                    candidates = MongoDBUtils.getObjectsOfCandidateType(ec, db, candidateClass, subclasses,
-                        ignoreCache, getFetchPlan(), filterObject, options);
+                    if (ordering == null)
+                    {
+                        candidates = MongoDBUtils.getObjectsOfCandidateType(ec, db, candidateClass, subclasses, ignoreCache,
+                            getFetchPlan(), filterObject, options, (int) this.fromInclNo - 1, (int) (this.toExclNo - this.fromInclNo));
+                    }
+                    else
+                    {
+                        candidates = MongoDBUtils.getObjectsOfCandidateType(ec, db, candidateClass, subclasses, ignoreCache,
+                            getFetchPlan(), filterObject, options);
+                    }
                     if (filter != null && datastoreCompilation.isFilterComplete())
                     {
                         filterInMemory = false;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15172
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15172&view=rev
Author:   andy_jefferson
Date:     2012-07-18 06:41:51 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
[NUCMONDODB-87] Allow for NATIVE strategy implying IDENTITY

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2012-07-18 05:47:15 UTC (rev 15171)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2012-07-18 06:41:51 UTC (rev 15172)
@@ -44,7 +44,6 @@
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.DiscriminatorMetaData;
 import org.datanucleus.metadata.DiscriminatorStrategy;
-import org.datanucleus.metadata.IdentityStrategy;
 import org.datanucleus.metadata.IdentityType;
 import org.datanucleus.metadata.VersionMetaData;
 import org.datanucleus.metadata.VersionStrategy;
@@ -342,8 +341,7 @@
         DBObject dbObject = new BasicDBObject();
         AbstractClassMetaData cmd = op.getClassMetaData();
 
-        if (cmd.getIdentityType() == IdentityType.DATASTORE &&
-            cmd.getIdentityMetaData().getValueStrategy() != IdentityStrategy.IDENTITY)
+        if (cmd.getIdentityType() == IdentityType.DATASTORE && !storeMgr.isStrategyDatastoreAttributed(cmd, -1))
         {
             // Add surrogate datastore identity field (if using identity then just uses "_id" MongoDB special)
             String fieldName = storeMgr.getNamingFactory().getColumnName(cmd, ColumnType.DATASTOREID_COLUMN);

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-07-18 05:47:15 UTC (rev 15171)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-07-18 06:41:51 UTC (rev 15172)
@@ -38,7 +38,6 @@
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.ColumnMetaData;
 import org.datanucleus.metadata.EmbeddedMetaData;
-import org.datanucleus.metadata.IdentityStrategy;
 import org.datanucleus.metadata.IdentityType;
 import org.datanucleus.metadata.MetaDataUtils;
 import org.datanucleus.metadata.Relation;
@@ -189,7 +188,7 @@
                 {
                     // TODO Really ought to use cmd of the class using this dbCollection
                     Object key = ((OID)id).getKeyValue();
-                    if (rootCmd.getIdentityMetaData().getValueStrategy() == IdentityStrategy.IDENTITY)
+                    if (storeMgr.isStrategyDatastoreAttributed(rootCmd, -1))
                     {
                         query.put("_id", new ObjectId((String)key));
                     }
@@ -276,12 +275,12 @@
             {
                 AbstractMemberMetaData pkMmd = cmd.getMetaDataForManagedMemberAtAbsolutePosition(pkPositions[i]);
                 Object value = op.provideField(pkPositions[i]);
-                if (value == null && pkMmd.getValueStrategy() == IdentityStrategy.IDENTITY)
+                if (value == null && storeMgr.isStrategyDatastoreAttributed(cmd, pkPositions[i]))
                 {
                     // PK field not yet set, so return null (needs to be attributed in the datastore)
                     return null;
                 }
-                if (pkMmd.getValueStrategy() == IdentityStrategy.IDENTITY)
+                if (storeMgr.isStrategyDatastoreAttributed(cmd, pkPositions[i]))
                 {
                     query.put("_id", new ObjectId((String)value));
                 }
@@ -295,13 +294,13 @@
         {
             // Datastore id - Add "id" field to the query object
             OID oid = (OID) op.getObjectId();
-            if (oid == null && cmd.getIdentityMetaData().getValueStrategy() == IdentityStrategy.IDENTITY)
+            if (oid == null && storeMgr.isStrategyDatastoreAttributed(cmd, -1))
             {
                 // Not yet set, so return null (needs to be attributed in the datastore)
                 return null;
             }
             Object value = oid.getKeyValue();
-            if (cmd.getIdentityMetaData().getValueStrategy() == IdentityStrategy.IDENTITY)
+            if (storeMgr.isStrategyDatastoreAttributed(cmd, -1))
             {
                 query.put("_id", new ObjectId((String)value));
             }
@@ -629,7 +628,7 @@
     {
         Object idKey = null;
         StoreManager storeMgr = ec.getStoreManager();
-        if (cmd.getIdentityMetaData().getValueStrategy() == IdentityStrategy.IDENTITY)
+        if (storeMgr.isStrategyDatastoreAttributed(cmd, -1))
         {
             idKey = dbObject.get("_id");
             if (idKey instanceof ObjectId)
@@ -641,6 +640,7 @@
         {
             idKey = dbObject.get(storeMgr.getNamingFactory().getColumnName(cmd, ColumnType.DATASTOREID_COLUMN));
         }
+
         OID oid = OIDFactory.getInstance(ec.getNucleusContext(), cmd.getFullClassName(), idKey);
         Class type = ec.getClassLoaderResolver().classForName(cmd.getFullClassName());
         Object pc = ec.findObject(oid, 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15173
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15173&view=rev
Author:   andy_jefferson
Date:     2012-07-18 07:08:23 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
[NUCMONGODB-88] Split off method to generate the value to store from the raw value.

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-07-18 06:41:51 UTC (rev 15172)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-07-18 07:08:23 UTC (rev 15173)
@@ -19,6 +19,8 @@
 package org.datanucleus.store.mongodb;
 
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -49,6 +51,7 @@
 import org.datanucleus.store.connection.ManagedConnection;
 import org.datanucleus.store.mongodb.fieldmanager.FetchFieldManager;
 import org.datanucleus.store.schema.naming.ColumnType;
+import org.datanucleus.store.types.converters.TypeConverter;
 import org.datanucleus.util.NucleusLogger;
 
 import com.mongodb.BasicDBObject;
@@ -286,7 +289,13 @@
                 }
                 else
                 {
-                    query.put(storeMgr.getNamingFactory().getColumnName(pkMmd, ColumnType.COLUMN), value);
+                    ColumnMetaData colmd = null;
+                    if (pkMmd.getColumnMetaData() != null && pkMmd.getColumnMetaData().length > 0)
+                    {
+                        colmd = pkMmd.getColumnMetaData()[0];
+                    }
+                    Object storeValue = MongoDBUtils.getStoredValueForField(op.getExecutionContext(), colmd, value);
+                    query.put(storeMgr.getNamingFactory().getColumnName(pkMmd, ColumnType.COLUMN), storeValue);
                 }
             }
         }
@@ -336,7 +345,13 @@
                     {
                         fieldValue = op.provideField(fieldNumbers[i]);
                     }
-                    query.put(storeMgr.getNamingFactory().getColumnName(mmd, ColumnType.COLUMN), fieldValue);
+                    ColumnMetaData colmd = null;
+                    if (mmd.getColumnMetaData() != null && mmd.getColumnMetaData().length > 0)
+                    {
+                        colmd = mmd.getColumnMetaData()[0];
+                    }
+                    Object storeValue = MongoDBUtils.getStoredValueForField(op.getExecutionContext(), colmd, fieldValue);
+                    query.put(storeMgr.getNamingFactory().getColumnName(mmd, ColumnType.COLUMN), storeValue);
                 }
             }
         }
@@ -727,4 +742,53 @@
         }
         return pc;
     }
+
+    /**
+     * Convenience method to convert the raw value of an object field into the value that will be stored
+     * in MongoDB. Note that this does not cater for relation fields, just basic fields.
+     * @param ec ExecutionContext
+     * @param colmd Metadata for the column (if any). This is used to decide if persisting enums as numeric/string etc
+     * @param value The raw value for the field
+     * @return The value to store
+     */
+    public static Object getStoredValueForField(ExecutionContext ec, ColumnMetaData colmd, Object value)
+    {
+        if (value == null)
+        {
+            return null;
+        }
+
+        // TODO Cater for Collection<non-PC>
+        if (Enum.class.isAssignableFrom(value.getClass()))
+        {
+            boolean useNumeric = MetaDataUtils.persistColumnAsNumeric(colmd);
+            return useNumeric ? ((Enum)value).ordinal() : ((Enum)value).name();
+        }
+        else if (Date.class.isAssignableFrom(value.getClass()))
+        {
+            // store as-is
+            return value;
+        }
+        else if (Calendar.class.isAssignableFrom(value.getClass()))
+        {
+            return ((Calendar)value).getTime();
+        }
+
+        // Fallback to built-in type converters
+        TypeConverter strConv = ec.getTypeManager().getTypeConverterForType(value.getClass(), String.class);
+        TypeConverter longConv = ec.getTypeManager().getTypeConverterForType(value.getClass(), Long.class);
+        if (strConv != null)
+        {
+            // store as a String
+            return strConv.toDatastoreType(value);
+        }
+        else if (longConv != null)
+        {
+            // store as a Long
+            return longConv.toDatastoreType(value);
+        }
+
+        // store as the raw value
+        return value;
+    }
 }
\ No newline at end of file

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2012-07-18 06:41:51 UTC (rev 15172)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2012-07-18 07:08:23 UTC (rev 15173)
@@ -22,9 +22,7 @@
 import java.io.ObjectOutputStream;
 import java.lang.reflect.Array;
 import java.util.ArrayList;
-import java.util.Calendar;
 import java.util.Collection;
-import java.util.Date;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
@@ -41,12 +39,12 @@
 import org.datanucleus.metadata.DiscriminatorMetaData;
 import org.datanucleus.metadata.DiscriminatorStrategy;
 import org.datanucleus.metadata.IdentityStrategy;
-import org.datanucleus.metadata.MetaDataUtils;
 import org.datanucleus.metadata.Relation;
 import org.datanucleus.store.ExecutionContext;
 import org.datanucleus.store.ObjectProvider;
 import org.datanucleus.store.fieldmanager.AbstractStoreFieldManager;
 import org.datanucleus.store.fieldmanager.FieldManager;
+import org.datanucleus.store.mongodb.MongoDBUtils;
 import org.datanucleus.store.schema.naming.ColumnType;
 import org.datanucleus.store.types.TypeManager;
 import org.datanucleus.store.types.converters.TypeConverter;
@@ -663,44 +661,7 @@
     protected void processContainerNonRelationField(String fieldName, ExecutionContext ec, Object value, 
             DBObject dbObject, ColumnMetaData colmd)
     {
-        // TODO Cater for Collection<non-PC>
-        if (Enum.class.isAssignableFrom(value.getClass()))
-        {
-            boolean useNumeric = MetaDataUtils.persistColumnAsNumeric(colmd);
-            dbObject.put(fieldName, useNumeric ? ((Enum)value).ordinal() : ((Enum)value).name());
-            return;
-        }
-        else if (Date.class.isAssignableFrom(value.getClass()))
-        {
-            // Persist as Date
-            dbObject.put(fieldName, (Date)value);
-            return;
-        }
-        else if (Calendar.class.isAssignableFrom(value.getClass()))
-        {
-            Date dateValue = ((Calendar)value).getTime();
-            dbObject.put(fieldName, dateValue);
-            return;
-        }
-
-        // Fallback to built-in type converters
-        TypeConverter strConv = ec.getTypeManager().getTypeConverterForType(value.getClass(), String.class);
-        TypeConverter longConv = ec.getTypeManager().getTypeConverterForType(value.getClass(), Long.class);
-        if (strConv != null)
-        {
-            // Persist as a String
-            String strValue = (String) strConv.toDatastoreType(value);
-            dbObject.put(fieldName, strValue);
-        }
-        else if (longConv != null)
-        {
-            // Persist as a Long
-            Long longValue = (Long) longConv.toDatastoreType(value);
-            dbObject.put(fieldName, longValue);
-        }
-        else
-        {
-            dbObject.put(fieldName, value);
-        }
+        Object storeValue = MongoDBUtils.getStoredValueForField(ec, colmd, value);
+        dbObject.put(fieldName, storeValue);
     }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15175
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15175&view=rev
Author:   andy_jefferson
Date:     2012-07-18 07:57:35 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
add flexibility to type handling so we allow for object wrappers when looking for any type converters

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-07-18 07:33:20 UTC (rev 15174)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-07-18 07:57:35 UTC (rev 15175)
@@ -40,6 +40,7 @@
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.ColumnMetaData;
 import org.datanucleus.metadata.EmbeddedMetaData;
+import org.datanucleus.metadata.FieldRole;
 import org.datanucleus.metadata.IdentityType;
 import org.datanucleus.metadata.MetaDataUtils;
 import org.datanucleus.metadata.Relation;
@@ -289,12 +290,7 @@
                 }
                 else
                 {
-                    ColumnMetaData colmd = null;
-                    if (pkMmd.getColumnMetaData() != null && pkMmd.getColumnMetaData().length > 0)
-                    {
-                        colmd = pkMmd.getColumnMetaData()[0];
-                    }
-                    Object storeValue = MongoDBUtils.getStoredValueForField(op.getExecutionContext(), colmd, value);
+                    Object storeValue = MongoDBUtils.getStoredValueForField(op.getExecutionContext(), pkMmd, value, FieldRole.ROLE_FIELD);
                     query.put(storeMgr.getNamingFactory().getColumnName(pkMmd, ColumnType.COLUMN), storeValue);
                 }
             }
@@ -345,12 +341,8 @@
                     {
                         fieldValue = op.provideField(fieldNumbers[i]);
                     }
-                    ColumnMetaData colmd = null;
-                    if (mmd.getColumnMetaData() != null && mmd.getColumnMetaData().length > 0)
-                    {
-                        colmd = mmd.getColumnMetaData()[0];
-                    }
-                    Object storeValue = MongoDBUtils.getStoredValueForField(op.getExecutionContext(), colmd, fieldValue);
+
+                    Object storeValue = MongoDBUtils.getStoredValueForField(op.getExecutionContext(), mmd, fieldValue, FieldRole.ROLE_FIELD);
                     query.put(storeMgr.getNamingFactory().getColumnName(mmd, ColumnType.COLUMN), storeValue);
                 }
             }
@@ -747,36 +739,48 @@
      * Convenience method to convert the raw value of an object field into the value that will be stored
      * in MongoDB. Note that this does not cater for relation fields, just basic fields.
      * @param ec ExecutionContext
-     * @param colmd Metadata for the column (if any). This is used to decide if persisting enums as numeric/string etc
+     * @param mmd Metadata for the field holding this value
      * @param value The raw value for the field
+     * @param role The role of this value for the field TODO Make use of this
      * @return The value to store
      */
-    public static Object getStoredValueForField(ExecutionContext ec, ColumnMetaData colmd, Object value)
+    public static Object getStoredValueForField(ExecutionContext ec, AbstractMemberMetaData mmd, Object value, int fieldRole)
     {
         if (value == null)
         {
             return null;
         }
 
+        Class type = value.getClass();
+        if (mmd != null)
+        {
+            type = mmd.getType();
+        }
+
         // TODO Cater for Collection<non-PC>
-        if (Enum.class.isAssignableFrom(value.getClass()))
+        if (Enum.class.isAssignableFrom(type))
         {
+            ColumnMetaData colmd = null;
+            if (mmd != null && mmd.getColumnMetaData() != null && mmd.getColumnMetaData().length > 0)
+            {
+                colmd = mmd.getColumnMetaData()[0];
+            }
             boolean useNumeric = MetaDataUtils.persistColumnAsNumeric(colmd);
             return useNumeric ? ((Enum)value).ordinal() : ((Enum)value).name();
         }
-        else if (Date.class.isAssignableFrom(value.getClass()))
+        else if (Date.class.isAssignableFrom(type))
         {
             // store as-is
             return value;
         }
-        else if (Calendar.class.isAssignableFrom(value.getClass()))
+        else if (Calendar.class.isAssignableFrom(type))
         {
             return ((Calendar)value).getTime();
         }
 
         // Fallback to built-in type converters
-        TypeConverter strConv = ec.getTypeManager().getTypeConverterForType(value.getClass(), String.class);
-        TypeConverter longConv = ec.getTypeManager().getTypeConverterForType(value.getClass(), Long.class);
+        TypeConverter strConv = ec.getTypeManager().getTypeConverterForType(type, String.class);
+        TypeConverter longConv = ec.getTypeManager().getTypeConverterForType(type, Long.class);
         if (strConv != null)
         {
             // store as a String

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java	2012-07-18 07:33:20 UTC (rev 15174)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java	2012-07-18 07:57:35 UTC (rev 15175)
@@ -21,7 +21,7 @@
 import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
-import org.datanucleus.metadata.ColumnMetaData;
+import org.datanucleus.metadata.FieldRole;
 import org.datanucleus.metadata.Relation;
 import org.datanucleus.store.ExecutionContext;
 import org.datanucleus.store.ObjectProvider;
@@ -119,12 +119,7 @@
         }
         else
         {
-            ColumnMetaData colmd = null;
-            if (embMmd.getColumnMetaData() != null)
-            {
-                colmd = embMmd.getColumnMetaData()[0];
-            }
-            processContainerNonRelationField(fieldName, ec, value, dbObject, colmd);
+            processContainerNonRelationField(fieldName, ec, value, dbObject, embMmd, FieldRole.ROLE_FIELD);
         }
     }
 }
\ No newline at end of file

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2012-07-18 07:33:20 UTC (rev 15174)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2012-07-18 07:57:35 UTC (rev 15175)
@@ -35,9 +35,9 @@
 import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
-import org.datanucleus.metadata.ColumnMetaData;
 import org.datanucleus.metadata.DiscriminatorMetaData;
 import org.datanucleus.metadata.DiscriminatorStrategy;
+import org.datanucleus.metadata.FieldRole;
 import org.datanucleus.metadata.IdentityStrategy;
 import org.datanucleus.metadata.Relation;
 import org.datanucleus.store.ExecutionContext;
@@ -482,7 +482,7 @@
 
                         if (keyCmd == null)
                         {
-                            processContainerNonRelationField("key", ec, entry.getKey(), entryObj, null);
+                            processContainerNonRelationField("key", ec, entry.getKey(), entryObj, mmd, FieldRole.ROLE_MAP_KEY);
                         }
                         else
                         {
@@ -497,7 +497,7 @@
 
                         if (valCmd == null)
                         {
-                            processContainerNonRelationField("value", ec, entry.getValue(), entryObj, null);
+                            processContainerNonRelationField("value", ec, entry.getValue(), entryObj, mmd, FieldRole.ROLE_MAP_VALUE);
                         }
                         else
                         {
@@ -553,12 +553,7 @@
             }
             else
             {
-                ColumnMetaData colmd = null;
-                if (mmd.getColumnMetaData() != null && mmd.getColumnMetaData().length > 0)
-                {
-                    colmd = mmd.getColumnMetaData()[0];
-                }
-                processContainerNonRelationField(fieldName, ec, value, dbObject, colmd);
+                processContainerNonRelationField(fieldName, ec, value, dbObject, mmd, FieldRole.ROLE_FIELD);
             }
             op.wrapSCOField(fieldNumber, value, false, false, true);
         }
@@ -609,7 +604,7 @@
                 }
                 else
                 {
-                    processContainerNonRelationField("key", ec, mapKey, entryObj, null);
+                    processContainerNonRelationField("key", ec, mapKey, entryObj, mmd, FieldRole.ROLE_MAP_KEY);
                 }
 
                 if (ec.getApiAdapter().isPersistable(mapValue))
@@ -620,7 +615,7 @@
                 }
                 else
                 {
-                    processContainerNonRelationField("value", ec, mapValue, entryObj, null);
+                    processContainerNonRelationField("value", ec, mapValue, entryObj, mmd, FieldRole.ROLE_MAP_VALUE);
                 }
 
                 collEntries.add(entryObj);
@@ -659,9 +654,9 @@
     }
 
     protected void processContainerNonRelationField(String fieldName, ExecutionContext ec, Object value, 
-            DBObject dbObject, ColumnMetaData colmd)
+            DBObject dbObject, AbstractMemberMetaData mmd, int fieldRole)
     {
-        Object storeValue = MongoDBUtils.getStoredValueForField(ec, colmd, value);
+        Object storeValue = MongoDBUtils.getStoredValueForField(ec, mmd, value, fieldRole);
         dbObject.put(fieldName, storeValue);
     }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15183
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15183&view=rev
Author:   andy_jefferson
Date:     2012-07-18 10:06:02 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
type handling

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-07-18 10:02:34 UTC (rev 15182)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-07-18 10:06:02 UTC (rev 15183)
@@ -71,7 +71,7 @@
 public class MongoDBUtils
 {
     public static List<Long> performMongoCount(DB db, BasicDBObject filterObject, Class candidateClass,
-        boolean subclasses, ExecutionContext ec) 
+        boolean subclasses, ExecutionContext ec)
     throws MongoException 
     {
         StoreManager storeMgr = ec.getStoreManager();
@@ -819,6 +819,11 @@
         {
             return ((Calendar)value).getTime();
         }
+        else if (Character.class.isAssignableFrom(type))
+        {
+            // store as String
+            return "" + value;
+        }
 
         // Fallback to built-in type converters
         TypeConverter strConv = ec.getTypeManager().getTypeConverterForType(type, String.class);

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2012-07-18 10:02:34 UTC (rev 15182)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2012-07-18 10:06:02 UTC (rev 15183)
@@ -124,7 +124,7 @@
         }
 
         Object value = dbObject.get(fieldName);
-        return ((Byte)value).byteValue();
+        return ((Number)value).byteValue();
     }
 
     @Override
@@ -143,7 +143,7 @@
         }
 
         Object value = dbObject.get(fieldName);
-        return ((Character)value).charValue();
+        return ((String)value).charAt(0);
     }
 
     @Override
@@ -162,22 +162,7 @@
         }
 
         Object value = dbObject.get(fieldName);
-        if (value instanceof Float)
-        {
-            return ((Float)value).doubleValue();
-        }
-        else if (value instanceof Long)
-        {
-            return ((Long)value).doubleValue();
-        }
-        else if (value instanceof Integer)
-        {
-            return ((Integer)value).doubleValue();
-        }
-        else
-        {
-            return ((Double)value).doubleValue();
-        }
+        return ((Number)value).doubleValue();
     }
 
     @Override
@@ -196,22 +181,7 @@
         }
 
         Object value = dbObject.get(fieldName);
-        if (value instanceof Double)
-        {
-            return ((Double)value).floatValue();
-        }
-        else if (value instanceof Long)
-        {
-            return ((Long)value).floatValue();
-        }
-        else if (value instanceof Integer)
-        {
-            return ((Integer)value).floatValue();
-        }
-        else
-        {
-            return ((Float)value).floatValue();
-        }
+        return ((Number)value).floatValue();
     }
 
     @Override
@@ -230,26 +200,7 @@
         }
 
         Object value = dbObject.get(fieldName);
-        if (value instanceof Short)
-        {
-            return ((Short)value).intValue();
-        }
-        else if (value instanceof Float)
-        {
-            return ((Float)value).intValue();
-        }
-        else if (value instanceof Double)
-        {
-            return ((Double)value).intValue();
-        }
-        else if (value instanceof Long)
-        {
-            return ((Long)value).intValue();
-        }
-        else
-        {
-            return ((Integer)value).intValue();
-        }
+        return ((Number)value).intValue();
     }
 
     @Override
@@ -268,26 +219,7 @@
         }
 
         Object value = dbObject.get(fieldName);
-        if (value instanceof Short)
-        {
-            return ((Short)value).longValue();
-        }
-        else if (value instanceof Float)
-        {
-            return ((Float)value).longValue();
-        }
-        else if (value instanceof Double)
-        {
-            return ((Double)value).longValue();
-        }
-        else if (value instanceof Integer)
-        {
-            return ((Integer)value).longValue();
-        }
-        else
-        {
-            return ((Long)value).longValue();
-        }
+        return ((Number)value).longValue();
     }
 
     @Override
@@ -306,26 +238,7 @@
         }
 
         Object value = dbObject.get(fieldName);
-        if (value instanceof Long)
-        {
-            return ((Long)value).shortValue();
-        }
-        else if (value instanceof Float)
-        {
-            return ((Float)value).shortValue();
-        }
-        else if (value instanceof Double)
-        {
-            return ((Double)value).shortValue();
-        }
-        else if (value instanceof Integer)
-        {
-            return ((Integer)value).shortValue();
-        }
-        else
-        {
-            return ((Short)value).shortValue();
-        }
+        return ((Number)value).shortValue();
     }
 
     @Override
@@ -814,7 +727,12 @@
             boolean changeDetected = false;
             while (idIter.hasNext())
             {
-                // TODO handle Collection<interface>
+                if (elemCmd == null)
+                {
+                    // TODO handle Collection<interface>
+                    throw new NucleusUserException("We do not currently support the field type of " + mmd.getFullFieldName() +
+                        " which has a collection of interdeterminate element type (e.g interface or Object element types)");
+                }
                 String elementIdStr = (String)idIter.next();
                 try
                 {
@@ -957,6 +875,14 @@
             TypeConverter conv = ec.getNucleusContext().getTypeManager().getTypeConverterForName(mmd.getTypeConverterName());
             return conv.toMemberType(value);
         }
+        else if (Character.class.isAssignableFrom(mmd.getType()))
+        {
+            if (value instanceof Character)
+            {
+                return value;
+            }
+            return ((String)value).charAt(0);
+        }
         else if (Short.class.isAssignableFrom(mmd.getType()))
         {
             if (value instanceof Short)
@@ -1016,6 +942,60 @@
                 return Enum.valueOf(mmd.getType(), (String)value);
             }
         }
+        else if (java.sql.Date.class.isAssignableFrom(mmd.getType()) && value instanceof Date)
+        {
+            java.sql.Date sqlDate = null;
+            if (value instanceof java.sql.Date)
+            {
+                sqlDate = (java.sql.Date) value;
+            }
+            else
+            {
+                sqlDate = new java.sql.Date(((Date)value).getTime());
+            }
+            if (op != null)
+            {
+                // Wrap if SCO
+                return op.wrapSCOField(mmd.getAbsoluteFieldNumber(), sqlDate, false, false, true);
+            }
+            return sqlDate;
+        }
+        else if (java.sql.Time.class.isAssignableFrom(mmd.getType()) && value instanceof Date)
+        {
+            java.sql.Time sqlTime = null;
+            if (value instanceof java.sql.Time)
+            {
+                sqlTime = (java.sql.Time) value;
+            }
+            else
+            {
+                sqlTime = new java.sql.Time(((Date)value).getTime());
+            }
+            if (op != null)
+            {
+                // Wrap if SCO
+                return op.wrapSCOField(mmd.getAbsoluteFieldNumber(), sqlTime, false, false, true);
+            }
+            return sqlTime;
+        }
+        else if (java.sql.Timestamp.class.isAssignableFrom(mmd.getType()) && value instanceof Date)
+        {
+            java.sql.Timestamp sqlTs = null;
+            if (value instanceof java.sql.Time)
+            {
+                sqlTs = (java.sql.Timestamp) value;
+            }
+            else
+            {
+                sqlTs = new java.sql.Timestamp(((Date)value).getTime());
+            }
+            if (op != null)
+            {
+                // Wrap if SCO
+                return op.wrapSCOField(mmd.getAbsoluteFieldNumber(), sqlTs, false, false, true);
+            }
+            return sqlTs;
+        }
         else if (Date.class.isAssignableFrom(mmd.getType()) && value instanceof Date)
         {
             // Date could have been persisted as String (in 3.0m4) so this just handles the Date case

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2012-07-18 10:02:34 UTC (rev 15182)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2012-07-18 10:06:02 UTC (rev 15183)
@@ -84,7 +84,7 @@
             return;
         }
         String fieldName = getFieldName(fieldNumber);
-        dbObject.put(fieldName, Character.valueOf(value));
+        dbObject.put(fieldName, "" + value);
     }
 
     @Override

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15198
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15198&view=rev
Author:   andy_jefferson
Date:     2012-07-19 07:36:35 +0000 (Thu, 19 Jul 2012)
Log Message:
-----------
[NUCMONGODB-93] Fix handling of array types, as well as upgrading conversion of all basic types from store to field

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-07-18 19:17:37 UTC (rev 15197)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-07-19 07:36:35 UTC (rev 15198)
@@ -34,6 +34,7 @@
 import org.datanucleus.ClassLoaderResolver;
 import org.datanucleus.FetchPlan;
 import org.datanucleus.PropertyNames;
+import org.datanucleus.exceptions.NucleusDataStoreException;
 import org.datanucleus.identity.IdentityUtils;
 import org.datanucleus.identity.OID;
 import org.datanucleus.identity.OIDFactory;
@@ -55,6 +56,7 @@
 import org.datanucleus.store.mongodb.fieldmanager.FetchFieldManager;
 import org.datanucleus.store.schema.naming.ColumnType;
 import org.datanucleus.store.types.converters.TypeConverter;
+import org.datanucleus.store.types.sco.SCOUtils;
 import org.datanucleus.util.NucleusLogger;
 
 import com.mongodb.BasicDBObject;
@@ -743,7 +745,7 @@
      * @param ec ExecutionContext
      * @param mmd Metadata for the field holding this value
      * @param value The raw value for the field
-     * @param role The role of this value for the field TODO Make use of this
+     * @param role The role of this value for the field
      * @return The value to store
      */
     public static Object getStoredValueForField(ExecutionContext ec, AbstractMemberMetaData mmd, Object value, int fieldRole)
@@ -800,7 +802,8 @@
             }
             return array;
         }
-        else if (Enum.class.isAssignableFrom(type))
+
+        if (Enum.class.isAssignableFrom(type))
         {
             ColumnMetaData colmd = null;
             if (mmd != null && mmd.getColumnMetaData() != null && mmd.getColumnMetaData().length > 0)
@@ -824,6 +827,11 @@
             // store as String
             return "" + value;
         }
+        else if (char.class.isAssignableFrom(type))
+        {
+            // store as String
+            return "" + value;
+        }
 
         // Fallback to built-in type converters
         TypeConverter strConv = ec.getTypeManager().getTypeConverterForType(type, String.class);
@@ -842,4 +850,220 @@
         // store as the raw value
         return value;
     }
+
+    /**
+     * Convenience method to convert the stored value for an object field into the value that will be held
+     * in the object. Note that this does not cater for relation fields, just basic fields.
+     * @param ec ExecutionContext
+     * @param mmd Metadata for the field holding this value
+     * @param value The stored value for the field
+     * @param role The role of this value for the field
+     * @return The value to put in the field
+     */
+    public static Object getFieldValueFromStored(ExecutionContext ec, AbstractMemberMetaData mmd, Object value, int fieldRole)
+    {
+        if (value == null)
+        {
+            return null;
+        }
+
+        Class type = value.getClass();
+        if (mmd != null)
+        {
+            if (fieldRole == FieldRole.ROLE_COLLECTION_ELEMENT)
+            {
+                type = ec.getClassLoaderResolver().classForName(mmd.getCollection().getElementType());
+            }
+            else if (fieldRole == FieldRole.ROLE_ARRAY_ELEMENT)
+            {
+                type = ec.getClassLoaderResolver().classForName(mmd.getArray().getElementType());
+            }
+            else if (fieldRole == FieldRole.ROLE_MAP_KEY)
+            {
+                type = ec.getClassLoaderResolver().classForName(mmd.getMap().getKeyType());
+            }
+            else if (fieldRole == FieldRole.ROLE_MAP_VALUE)
+            {
+                type = ec.getClassLoaderResolver().classForName(mmd.getMap().getValueType());
+            }
+            else
+            {
+                type = mmd.getType();
+            }
+        }
+
+        if (mmd.hasCollection() && fieldRole == FieldRole.ROLE_FIELD)
+        {
+            Collection<Object> coll;
+            try
+            {
+                Class instanceType = SCOUtils.getContainerInstanceType(mmd.getType(), mmd.getOrderMetaData() != null);
+                coll = (Collection<Object>) instanceType.newInstance();
+            }
+            catch (Exception e)
+            {
+                throw new NucleusDataStoreException(e.getMessage(), e);
+            }
+
+            Collection rawColl = (Collection)value;
+            for (Object elem : rawColl)
+            {
+                Object storeElem = getFieldValueFromStored(ec, mmd, elem, FieldRole.ROLE_COLLECTION_ELEMENT);
+                coll.add(storeElem);
+            }
+            return coll;
+        }
+        else if (mmd.hasArray() && fieldRole == FieldRole.ROLE_FIELD)
+        {
+            Collection rawColl = (Collection)value;
+            Object array = Array.newInstance(mmd.getType().getComponentType(), rawColl.size());
+            int i=0;
+            for (Object elem : rawColl)
+            {
+                Object storeElem = getFieldValueFromStored(ec, mmd, elem, FieldRole.ROLE_ARRAY_ELEMENT);
+                Array.set(array, i++, storeElem);
+            }
+            return array;
+        }
+
+        if (Character.class.isAssignableFrom(type))
+        {
+            if (value instanceof Character)
+            {
+                return value;
+            }
+            return ((String)value).charAt(0);
+        }
+        else if (Short.class.isAssignableFrom(type))
+        {
+            if (value instanceof Short)
+            {
+                return value;
+            }
+            return ((Number)value).shortValue();
+        }
+        else if (Integer.class.isAssignableFrom(type))
+        {
+            if (value instanceof Integer)
+            {
+                return value;
+            }
+            return ((Number)value).intValue();
+        }
+        else if (Long.class.isAssignableFrom(type))
+        {
+            if (value instanceof Long)
+            {
+                return value;
+            }
+            return ((Number)value).longValue();
+        }
+        else if (Float.class.isAssignableFrom(type))
+        {
+            if (value instanceof Float)
+            {
+                return value;
+            }
+            return ((Number)value).floatValue();
+        }
+        else if (Double.class.isAssignableFrom(type))
+        {
+            if (value instanceof Double)
+            {
+                return value;
+            }
+            return ((Number)value).doubleValue();
+        }
+        else if (Byte.class.isAssignableFrom(type))
+        {
+            if (value instanceof Byte)
+            {
+                return value;
+            }
+            return ((Number)value).byteValue();
+        }
+        else if (Enum.class.isAssignableFrom(type))
+        {
+            ColumnMetaData colmd = null;
+            if (mmd != null && mmd.getColumnMetaData() != null && mmd.getColumnMetaData().length > 0)
+            {
+                colmd = mmd.getColumnMetaData()[0];
+            }
+            if (MetaDataUtils.persistColumnAsNumeric(colmd))
+            {
+                return type.getEnumConstants()[((Number)value).intValue()];
+            }
+            else
+            {
+                return Enum.valueOf(type, (String)value);
+            }
+        }
+        else if (java.sql.Date.class.isAssignableFrom(type) && value instanceof Date)
+        {
+            java.sql.Date sqlDate = null;
+            if (value instanceof java.sql.Date)
+            {
+                sqlDate = (java.sql.Date) value;
+            }
+            else
+            {
+                sqlDate = new java.sql.Date(((Date)value).getTime());
+            }
+            return sqlDate;
+        }
+        else if (java.sql.Time.class.isAssignableFrom(type) && value instanceof Date)
+        {
+            java.sql.Time sqlTime = null;
+            if (value instanceof java.sql.Time)
+            {
+                sqlTime = (java.sql.Time) value;
+            }
+            else
+            {
+                sqlTime = new java.sql.Time(((Date)value).getTime());
+            }
+            return sqlTime;
+        }
+        else if (java.sql.Timestamp.class.isAssignableFrom(type) && value instanceof Date)
+        {
+            java.sql.Timestamp sqlTs = null;
+            if (value instanceof java.sql.Time)
+            {
+                sqlTs = (java.sql.Timestamp) value;
+            }
+            else
+            {
+                sqlTs = new java.sql.Timestamp(((Date)value).getTime());
+            }
+            return sqlTs;
+        }
+        else if (Date.class.isAssignableFrom(type) && value instanceof Date)
+        {
+            // Date could have been persisted as String (in 3.0m4) so this just handles the Date case
+            return value;
+        }
+        else if (Calendar.class.isAssignableFrom(type))
+        {
+            Calendar cal = Calendar.getInstance();
+            cal.setTime((Date)value);
+            return cal;
+        }
+
+        TypeConverter strConv = ec.getTypeManager().getTypeConverterForType(type, String.class);
+        TypeConverter longConv = ec.getTypeManager().getTypeConverterForType(type, Long.class);
+        if (strConv != null)
+        {
+            // Persisted as a String, so convert back
+            String strValue = (String)value;
+            return strConv.toMemberType(strValue);
+        }
+        else if (longConv != null)
+        {
+            // Persisted as a Long, so convert back
+            Long longValue = (Long)value;
+            return longConv.toMemberType(longValue);
+        }
+
+        return value;
+    }
 }
\ No newline at end of file

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2012-07-18 19:17:37 UTC (rev 15197)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2012-07-19 07:36:35 UTC (rev 15198)
@@ -20,9 +20,7 @@
 import java.io.ByteArrayInputStream;
 import java.io.ObjectInputStream;
 import java.lang.reflect.Array;
-import java.util.Calendar;
 import java.util.Collection;
-import java.util.Date;
 import java.util.Iterator;
 import java.util.Map;
 
@@ -771,14 +769,21 @@
             while (idIter.hasNext())
             {
                 String elementIdStr = (String)idIter.next();
-                try
+                if (elementIdStr.equals("NULL"))
                 {
-                    coll.add(IdentityUtils.getObjectFromIdString(elementIdStr, elemCmd, ec, true));
+                    coll.add(null);
                 }
-                catch (NucleusObjectNotFoundException onfe)
+                else
                 {
-                    // Object no longer exists. Deleted by user? so ignore
-                    changeDetected = true;
+                    try
+                    {
+                        coll.add(IdentityUtils.getObjectFromIdString(elementIdStr, elemCmd, ec, true));
+                    }
+                    catch (NucleusObjectNotFoundException onfe)
+                    {
+                        // Object no longer exists. Deleted by user? so ignore
+                        changeDetected = true;
+                    }
                 }
             }
 
@@ -891,15 +896,22 @@
             {
                 // TODO handle interface[]
                 String elementIdStr = (String)idIter.next();
-                try
+                if (elementIdStr.equals("NULL"))
                 {
-                    Array.set(array, i, IdentityUtils.getObjectFromIdString(elementIdStr, elemCmd, ec, true));
-                    i++;
+                    Array.set(array, i, null);
                 }
-                catch (NucleusObjectNotFoundException onfe)
+                else
                 {
-                    // Object no longer exists. Deleted by user? so ignore
-                    changeDetected = true;
+                    try
+                    {
+                        Array.set(array, i, IdentityUtils.getObjectFromIdString(elementIdStr, elemCmd, ec, true));
+                        i++;
+                    }
+                    catch (NucleusObjectNotFoundException onfe)
+                    {
+                        // Object no longer exists. Deleted by user? so ignore
+                        changeDetected = true;
+                    }
                 }
             }
             if (changeDetected && op != null)
@@ -916,177 +928,20 @@
 
     protected Object getValueForContainerNonRelationField(AbstractMemberMetaData mmd, Object value, ColumnMetaData colmd)
     {
-        // TODO Cater for Collection<non-PC>
-        if (value == null)
+        if (mmd.getTypeConverterName() != null)
         {
-            return null;
-        }
-        else if (mmd.getTypeConverterName() != null)
-        {
             // User-defined type converter
             TypeConverter conv = ec.getNucleusContext().getTypeManager().getTypeConverterForName(mmd.getTypeConverterName());
             return conv.toMemberType(value);
         }
-        else if (Character.class.isAssignableFrom(mmd.getType()))
-        {
-            if (value instanceof Character)
-            {
-                return value;
-            }
-            return ((String)value).charAt(0);
-        }
-        else if (Short.class.isAssignableFrom(mmd.getType()))
-        {
-            if (value instanceof Short)
-            {
-                return value;
-            }
-            return ((Number)value).shortValue();
-        }
-        else if (Integer.class.isAssignableFrom(mmd.getType()))
-        {
-            if (value instanceof Integer)
-            {
-                return value;
-            }
-            return ((Number)value).intValue();
-        }
-        else if (Long.class.isAssignableFrom(mmd.getType()))
-        {
-            if (value instanceof Long)
-            {
-                return value;
-            }
-            return ((Number)value).longValue();
-        }
-        else if (Float.class.isAssignableFrom(mmd.getType()))
-        {
-            if (value instanceof Float)
-            {
-                return value;
-            }
-            return ((Number)value).floatValue();
-        }
-        else if (Double.class.isAssignableFrom(mmd.getType()))
-        {
-            if (value instanceof Double)
-            {
-                return value;
-            }
-            return ((Number)value).doubleValue();
-        }
-        else if (Byte.class.isAssignableFrom(mmd.getType()))
-        {
-            if (value instanceof Byte)
-            {
-                return value;
-            }
-            return ((Number)value).byteValue();
-        }
-        else if (Enum.class.isAssignableFrom(mmd.getType()))
-        {
-            if (MetaDataUtils.persistColumnAsNumeric(colmd))
-            {
-                return mmd.getType().getEnumConstants()[((Number)value).intValue()];
-            }
-            else
-            {
-                return Enum.valueOf(mmd.getType(), (String)value);
-            }
-        }
-        else if (java.sql.Date.class.isAssignableFrom(mmd.getType()) && value instanceof Date)
-        {
-            java.sql.Date sqlDate = null;
-            if (value instanceof java.sql.Date)
-            {
-                sqlDate = (java.sql.Date) value;
-            }
-            else
-            {
-                sqlDate = new java.sql.Date(((Date)value).getTime());
-            }
-            if (op != null)
-            {
-                // Wrap if SCO
-                return op.wrapSCOField(mmd.getAbsoluteFieldNumber(), sqlDate, false, false, true);
-            }
-            return sqlDate;
-        }
-        else if (java.sql.Time.class.isAssignableFrom(mmd.getType()) && value instanceof Date)
-        {
-            java.sql.Time sqlTime = null;
-            if (value instanceof java.sql.Time)
-            {
-                sqlTime = (java.sql.Time) value;
-            }
-            else
-            {
-                sqlTime = new java.sql.Time(((Date)value).getTime());
-            }
-            if (op != null)
-            {
-                // Wrap if SCO
-                return op.wrapSCOField(mmd.getAbsoluteFieldNumber(), sqlTime, false, false, true);
-            }
-            return sqlTime;
-        }
-        else if (java.sql.Timestamp.class.isAssignableFrom(mmd.getType()) && value instanceof Date)
-        {
-            java.sql.Timestamp sqlTs = null;
-            if (value instanceof java.sql.Time)
-            {
-                sqlTs = (java.sql.Timestamp) value;
-            }
-            else
-            {
-                sqlTs = new java.sql.Timestamp(((Date)value).getTime());
-            }
-            if (op != null)
-            {
-                // Wrap if SCO
-                return op.wrapSCOField(mmd.getAbsoluteFieldNumber(), sqlTs, false, false, true);
-            }
-            return sqlTs;
-        }
-        else if (Date.class.isAssignableFrom(mmd.getType()) && value instanceof Date)
-        {
-            // Date could have been persisted as String (in 3.0m4) so this just handles the Date case
-            if (op != null)
-            {
-                // Wrap if SCO
-                return op.wrapSCOField(mmd.getAbsoluteFieldNumber(), value, false, false, true);
-            }
-            return value;
-        }
-        else if (Calendar.class.isAssignableFrom(mmd.getType()))
-        {
-            Calendar cal = Calendar.getInstance();
-            cal.setTime((Date)value);
-            return cal;
-        }
 
-        TypeConverter strConv = ec.getTypeManager().getTypeConverterForType(mmd.getType(), String.class);
-        TypeConverter longConv = ec.getTypeManager().getTypeConverterForType(mmd.getType(), Long.class);
-        Object returnValue = value;
-        if (strConv != null)
-        {
-            // Persisted as a String, so convert back
-            String strValue = (String)value;
-            returnValue = strConv.toMemberType(strValue);
-        }
-        else if (longConv != null)
-        {
-            // Persisted as a Long, so convert back
-            Long longValue = (Long)value;
-            returnValue = longConv.toMemberType(longValue);
-        }
-
+        Object fieldValue = MongoDBUtils.getFieldValueFromStored(ec, mmd, value, FieldRole.ROLE_FIELD);
         if (op != null)
         {
             // Wrap if SCO
-            return op.wrapSCOField(mmd.getAbsoluteFieldNumber(), returnValue, false, false, true);
+            return op.wrapSCOField(mmd.getAbsoluteFieldNumber(), fieldValue, false, false, true);
         }
-        return returnValue;
+        return fieldValue;
     }
 
     private Object getMapKeyForReturnValue(AbstractMemberMetaData mmd, Object value)

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2012-07-18 19:17:37 UTC (rev 15197)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2012-07-19 07:36:35 UTC (rev 15198)
@@ -592,9 +592,16 @@
             while (collIter.hasNext())
             {
                 Object element = collIter.next();
-                Object elementPC = ec.persistObjectInternal(element, null, -1, -1);
-                Object elementID = ec.getApiAdapter().getIdForObject(elementPC);
-                collIds.add(elementID.toString());
+                if (element != null)
+                {
+                    Object elementPC = ec.persistObjectInternal(element, null, -1, -1);
+                    Object elementID = ec.getApiAdapter().getIdForObject(elementPC);
+                    collIds.add(elementID.toString());
+                }
+                else
+                {
+                    collIds.add("NULL");
+                }
             }
             dbObject.put(fieldName, collIds); // Store List<String> of ids
         }
@@ -642,9 +649,16 @@
             for (int i=0;i<Array.getLength(value);i++)
             {
                 Object element = Array.get(value, i);
-                Object elementPC = ec.persistObjectInternal(element, null, -1, -1);
-                Object elementID = ec.getApiAdapter().getIdForObject(elementPC);
-                collIds.add(elementID.toString());
+                if (element != null)
+                {
+                    Object elementPC = ec.persistObjectInternal(element, null, -1, -1);
+                    Object elementID = ec.getApiAdapter().getIdForObject(elementPC);
+                    collIds.add(elementID.toString());
+                }
+                else
+                {
+                    collIds.add("NULL");
+                }
             }
             dbObject.put(fieldName, collIds); // Store List<String> of ids
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15209
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15209&view=rev
Author:   andy_jefferson
Date:     2012-07-20 07:03:33 +0000 (Fri, 20 Jul 2012)
Log Message:
-----------
[NUCMONGODB-95] Support for persistence of BufferedImage

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchEmbeddedFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-07-19 11:16:50 UTC (rev 15208)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-07-20 07:03:33 UTC (rev 15209)
@@ -18,6 +18,12 @@
 **********************************************************************/
 package org.datanucleus.store.mongodb;
 
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -35,6 +41,8 @@
 import org.datanucleus.FetchPlan;
 import org.datanucleus.PropertyNames;
 import org.datanucleus.exceptions.NucleusDataStoreException;
+import org.datanucleus.exceptions.NucleusException;
+import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.identity.IdentityUtils;
 import org.datanucleus.identity.OID;
 import org.datanucleus.identity.OIDFactory;
@@ -67,6 +75,8 @@
 import com.mongodb.MongoException;
 import java.util.LinkedList;
 
+import javax.imageio.ImageIO;
+
 /**
  * Utilities for MongoDB.
  */
@@ -832,6 +842,22 @@
             // store as String
             return "" + value;
         }
+        else if (BufferedImage.class.isAssignableFrom(type))
+        {
+            // store serialised
+            byte[] bytes = null;
+            try
+            {
+                ByteArrayOutputStream baos = new ByteArrayOutputStream(8192);
+                ImageIO.write((BufferedImage) value, "jpg", baos);
+                bytes = baos.toByteArray();
+                baos.close();
+            }
+            catch (IOException e)
+            {
+            }
+            return bytes;
+        }
 
         // Fallback to built-in type converters
         TypeConverter strConv = ec.getTypeManager().getTypeConverterForType(type, String.class);
@@ -1048,6 +1074,18 @@
             cal.setTime((Date)value);
             return cal;
         }
+        else if (BufferedImage.class.isAssignableFrom(type))
+        {
+            Object returnValue = null;
+            try
+            {
+                returnValue = ImageIO.read(new ByteArrayInputStream((byte[])value));
+            }
+            catch (IOException e)
+            {
+            }
+            return returnValue;
+        }
 
         TypeConverter strConv = ec.getTypeManager().getTypeConverterForType(type, String.class);
         TypeConverter longConv = ec.getTypeManager().getTypeConverterForType(type, Long.class);
@@ -1066,4 +1104,46 @@
 
         return value;
     }
+
+    public static byte[] getStoredValueForSerialisedField(AbstractMemberMetaData mmd, Object value)
+    {
+        byte[] storeValue = null;
+        try
+        {
+            ByteArrayOutputStream bos = new ByteArrayOutputStream();
+            ObjectOutputStream oos = new ObjectOutputStream(bos);
+            oos.writeObject(value);
+            storeValue = bos.toByteArray();
+            oos.close();
+            bos.close();
+        }
+        catch (IOException e)
+        {
+            throw new NucleusException("Exception thrown serialising value for field " + mmd.getFullFieldName(), e);
+        }
+        return storeValue;
+    }
+
+    public static Object getFieldValueForSerialisedField(AbstractMemberMetaData mmd, Object value)
+    {
+        Object returnValue = null;
+        try
+        {
+            if (value != null)
+            {
+                byte[] bytes = (byte[])value;
+                ByteArrayInputStream bis = new ByteArrayInputStream(bytes);
+                ObjectInputStream ois = new ObjectInputStream(bis);
+                returnValue = ois.readObject();
+                ois.close();
+                bis.close();
+            }
+        }
+        catch (Exception e)
+        {
+            throw new NucleusUserException("Exception thrown deserialising field at " + mmd.getFullFieldName(), e);
+        }
+        return returnValue;
+    }
+
 }
\ No newline at end of file

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchEmbeddedFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchEmbeddedFieldManager.java	2012-07-19 11:16:50 UTC (rev 15208)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchEmbeddedFieldManager.java	2012-07-20 07:03:33 UTC (rev 15209)
@@ -116,7 +116,13 @@
         Object value = dbObject.get(fieldName);
         if (embMmd.isSerialized())
         {
-            return getValueForSerialisedField(embMmd, value);
+            Object returnValue = MongoDBUtils.getFieldValueForSerialisedField(embMmd, value);
+            if (op != null)
+            {
+                // Wrap if SCO
+                returnValue = op.wrapSCOField(embMmd.getAbsoluteFieldNumber(), returnValue, false, false, true);
+            }
+            return returnValue;
         }
         if (Relation.isRelationSingleValued(relationType))
         {

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2012-07-19 11:16:50 UTC (rev 15208)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/FetchFieldManager.java	2012-07-20 07:03:33 UTC (rev 15209)
@@ -17,8 +17,6 @@
 ***********************************************************************/
 package org.datanucleus.store.mongodb.fieldmanager;
 
-import java.io.ByteArrayInputStream;
-import java.io.ObjectInputStream;
 import java.lang.reflect.Array;
 import java.util.Collection;
 import java.util.Iterator;
@@ -657,7 +655,13 @@
         Object value = dbObject.get(fieldName);
         if (mmd.isSerialized())
         {
-            Object obj = getValueForSerialisedField(mmd, value);
+            Object obj = MongoDBUtils.getFieldValueForSerialisedField(mmd, value);
+            if (op != null)
+            {
+                // Wrap if SCO
+                obj = op.wrapSCOField(mmd.getAbsoluteFieldNumber(), obj, false, false, true);
+            }
+
             if (Relation.isRelationSingleValued(relationType))
             {
                 // Make sure this object is managed by an ObjectProvider
@@ -694,34 +698,6 @@
         }
     }
 
-    protected Object getValueForSerialisedField(AbstractMemberMetaData mmd, Object value)
-    {
-        Object returnValue = null;
-        try
-        {
-            if (value != null)
-            {
-                byte[] bytes = (byte[])value;
-                ByteArrayInputStream bis = new ByteArrayInputStream(bytes);
-                ObjectInputStream ois = new ObjectInputStream(bis);
-                returnValue = ois.readObject();
-                ois.close();
-                bis.close();
-
-                if (op != null)
-                {
-                    // Wrap if SCO
-                    returnValue = op.wrapSCOField(mmd.getAbsoluteFieldNumber(), returnValue, false, false, true);
-                }
-            }
-        }
-        catch (Exception e)
-        {
-            throw new NucleusUserException("Exception thrown deserialising field at " + mmd.getFullFieldName(), e);
-        }
-        return returnValue;
-    }
-
     protected Object getValueForSingleRelationField(AbstractMemberMetaData mmd, Object value, ClassLoaderResolver clr)
     {
         String idStr = (String)value;
@@ -909,14 +885,13 @@
                 String elementIdStr = (String)idIter.next();
                 if (elementIdStr.equals("NULL"))
                 {
-                    Array.set(array, i, null);
+                    Array.set(array, i++, null);
                 }
                 else
                 {
                     try
                     {
-                        Array.set(array, i, IdentityUtils.getObjectFromIdString(elementIdStr, elemCmd, ec, true));
-                        i++;
+                        Array.set(array, i++, IdentityUtils.getObjectFromIdString(elementIdStr, elemCmd, ec, true));
                     }
                     catch (NucleusObjectNotFoundException onfe)
                     {
@@ -925,9 +900,23 @@
                     }
                 }
             }
-            if (changeDetected && op != null)
+
+            if (changeDetected)
             {
-                op.makeDirty(mmd.getAbsoluteFieldNumber());
+                if (i < collIds.size())
+                {
+                    // Some elements not found, so resize the array
+                    Object arrayOld = array;
+                    array = Array.newInstance(mmd.getType().getComponentType(), i);
+                    for (int j=0;j<i;j++)
+                    {
+                        Array.set(array, j, Array.get(arrayOld, j));
+                    }
+                }
+                if (op != null)
+                {
+                    op.makeDirty(mmd.getAbsoluteFieldNumber());
+                }
             }
             return array;
         }

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java	2012-07-19 11:16:50 UTC (rev 15208)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreEmbeddedFieldManager.java	2012-07-20 07:03:33 UTC (rev 15209)
@@ -105,7 +105,9 @@
 
         if (embMmd.isSerialized())
         {
-            processSerialisedField(fieldName, value, dbObject);
+            byte[] bytes = MongoDBUtils.getStoredValueForSerialisedField(embMmd, value);
+            dbObject.put(fieldName, bytes);
+            op.wrapSCOField(fieldNumber, value, false, false, true);
         }
         else if (Relation.isRelationSingleValued(relationType))
         {

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2012-07-19 11:16:50 UTC (rev 15208)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/fieldmanager/StoreFieldManager.java	2012-07-20 07:03:33 UTC (rev 15209)
@@ -17,9 +17,6 @@
 ***********************************************************************/
 package org.datanucleus.store.mongodb.fieldmanager;
 
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
 import java.lang.reflect.Array;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -31,7 +28,6 @@
 import com.mongodb.DBObject;
 
 import org.datanucleus.ClassLoaderResolver;
-import org.datanucleus.exceptions.NucleusException;
 import org.datanucleus.exceptions.NucleusUserException;
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
@@ -542,7 +538,8 @@
 
         if (mmd.isSerialized())
         {
-            processSerialisedField(fieldName, value, dbObject);
+            byte[] bytes = MongoDBUtils.getStoredValueForSerialisedField(mmd, value);
+            dbObject.put(fieldName, bytes);
             op.wrapSCOField(fieldNumber, value, false, false, true);
         }
         else if (Relation.isRelationSingleValued(relationType))
@@ -664,23 +661,6 @@
         }
     }
 
-    protected void processSerialisedField(String fieldName, Object value, DBObject dbObject)
-    {
-        try
-        {
-            ByteArrayOutputStream bos = new ByteArrayOutputStream();
-            ObjectOutputStream oos = new ObjectOutputStream(bos);
-            oos.writeObject(value);
-            dbObject.put(fieldName, bos.toByteArray());
-            oos.close();
-            bos.close();
-        }
-        catch (IOException e)
-        {
-            throw new NucleusException("Exception thrown serialising value for field " + fieldName, e);
-        }
-    }
-
     protected void processContainerNonRelationField(String fieldName, ExecutionContext ec, Object value, 
             DBObject dbObject, AbstractMemberMetaData mmd, int fieldRole)
     {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15233
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15233&view=rev
Author:   andy_jefferson
Date:     2012-07-23 07:24:33 +0000 (Mon, 23 Jul 2012)
Log Message:
-----------
[NUCMONGODB-99] Change java.sql.Date/Time persistence to use converter

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-07-23 07:21:02 UTC (rev 15232)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-07-23 07:24:33 UTC (rev 15233)
@@ -823,6 +823,14 @@
             boolean useNumeric = MetaDataUtils.persistColumnAsNumeric(colmd);
             return useNumeric ? ((Enum)value).ordinal() : ((Enum)value).name();
         }
+        else if (java.sql.Time.class.isAssignableFrom(type))
+        {
+            // Will be processed by type converters below
+        }
+        else if (java.sql.Date.class.isAssignableFrom(type))
+        {
+            // Will be processed by type converters below
+        }
         else if (Date.class.isAssignableFrom(type))
         {
             // store as-is

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java	2012-07-23 07:21:02 UTC (rev 15232)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java	2012-07-23 07:24:33 UTC (rev 15233)
@@ -45,6 +45,8 @@
 import org.datanucleus.store.mongodb.query.expression.MongoOperator;
 import org.datanucleus.store.query.Query;
 import org.datanucleus.store.schema.naming.ColumnType;
+import org.datanucleus.store.types.converters.TypeConverter;
+import org.datanucleus.store.types.sco.SCO;
 import org.datanucleus.util.NucleusLogger;
 import org.datanucleus.util.StringUtils;
 
@@ -549,6 +551,7 @@
             }
         }
 
+        // TODO Change this to use MongoDBUtils.getStoredValueForField
         if (paramValueSet)
         {
             if (paramValue instanceof Number)
@@ -565,6 +568,13 @@
                 precompilable = false;
                 return lit;
             }
+            else if (paramValue instanceof Character)
+            {
+                MongoLiteral lit = new MongoLiteral("" + paramValue);
+                stack.push(lit);
+                precompilable = false;
+                return lit;
+            }
             else if (paramValue instanceof Boolean)
             {
                 MongoLiteral lit = new MongoLiteral(paramValue);
@@ -572,6 +582,32 @@
                 precompilable = false;
                 return lit;
             }
+            else if (paramValue instanceof java.sql.Time || paramValue instanceof java.sql.Date)
+            {
+                // java.sql.Time/Date are stored via converter
+                Object storedVal = paramValue;
+                Class paramType = paramValue.getClass();
+                if (paramValue instanceof SCO)
+                {
+                    paramType = ((SCO)paramValue).getValue().getClass();
+                }
+                TypeConverter strConv = ec.getTypeManager().getTypeConverterForType(paramType, String.class);
+                TypeConverter longConv = ec.getTypeManager().getTypeConverterForType(paramType, Long.class);
+                if (strConv != null)
+                {
+                    // store as a String
+                    storedVal = strConv.toDatastoreType(paramValue);
+                }
+                else if (longConv != null)
+                {
+                    // store as a Long
+                    storedVal = longConv.toDatastoreType(paramValue);
+                }
+                MongoLiteral lit = new MongoLiteral(storedVal);
+                stack.push(lit);
+                precompilable = false;
+                return lit;
+            }
             else if (paramValue instanceof Date)
             {
                 MongoLiteral lit = new MongoLiteral(paramValue);
@@ -615,7 +651,6 @@
     protected Object processLiteral(Literal expr)
     {
         Object litValue = expr.getLiteral();
-
         if (litValue instanceof BigDecimal)
         {
             // MongoDB can't cope with BigDecimal, so give it a Double

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15416
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15416&view=rev
Author:   andy_jefferson
Date:     2012-08-14 14:44:38 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
[NUCMONGODB-81] Add LazyLoadQueryResult and use listeners to be aware of connection closure etc

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java

Added Paths:
-----------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/LazyLoadQueryResult.java

Removed Paths:
-------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/MongoDBCandidateList.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-08-14 07:55:29 UTC (rev 15415)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-08-14 14:44:38 UTC (rev 15416)
@@ -62,6 +62,8 @@
 import org.datanucleus.store.StoreManager;
 import org.datanucleus.store.connection.ManagedConnection;
 import org.datanucleus.store.mongodb.fieldmanager.FetchFieldManager;
+import org.datanucleus.store.mongodb.query.LazyLoadQueryResult;
+import org.datanucleus.store.query.Query;
 import org.datanucleus.store.schema.naming.ColumnType;
 import org.datanucleus.store.types.converters.TypeConverter;
 import org.datanucleus.store.types.sco.SCOUtils;
@@ -402,13 +404,12 @@
         return dbObj;
     }
 
-    public static List getObjectsOfCandidateType(ExecutionContext ec, DB db, Class candidateClass, 
-            boolean subclasses, boolean ignoreCache, FetchPlan fp, BasicDBObject filterObject,
+    public static List getObjectsOfCandidateType(Query q, DB db, BasicDBObject filterObject,
             Map<String, Object> options)
     {
-        return getObjectsOfCandidateType(ec, db, candidateClass, subclasses, ignoreCache, fp, filterObject, options, null, null);
+        return getObjectsOfCandidateType(q, db, filterObject, options, null, null);
     }
-    
+
     /**
      * Convenience method to return all objects of the candidate type (optionally allowing subclasses).
      * @param ec Execution context
@@ -419,25 +420,26 @@
      * @param fp FetchPlan when retrieving the objects
      * @param filterObject Optional filter object
      * @param options Set of options for controlling this query
-     * @return List of all candidate objects
+     * @return List of all candidate objects (implements QueryResult)
      */
-    public static List getObjectsOfCandidateType(ExecutionContext ec, DB db, Class candidateClass, 
-            boolean subclasses, boolean ignoreCache, FetchPlan fp, BasicDBObject filterObject,
+    public static List getObjectsOfCandidateType(Query q, DB db, BasicDBObject filterObject,
             Map<String, Object> options, Integer skip, Integer limit)
     {
+        ExecutionContext ec = q.getExecutionContext();
         List<AbstractClassMetaData> cmds =
-            MetaDataUtils.getMetaDataForCandidates(candidateClass, subclasses, ec);
+            MetaDataUtils.getMetaDataForCandidates(q.getCandidateClass(), q.isSubclasses(), ec);
 
+        LazyLoadQueryResult qr = new LazyLoadQueryResult(q);
+
         // TODO Allow for subclasses sharing the same table so just doing a single query but with discriminator filtering
         Iterator<AbstractClassMetaData> cmdIter = cmds.iterator();
-        List results = new ArrayList();
         StoreManager storeMgr = ec.getStoreManager();
         ClassLoaderResolver clr = ec.getClassLoaderResolver();
         while (cmdIter.hasNext())
         {
             AbstractClassMetaData cmd = cmdIter.next();
-            fp.manageFetchPlanForClass(cmd);
-            int[] fpMembers = fp.getFetchPlanForClass(cmd).getMemberNumbers();
+            q.getFetchPlan().manageFetchPlanForClass(cmd);
+            int[] fpMembers = q.getFetchPlan().getFetchPlanForClass(cmd).getMemberNumbers();
             BasicDBObject fieldsSelection = new BasicDBObject();
             if (fpMembers != null && fpMembers.length > 0)
             {
@@ -551,34 +553,54 @@
                 }
             }
 
-            try
+            qr.addCandidateResult(cmd, curs, fpMembers);
+            /*try
             {
                 while (curs.hasNext())
                 {
                     final DBObject dbObject = curs.next();
-                    if (cmd.getIdentityType() == IdentityType.APPLICATION)
-                    {
-                        results.add(getObjectUsingApplicationIdForDBObject(dbObject, cmd, ec, ignoreCache, fpMembers));
-                    }
-                    else if (cmd.getIdentityType() == IdentityType.DATASTORE)
-                    {
-                        results.add(getObjectUsingDatastoreIdForDBObject(dbObject, cmd, ec, ignoreCache, fpMembers));
-                    }
-                    else
-                    {
-                        results.add(getObjectUsingNondurableIdForDBObject(dbObject, cmd, ec, ignoreCache, fpMembers));
-                    }
+                    Object pojo = getPojoForDBObjectForCandidate(dbObject, ec, cmd, fpMembers, ignoreCache);
+                    results.add(pojo);
                 }
             }
             finally
             {
                 curs.close();
-            }
+            }*/
         }
 
-        return results;
+        return qr;
     }
 
+    /**
+     * Convenience method that takes the provided DBObject and the details of the candidate that it is an instance
+     * of, and converts it into the associated POJO.
+     * @param dbObject The DBObject
+     * @param ec ExecutionContext
+     * @param cmd Metadata for the candidate class
+     * @param fpMembers FetchPlan members for the class that are provided
+     * @param ignoreCache Whether to ignore the cache
+     * @return The Pojo object
+     */
+    public static Object getPojoForDBObjectForCandidate(DBObject dbObject, ExecutionContext ec,
+            AbstractClassMetaData cmd, int[] fpMembers, boolean ignoreCache)
+    {
+        Object pojo = null;
+        if (cmd.getIdentityType() == IdentityType.APPLICATION)
+        {
+            pojo = MongoDBUtils.getObjectUsingApplicationIdForDBObject(dbObject, cmd, ec, ignoreCache, fpMembers);
+        }
+        else if (cmd.getIdentityType() == IdentityType.DATASTORE)
+        {
+            pojo = MongoDBUtils.getObjectUsingDatastoreIdForDBObject(dbObject, cmd, ec, ignoreCache, fpMembers);
+        }
+        else
+        {
+            pojo = MongoDBUtils.getObjectUsingNondurableIdForDBObject(dbObject, cmd, ec, ignoreCache, fpMembers);
+        }
+        return pojo;
+    }
+
     protected static void selectAllFieldsOfEmbeddedObject(AbstractMemberMetaData mmd, BasicDBObject fieldsSelection,
             ExecutionContext ec, ClassLoaderResolver clr)
     {

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java	2012-08-14 07:55:29 UTC (rev 15415)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JDOQLQuery.java	2012-08-14 14:44:38 UTC (rev 15416)
@@ -31,11 +31,14 @@
 import org.datanucleus.store.ExecutionContext;
 import org.datanucleus.store.StoreManager;
 import org.datanucleus.store.connection.ManagedConnection;
+import org.datanucleus.store.connection.ManagedConnectionResourceListener;
 import org.datanucleus.store.mongodb.MongoDBUtils;
 import org.datanucleus.store.mongodb.query.expression.MongoBooleanExpression;
 import org.datanucleus.store.query.AbstractJDOQLQuery;
+import org.datanucleus.store.query.AbstractQueryResult;
 import org.datanucleus.store.query.Query;
 import org.datanucleus.store.query.QueryManager;
+import org.datanucleus.store.query.QueryResult;
 import org.datanucleus.util.NucleusLogger;
 
 import com.mongodb.BasicDBObject;
@@ -273,8 +276,7 @@
             }
             else if (evaluateInMemory())
             {
-                candidates = MongoDBUtils.getObjectsOfCandidateType(ec, db, candidateClass, subclasses, ignoreCache,
-                    getFetchPlan(), null, null);
+                candidates = MongoDBUtils.getObjectsOfCandidateType(this, db, null, null);
             }
             else
             {
@@ -303,13 +305,12 @@
                     // Execute as much as possible in the datastore
                     if (ordering == null)
                     {
-                        candidates = MongoDBUtils.getObjectsOfCandidateType(ec, db, candidateClass, subclasses, ignoreCache,
-                            getFetchPlan(), filterObject, options, (int) this.fromInclNo - 1, (int) (this.toExclNo - this.fromInclNo));
+                        candidates = MongoDBUtils.getObjectsOfCandidateType(this, db, filterObject, options, 
+                            (int) this.fromInclNo - 1, (int) (this.toExclNo - this.fromInclNo));
                     }
                     else
                     {
-                        candidates = MongoDBUtils.getObjectsOfCandidateType(ec, db, candidateClass, subclasses, ignoreCache,
-                            getFetchPlan(), filterObject, options);
+                        candidates = MongoDBUtils.getObjectsOfCandidateType(this, db, filterObject, options);
                     }
                     if (filter != null && datastoreCompilation.isFilterComplete())
                     {
@@ -318,22 +319,64 @@
                 }
             }
 
-            // Apply any result restrictions to the results
-            JavaQueryEvaluator resultMapper = new JDOQLEvaluator(this, candidates, compilation,
-                parameters, ec.getClassLoaderResolver());
-            Collection results = resultMapper.execute(filterInMemory, true, true, true, true);
-            if (candidates instanceof MongoDBCandidateList)
+            if (filterInMemory || result != null || resultClass != null || ordering != null)
             {
-                ((MongoDBCandidateList)candidates).close();
+                NucleusLogger.GENERAL.info(">> Needing to do further in-memory processing so loading all cursors now");
+                if (candidates instanceof QueryResult)
+                {
+                    // Make sure the cursor(s) are all loaded
+                    ((QueryResult)candidates).disconnect();
+                }
+
+                // Apply any result restrictions to the results
+                JavaQueryEvaluator resultMapper = new JDOQLEvaluator(this, candidates, compilation,
+                    parameters, ec.getClassLoaderResolver());
+                Collection results = resultMapper.execute(filterInMemory, true, true, true, true);
+
+                if (NucleusLogger.QUERY.isDebugEnabled())
+                {
+                    NucleusLogger.QUERY.debug(LOCALISER.msg("021074", "JDOQL", 
+                        "" + (System.currentTimeMillis() - startTime)));
+                }
+
+                return results;
             }
+            else
+            {
+                if (candidates instanceof QueryResult)
+                {
+                    NucleusLogger.GENERAL.info(">> Adding listener to ManagedConnection for this query");
+                    final QueryResult qr1 = (QueryResult)candidates;
+                    final ManagedConnection mconn1 = mconn;
+                    ManagedConnectionResourceListener listener =
+                        new ManagedConnectionResourceListener()
+                    {
+                        public void transactionFlushed(){}
+                        public void transactionPreClose()
+                        {
+                            // Tx : disconnect query from ManagedConnection (read in unread rows etc)
+                            qr1.disconnect();
+                        }
+                        public void managedConnectionPreClose()
+                        {
+                            if (!ec.getTransaction().isActive())
+                            {
+                                // Non-Tx : disconnect query from ManagedConnection (read in unread rows etc)
+                                qr1.disconnect();
+                            }
+                        }
+                        public void managedConnectionPostClose(){}
+                        public void resourcePostClose()
+                        {
+                            mconn1.removeListener(this);
+                        }
+                    };
+                    mconn.addListener(listener);
+                    ((AbstractQueryResult)qr1).addConnectionListener(listener);
+                }
 
-            if (NucleusLogger.QUERY.isDebugEnabled())
-            {
-                NucleusLogger.QUERY.debug(LOCALISER.msg("021074", "JDOQL", 
-                    "" + (System.currentTimeMillis() - startTime)));
+                return candidates;
             }
-
-            return results;
         }
         finally
         {

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java	2012-08-14 07:55:29 UTC (rev 15415)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/JPQLQuery.java	2012-08-14 14:44:38 UTC (rev 15416)
@@ -32,11 +32,14 @@
 import org.datanucleus.store.ExecutionContext;
 import org.datanucleus.store.StoreManager;
 import org.datanucleus.store.connection.ManagedConnection;
+import org.datanucleus.store.connection.ManagedConnectionResourceListener;
 import org.datanucleus.store.mongodb.MongoDBUtils;
 import org.datanucleus.store.mongodb.query.expression.MongoBooleanExpression;
 import org.datanucleus.store.query.AbstractJPQLQuery;
+import org.datanucleus.store.query.AbstractQueryResult;
 import org.datanucleus.store.query.Query;
 import org.datanucleus.store.query.QueryManager;
+import org.datanucleus.store.query.QueryResult;
 import org.datanucleus.util.NucleusLogger;
 
 /**
@@ -242,8 +245,7 @@
             }
             else if (evaluateInMemory())
             {
-                candidates = MongoDBUtils.getObjectsOfCandidateType(ec, db, candidateClass, subclasses, ignoreCache,
-                    getFetchPlan(), null, null);
+                candidates = MongoDBUtils.getObjectsOfCandidateType(this, db, null, null);
             }
             else
             {
@@ -272,13 +274,12 @@
                     // Execute as much as possible in the datastore
                     if (ordering == null)
                     {
-                        candidates = MongoDBUtils.getObjectsOfCandidateType(ec, db, candidateClass, subclasses, ignoreCache,
-                            getFetchPlan(), filterObject, options, (int) this.fromInclNo - 1, (int) (this.toExclNo - this.fromInclNo));
+                        candidates = MongoDBUtils.getObjectsOfCandidateType(this, db, filterObject, options, 
+                            (int) this.fromInclNo - 1, (int) (this.toExclNo - this.fromInclNo));
                     }
                     else
                     {
-                        candidates = MongoDBUtils.getObjectsOfCandidateType(ec, db, candidateClass, subclasses, ignoreCache,
-                            getFetchPlan(), filterObject, options);
+                        candidates = MongoDBUtils.getObjectsOfCandidateType(this, db, filterObject, options);
                     }
                     if (filter != null && datastoreCompilation.isFilterComplete())
                     {
@@ -287,23 +288,35 @@
                 }
             }
 
-            // Apply any result restrictions to the results
-            JavaQueryEvaluator resultMapper = new JPQLEvaluator(this, candidates, compilation, 
-                parameters, ec.getClassLoaderResolver());
-            Collection results = resultMapper.execute(filterInMemory, true, true, true, true);
-            if (candidates instanceof MongoDBCandidateList)
+            Collection results = candidates;
+            if (filterInMemory || result != null || resultClass != null || ordering != null)
             {
-                ((MongoDBCandidateList)candidates).close();
-            }
+                if (results instanceof QueryResult)
+                {
+                    // Make sure the cursor(s) are all loaded
+                    ((QueryResult)results).disconnect();
+                }
 
-            if (NucleusLogger.QUERY.isDebugEnabled())
-            {
-                NucleusLogger.QUERY.debug(LOCALISER.msg("021074", "JPQL", 
-                    "" + (System.currentTimeMillis() - startTime)));
+                // Perform any additional evaluation in-memory
+                JavaQueryEvaluator resultMapper = new JPQLEvaluator(this, candidates, compilation, 
+                    parameters, ec.getClassLoaderResolver());
+                results = resultMapper.execute(filterInMemory, true, true, true, true);
+
+                if (NucleusLogger.QUERY.isDebugEnabled())
+                {
+                    NucleusLogger.QUERY.debug(LOCALISER.msg("021074", "JPQL", 
+                        "" + (System.currentTimeMillis() - startTime)));
+                }
             }
 
             if (type == BULK_DELETE)
             {
+                if (results instanceof QueryResult)
+                {
+                    // Make sure the cursor(s) are all loaded
+                    ((QueryResult)results).disconnect();
+                }
+
                 ec.deleteObjects(results.toArray());
                 return Long.valueOf(results.size());
             }
@@ -311,10 +324,39 @@
             {
                 throw new NucleusException("Bulk Update is not yet supported");
             }
-            else
+
+            if (results instanceof QueryResult)
             {
-                return results;
+                final QueryResult qr1 = (QueryResult)results;
+                final ManagedConnection mconn1 = mconn;
+                ManagedConnectionResourceListener listener =
+                    new ManagedConnectionResourceListener()
+                {
+                    public void transactionFlushed(){}
+                    public void transactionPreClose()
+                    {
+                        // Tx : disconnect query from ManagedConnection (read in unread rows etc)
+                        qr1.disconnect();
+                    }
+                    public void managedConnectionPreClose()
+                    {
+                        if (!ec.getTransaction().isActive())
+                        {
+                            // Non-Tx : disconnect query from ManagedConnection (read in unread rows etc)
+                            qr1.disconnect();
+                        }
+                    }
+                    public void managedConnectionPostClose(){}
+                    public void resourcePostClose()
+                    {
+                        mconn1.removeListener(this);
+                    }
+                };
+                mconn.addListener(listener);
+                ((AbstractQueryResult)qr1).addConnectionListener(listener);
             }
+
+            return results;
         }
         finally
         {

Added: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/LazyLoadQueryResult.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/LazyLoadQueryResult.java	                        (rev 0)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/LazyLoadQueryResult.java	2012-08-14 14:44:38 UTC (rev 15416)
@@ -0,0 +1,444 @@
+/**********************************************************************
+Copyright (c) 2012 Andy Jefferson and others. All rights reserved.
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+Contributors:
+    ...
+**********************************************************************/
+package org.datanucleus.store.mongodb.query;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.NoSuchElementException;
+
+import org.datanucleus.metadata.AbstractClassMetaData;
+import org.datanucleus.store.ExecutionContext;
+import org.datanucleus.store.mongodb.MongoDBUtils;
+import org.datanucleus.store.query.AbstractQueryResult;
+import org.datanucleus.store.query.AbstractQueryResultIterator;
+import org.datanucleus.store.query.Query;
+import org.datanucleus.util.NucleusLogger;
+import org.datanucleus.util.SoftValueMap;
+import org.datanucleus.util.StringUtils;
+import org.datanucleus.util.WeakValueMap;
+
+import com.mongodb.DBCursor;
+import com.mongodb.DBObject;
+
+/**
+ * QueryResult for MongoDB queries that tries to lazy load results from the provided DBCursor(s)
+ * so to avoid problems with memory.
+ */
+public class LazyLoadQueryResult extends AbstractQueryResult
+{
+    protected ExecutionContext ec;
+
+    /** Candidate results for this query that have not been (completely) processed yet. */
+    protected List<CandidateClassResult> candidateResults = new ArrayList<CandidateClassResult>();
+
+    /** Iterator for the DBCursor that is being processed (if any). */
+    protected Iterator<DBObject> currentCursorIterator = null;
+
+    /** Whether there are still more rows to be processed in the DBCursor(s). */
+    protected boolean moreCursorRows = true;
+
+    /** Map of object, keyed by the index (0, 1, etc). */
+    protected Map<Integer, Object> itemsByIndex = null;
+
+    public LazyLoadQueryResult(Query q)
+    {
+        super(q);
+        this.ec = q.getExecutionContext();
+
+        // Process any supported extensions
+        String cacheType = query.getStringExtensionProperty("cacheType", "strong");
+        if (cacheType != null)
+        {
+            if (cacheType.equalsIgnoreCase("soft"))
+            {
+                itemsByIndex = new SoftValueMap();
+            }
+            else if (cacheType.equalsIgnoreCase("weak"))
+            {
+                itemsByIndex = new WeakValueMap();
+            }
+            else if (cacheType.equalsIgnoreCase("strong"))
+            {
+                itemsByIndex = new HashMap();
+            }
+            else if (cacheType.equalsIgnoreCase("none"))
+            {
+                itemsByIndex = null;
+            }
+            else
+            {
+                itemsByIndex = new WeakValueMap();
+            }
+        }
+        else
+        {
+            itemsByIndex = new WeakValueMap();
+        }
+    }
+
+    private class CandidateClassResult
+    {
+        AbstractClassMetaData cmd;
+        DBCursor cursor;
+        int[] fpMembers;
+        public CandidateClassResult(AbstractClassMetaData cmd, DBCursor curs, int[] fpMemberPositions)
+        {
+            this.cmd = cmd;
+            this.cursor = curs;
+            this.fpMembers = fpMemberPositions;
+        }
+    }
+
+    public void addCandidateResult(AbstractClassMetaData cmd, DBCursor cursor, int[] fpMembers)
+    {
+        candidateResults.add(new CandidateClassResult(cmd, cursor, fpMembers));
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.store.query.AbstractQueryResult#closingConnection()
+     */
+    @Override
+    protected void closingConnection()
+    {
+        if (loadResultsAtCommit && isOpen() && !candidateResults.isEmpty())
+        {
+            // Query connection closing message
+            NucleusLogger.QUERY.info(LOCALISER.msg("052606", query.toString()));
+
+            synchronized (this)
+            {
+                if (currentCursorIterator != null)
+                {
+                    // Finish off the current cursor
+                    CandidateClassResult result = candidateResults.get(0);
+                    while (currentCursorIterator.hasNext())
+                    {
+                        DBObject dbObject = currentCursorIterator.next();
+                        Object pojo = MongoDBUtils.getPojoForDBObjectForCandidate(dbObject, ec, result.cmd,
+                            result.fpMembers, query.getIgnoreCache());
+                        itemsByIndex.put(itemsByIndex.size(), pojo);
+                    }
+                    result.cursor.close();
+                    candidateResults.remove(result);
+                    currentCursorIterator = null;
+                }
+
+                // Process remaining cursors
+                Iterator<CandidateClassResult> candidateResultsIter = candidateResults.iterator();
+                while (candidateResultsIter.hasNext())
+                {
+                    CandidateClassResult result = candidateResultsIter.next();
+                    currentCursorIterator = result.cursor.iterator();
+                    while (currentCursorIterator.hasNext())
+                    {
+                        DBObject dbObject = currentCursorIterator.next();
+                        Object pojo = MongoDBUtils.getPojoForDBObjectForCandidate(dbObject, ec, result.cmd,
+                            result.fpMembers, query.getIgnoreCache());
+                        itemsByIndex.put(itemsByIndex.size(), pojo);
+                    }
+                    result.cursor.close();
+                    candidateResultsIter.remove();
+                    currentCursorIterator = null;
+                }
+            }
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.store.query.AbstractQueryResult#close()
+     */
+    @Override
+    public synchronized void close()
+    {
+        itemsByIndex.clear();
+        itemsByIndex = null;
+
+        candidateResults = null;
+
+        super.close();
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.store.query.AbstractQueryResult#closeResults()
+     */
+    @Override
+    protected void closeResults()
+    {
+        // TODO Close the DBCursor objects
+
+        // TODO Cache any query results if required
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.store.query.AbstractQueryResult#getSizeUsingMethod()
+     */
+    @Override
+    protected int getSizeUsingMethod()
+    {
+        if (resultSizeMethod.equalsIgnoreCase("LAST"))
+        {
+            // Just load all results and the size is the number we have
+            while (true)
+            {
+                getNextObject();
+                if (candidateResults.isEmpty())
+                {
+                    size = itemsByIndex.size();
+                    return size;
+                }
+            }
+        }
+
+        return super.getSizeUsingMethod();
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.store.query.AbstractQueryResult#get(int)
+     */
+    @Override
+    public Object get(int index)
+    {
+        if (index < 0)
+        {
+            throw new IndexOutOfBoundsException("Index must be 0 or higher");
+        }
+
+        if (itemsByIndex != null && itemsByIndex.containsKey(index))
+        {
+            return itemsByIndex.get(index);
+        }
+        else
+        {
+            // Load next object continually until we find it
+            while (true)
+            {
+                Object nextPojo = getNextObject();
+                if (itemsByIndex.size() == (index+1))
+                {
+                    return nextPojo;
+                }
+                if (candidateResults.isEmpty())
+                {
+                    throw new IndexOutOfBoundsException("Beyond size of the results (" + itemsByIndex.size() + ")");
+                }
+            }
+        }
+    }
+
+    /**
+     * Method to extract the next object from the candidateResults (if there is one).
+     * If a result is present, this puts it into "itemsByIndex".
+     * Returns null if no more results.
+     * @return The next result (or null if no more).
+     */
+    protected Object getNextObject()
+    {
+        if (candidateResults.isEmpty())
+        {
+            // Already exhausted
+            return null;
+        }
+
+        Object pojo = null;
+        CandidateClassResult result = candidateResults.get(0);
+
+        if (currentCursorIterator != null)
+        {
+            // Continue the current cursor iterator
+            DBObject dbObject = currentCursorIterator.next();
+            pojo = MongoDBUtils.getPojoForDBObjectForCandidate(dbObject, ec, result.cmd,
+                result.fpMembers, query.getIgnoreCache());
+            itemsByIndex.put(itemsByIndex.size(), pojo);
+
+            if (!currentCursorIterator.hasNext())
+            {
+                // Reached end of Cursor, so close the current iterator/cursor and remove the result
+                result.cursor.close();
+                currentCursorIterator = null;
+                candidateResults.remove(result);
+            }
+        }
+        else
+        {
+            // Start next candidate result
+            boolean noNextResult = true;
+            while (noNextResult)
+            {
+                currentCursorIterator = result.cursor.iterator();
+                if (currentCursorIterator.hasNext())
+                {
+                    DBObject dbObject = currentCursorIterator.next();
+                    pojo = MongoDBUtils.getPojoForDBObjectForCandidate(dbObject, ec, result.cmd,
+                        result.fpMembers, query.getIgnoreCache());
+                    itemsByIndex.put(itemsByIndex.size(), pojo);
+                    noNextResult = false;
+
+                    if (!currentCursorIterator.hasNext())
+                    {
+                        // Reached end of Cursor, so close the current iterator/cursor and remove the result
+                        result.cursor.close();
+                        currentCursorIterator = null;
+                        candidateResults.remove(result);
+                    }
+                }
+                else
+                {
+                    // Cursor had no results so close and move on
+                    result.cursor.close();
+                    currentCursorIterator = null;
+                    candidateResults.remove(result);
+                    if (candidateResults.isEmpty())
+                    {
+                        // Break out since no more results
+                        noNextResult = false;
+                        pojo = null;
+                    }
+                    else
+                    {
+                        // Move on to next result
+                        result = candidateResults.get(0);
+                    }
+                }
+            }
+        }
+
+        return pojo;
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.store.query.AbstractQueryResult#iterator()
+     */
+    @Override
+    public Iterator iterator()
+    {
+        return new QueryResultIterator();
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.store.query.AbstractQueryResult#listIterator()
+     */
+    @Override
+    public ListIterator listIterator()
+    {
+        return new QueryResultIterator();
+    }
+
+    private class QueryResultIterator extends AbstractQueryResultIterator
+    {
+        private int nextRowNum = 0;
+
+        @Override
+        public boolean hasNext()
+        {
+            synchronized (LazyLoadQueryResult.this)
+            {
+                if (!isOpen())
+                {
+                    // Spec 14.6.7 Calling hasNext() on closed Query will return false
+                    return false;
+                }
+
+                if (nextRowNum < itemsByIndex.size())
+                {
+                    return true;
+                }
+
+                return !candidateResults.isEmpty();
+            }
+        }
+
+        @Override
+        public Object next()
+        {
+            synchronized (LazyLoadQueryResult.this)
+            {
+                if (!isOpen())
+                {
+                    // Spec 14.6.7 Calling next() on closed Query will throw NoSuchElementException
+                    throw new NoSuchElementException(LOCALISER.msg("052600"));
+                }
+
+                if (nextRowNum < itemsByIndex.size())
+                {
+                    Object pojo = itemsByIndex.get(nextRowNum);
+                    ++nextRowNum;
+                    return pojo;
+                }
+                else if (!candidateResults.isEmpty())
+                {
+                    Object pojo = getNextObject();
+                    ++nextRowNum;
+                    return pojo;
+                }
+                throw new NoSuchElementException(LOCALISER.msg("052602"));
+            }
+        }
+
+        @Override
+        public boolean hasPrevious()
+        {
+            // We only navigate in forward direction, but maybe could provide this method
+            throw new UnsupportedOperationException("Not yet implemented");
+        }
+
+        @Override
+        public int nextIndex()
+        {
+            throw new UnsupportedOperationException("Not yet implemented");
+        }
+
+        @Override
+        public Object previous()
+        {
+            throw new UnsupportedOperationException("Not yet implemented");
+        }
+
+        @Override
+        public int previousIndex()
+        {
+            throw new UnsupportedOperationException("Not yet implemented");
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see org.datanucleus.store.query.AbstractQueryResult#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object o)
+    {
+        if (o == null || !(o instanceof LazyLoadQueryResult))
+        {
+            return false;
+        }
+
+        LazyLoadQueryResult other = (LazyLoadQueryResult)o;
+        if (candidateResults != null)
+        {
+            return other.candidateResults.equals(candidateResults);
+        }
+        else if (query != null)
+        {
+            return other.query == query;
+        }
+        return StringUtils.toJVMIDString(other).equals(StringUtils.toJVMIDString(this));
+    }
+}
\ No newline at end of file

Deleted: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/MongoDBCandidateList.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/MongoDBCandidateList.java	2012-08-14 07:55:29 UTC (rev 15415)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/MongoDBCandidateList.java	2012-08-14 14:44:38 UTC (rev 15416)
@@ -1,168 +0,0 @@
-/**********************************************************************
-Copyright (c) 2011 Andy Jefferson and others. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-Contributors:
-   ...
-**********************************************************************/
-package org.datanucleus.store.mongodb.query;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.datanucleus.FetchPlan;
-import org.datanucleus.metadata.AbstractClassMetaData;
-import org.datanucleus.metadata.IdentityType;
-import org.datanucleus.store.ExecutionContext;
-import org.datanucleus.store.mongodb.MongoDBUtils;
-import org.datanucleus.store.query.AbstractCandidateLazyLoadList;
-
-import com.mongodb.DBCursor;
-import com.mongodb.DBObject;
-
-/**
- * Wrapper for lazy-loaded list of results from a MongoDB query.
- * Usage is as follows :-
- * <pre>
- * MongoDBCandidateList results = new MongoDBCandidateList(myCls, subclasses, ec, cacheType, fp, ignoreCache);
- * results.addCandidateCursor(cmd1, curs1);
- * results.addCandidateCursor(cmd2, curs2);
- * results.addCandidateCursor(cmd3, curs3);
- * ... use as a normal list now
- * results.close();
- * </pre>
- * Access to the list (and any iterator for it) will lazily load the candidate instances from the provided DBCursors.
- */
-public class MongoDBCandidateList extends AbstractCandidateLazyLoadList
-{
-    List<DBCursor> cursors = new ArrayList<DBCursor>();
-
-    int size = -1;
-
-    FetchPlan fp;
-
-    boolean ignoreCache;
-
-    /**
-     * @param cls
-     * @param subclasses
-     * @param ec
-     * @param cacheType
-     */
-    public MongoDBCandidateList(Class cls, boolean subclasses, ExecutionContext ec, String cacheType,
-            FetchPlan fp, boolean ignoreCache)
-    {
-        super(cls, subclasses, ec, cacheType);
-        this.ignoreCache = ignoreCache;
-        this.fp = fp;
-
-        // Add placeholders for the cursors (populated by addCandidateCursor)
-        for (int i=0;i<cmds.size();i++)
-        {
-            cursors.add(null);
-        }
-    }
-
-    public void addCandidateCursor(AbstractClassMetaData cmd, DBCursor cursor)
-    {
-        int position = cmds.indexOf(cmd);
-        cursors.set(position, cursor);
-    }
-
-    public void close()
-    {
-        Iterator<DBCursor> cursorIter = cursors.iterator();
-        while (cursorIter.hasNext())
-        {
-            DBCursor cursor = cursorIter.next();
-            cursor.close();
-        }
-    }
-
-    /* (non-Javadoc)
-     * @see org.datanucleus.store.query.AbstractLazyLoadList#retrieveObjectForIndex(int)
-     */
-    @Override
-    protected Object retrieveObjectForIndex(int index)
-    {
-        Iterator<DBCursor> cursorIter = cursors.iterator();
-        Iterator<AbstractClassMetaData> cmdIter = cmds.iterator();
-        int first = 0;
-        int last = -1;
-        while (cursorIter.hasNext())
-        {
-            DBCursor cursor = cursorIter.next();
-            AbstractClassMetaData cmd = cmdIter.next();
-            last = first + cursor.size();
-            if (index >= first && index < last)
-            {
-                // Found in this cursor
-                // TODO This assumes we are always going forward continually. Needs to cater for jumping back
-                int i= first + cursor.numSeen();
-                while (cursor.hasNext())
-                {
-                    DBObject dbObject = cursor.next();
-                    if (i == index)
-                    {
-                        int[] fpMembers = fp.getFetchPlanForClass(cmd).getMemberNumbers();
-                        if (cmd.getIdentityType() == IdentityType.APPLICATION)
-                        {
-                            return MongoDBUtils.getObjectUsingApplicationIdForDBObject(dbObject, cmd, ec, ignoreCache,
-                                fpMembers);
-                        }
-                        else if (cmd.getIdentityType() == IdentityType.DATASTORE)
-                        {
-                            return MongoDBUtils.getObjectUsingDatastoreIdForDBObject(dbObject, cmd, ec, ignoreCache,
-                                fpMembers);
-                        }
-                        else
-                        {
-                            return MongoDBUtils.getObjectUsingNondurableIdForDBObject(dbObject, cmd, ec, ignoreCache,
-                                fpMembers);
-                        }
-                    }
-                    i++;
-                }
-            }
-            else
-            {
-                first = last;
-            }
-        }
-
-        return null;
-    }
-
-    /* (non-Javadoc)
-     * @see org.datanucleus.store.query.AbstractLazyLoadList#getSize()
-     */
-    @Override
-    protected int getSize()
-    {
-        if (size >= 0)
-        {
-            return size;
-        }
-
-        size = 0;
-        Iterator<DBCursor> cursorIter = cursors.iterator();
-        while (cursorIter.hasNext())
-        {
-            DBCursor cursor = cursorIter.next();
-            size += cursor.size();
-        }
-
-        return size;
-    }
-}
\ No newline at end of file

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15442
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15442&view=rev
Author:   andy_jefferson
Date:     2012-08-20 10:10:22 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
Support Calendar as query parameter

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-08-18 10:50:46 UTC (rev 15441)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBUtils.java	2012-08-20 10:10:22 UTC (rev 15442)
@@ -777,7 +777,7 @@
      * Convenience method to convert the raw value of an object field into the value that will be stored
      * in MongoDB. Note that this does not cater for relation fields, just basic fields.
      * @param ec ExecutionContext
-     * @param mmd Metadata for the field holding this value
+     * @param mmd Metadata for the field holding this value (if available)
      * @param value The raw value for the field
      * @param role The role of this value for the field
      * @return The value to store
@@ -814,7 +814,7 @@
             }
         }
 
-        if (mmd.hasCollection() && fieldRole == FieldRole.ROLE_FIELD)
+        if (mmd != null && mmd.hasCollection() && fieldRole == FieldRole.ROLE_FIELD)
         {
             Collection coll = new ArrayList();
             Collection rawColl = (Collection)value;
@@ -825,7 +825,7 @@
             }
             return coll;
         }
-        else if (mmd.hasArray() && fieldRole == FieldRole.ROLE_FIELD)
+        else if (mmd != null && mmd.hasArray() && fieldRole == FieldRole.ROLE_FIELD)
         {
             Object[] array = new Object[Array.getLength(value)];
             for (int i=0;i<array.length;i++)
@@ -862,6 +862,7 @@
         }
         else if (Calendar.class.isAssignableFrom(type))
         {
+            // TODO Support persisting as String
             return ((Calendar)value).getTime();
         }
         else if (Character.class.isAssignableFrom(type))
@@ -913,7 +914,7 @@
      * Convenience method to convert the stored value for an object field into the value that will be held
      * in the object. Note that this does not cater for relation fields, just basic fields.
      * @param ec ExecutionContext
-     * @param mmd Metadata for the field holding this value
+     * @param mmd Metadata for the field holding this value (if available)
      * @param value The stored value for the field
      * @param role The role of this value for the field
      * @return The value to put in the field
@@ -950,7 +951,7 @@
             }
         }
 
-        if (mmd.hasCollection() && fieldRole == FieldRole.ROLE_FIELD)
+        if (mmd != null && mmd.hasCollection() && fieldRole == FieldRole.ROLE_FIELD)
         {
             Collection<Object> coll;
             try
@@ -971,7 +972,7 @@
             }
             return coll;
         }
-        else if (mmd.hasArray() && fieldRole == FieldRole.ROLE_FIELD)
+        else if (mmd != null && mmd.hasArray() && fieldRole == FieldRole.ROLE_FIELD)
         {
             Collection rawColl = (Collection)value;
             Object array = Array.newInstance(mmd.getType().getComponentType(), rawColl.size());
@@ -1102,6 +1103,7 @@
         }
         else if (Calendar.class.isAssignableFrom(type))
         {
+            // TODO Support persisting as String
             Calendar cal = Calendar.getInstance();
             cal.setTime((Date)value);
             return cal;

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java	2012-08-18 10:50:46 UTC (rev 15441)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/query/QueryToMongoDBMapper.java	2012-08-20 10:10:22 UTC (rev 15442)
@@ -28,6 +28,7 @@
 import org.datanucleus.metadata.AbstractClassMetaData;
 import org.datanucleus.metadata.AbstractMemberMetaData;
 import org.datanucleus.metadata.EmbeddedMetaData;
+import org.datanucleus.metadata.FieldRole;
 import org.datanucleus.metadata.Relation;
 import org.datanucleus.query.compiler.CompilationComponent;
 import org.datanucleus.query.compiler.QueryCompilation;
@@ -310,6 +311,7 @@
     {
         Object right = stack.pop();
         Object left = stack.pop();
+        NucleusLogger.GENERAL.info(">> processEq left=" + left + " right=" + right);
         if (left instanceof MongoLiteral && right instanceof MongoFieldExpression)
         {
             MongoExpression mongoExpr =
@@ -603,6 +605,14 @@
                 precompilable = false;
                 return lit;
             }
+            else if (paramValue instanceof java.util.Calendar)
+            {
+                Object storedVal = MongoDBUtils.getStoredValueForField(ec, null, paramValue, FieldRole.ROLE_FIELD);
+                MongoLiteral lit = new MongoLiteral(storedVal);
+                stack.push(lit);
+                precompilable = false;
+                return lit;
+            }
             else if (paramValue instanceof Date)
             {
                 MongoLiteral lit = new MongoLiteral(paramValue);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 15761
          http://datanucleus.svn.sourceforge.net/datanucleus/?rev=15761&view=rev
Author:   andy_jefferson
Date:     2012-10-16 11:16:13 +0000 (Tue, 16 Oct 2012)
Log Message:
-----------
[NUCMONGODB-109] Update schema runtime process to allow use of existing connection
[NUCMONGODB-110] Use commitOnRelease variable to decide when to call requestDone.
Don't close connection after commit; keep hold of it in the pool

Modified Paths:
--------------
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/ConnectionFactoryImpl.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation.properties
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation_es.properties
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
    platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/ConnectionFactoryImpl.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/ConnectionFactoryImpl.java	2012-10-16 11:07:26 UTC (rev 15760)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/ConnectionFactoryImpl.java	2012-10-16 11:16:13 UTC (rev 15761)
@@ -31,7 +31,6 @@
 import org.datanucleus.store.connection.AbstractConnectionFactory;
 import org.datanucleus.store.connection.AbstractManagedConnection;
 import org.datanucleus.store.connection.ManagedConnection;
-import org.datanucleus.store.connection.ManagedConnectionResourceListener;
 import org.datanucleus.util.Localiser;
 import org.datanucleus.util.NucleusLogger;
 import org.datanucleus.util.StringUtils;
@@ -186,7 +185,7 @@
     }
 
     /**
-     * Obtain a connection from the Factory. The connection will be enlisted within the {@link org.datanucleus.Transaction} 
+     * Obtain a connection from the Factory. The connection will be enlisted within the transaction 
      * associated to the <code>poolKey</code> if "enlist" is set to true.
      * @param poolKey the pool that is bound the connection during its lifecycle (or null)
      * @param transactionOptions Any options for then creating the connection
@@ -230,14 +229,17 @@
                 {
                     ((DB)conn).setReadOnly(Boolean.TRUE);
                 }
+                ((DB)conn).requestStart();
             }
-            ((DB)conn).requestStart();
             return conn;
         }
 
         public void release()
         {
-            ((DB)conn).requestDone();
+            if (commitOnRelease)
+            {
+                ((DB)conn).requestDone();
+            }
             super.release();
         }
 
@@ -247,17 +249,24 @@
             {
                 return;
             }
-            for (int i=0; i<listeners.size(); i++)
+
+            if (!commitOnRelease)
             {
-                ((ManagedConnectionResourceListener)listeners.get(i)).managedConnectionPreClose();
+                // End the current request when commit on close
+                ((DB)conn).requestDone();
             }
 
-//            DB db = (DB)conn;
+            // Note this is commented out since we want MongoDB connections to be retained after a txn commits
+            /*for (int i=0; i<listeners.size(); i++)
+            {
+                ((ManagedConnectionResourceListener)listeners.get(i)).managedConnectionPreClose();
+            }*/
 
-            for (int i=0; i<listeners.size(); i++)
+            /*for (int i=0; i<listeners.size(); i++)
             {
+                // Removes the connection from pooling
                 ((ManagedConnectionResourceListener)listeners.get(i)).managedConnectionPostClose();
-            }
+            }*/
         }
 
         public XAResource getXAResource()

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation.properties
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation.properties	2012-10-16 11:07:26 UTC (rev 15760)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation.properties	2012-10-16 11:16:13 UTC (rev 15761)
@@ -34,7 +34,7 @@
 
 MongoDB.SchemaCreate.Class=Creating schema for class "{0}" in collection "{1}"
 MongoDB.SchemaCreate.Class.Field=Creating field "{0}" for collection "{1}"
-MongoDB.SchemaCreate.Class.Index=Creating index "{0}" for collection "{1}" as "{2}"
+MongoDB.SchemaCreate.Class.Index=Ensuring presence of index "{0}" for collection "{1}" as "{2}"
 MongoDB.SchemaDelete.Class=Deleting schema for class "{0}" in collection "{1}"
 MongoDB.SchemaValidate.Class=Validate schema for class "{0}" failed since collection "{1}" is missing
 MongoDB.SchemaValidate.Class.Field=Validate schema of collection "{0}" has field "{1}" missing

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation_es.properties
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation_es.properties	2012-10-16 11:07:26 UTC (rev 15760)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/Localisation_es.properties	2012-10-16 11:16:13 UTC (rev 15761)
@@ -34,7 +34,7 @@
 
 MongoDB.SchemaCreate.Class=Creando el esquema para la clase "{0}" en la colleccion "{1}"
 MongoDB.SchemaCreate.Class.Field=Creando campo "{0}" para la colleccion "{1}"
-MongoDB.SchemaCreate.Class.Index=Creando indice "{0}" para la colleccion "{1}" como "{2}"
+MongoDB.SchemaCreate.Class.Index=Averiguando el indice "{0}" para la colleccion "{1}" como "{2}"
 MongoDB.SchemaDelete.Class=Borrando el esquema de la clase "{0}" en la colleccion "{1}"
 MongoDB.SchemaValidate.Class=Validar el esquema de la clase "{0}", no tiene la colleccion "{1}" !
 MongoDB.SchemaValidate.Class.Field=Validar el esquema de la colleccion "{0}" no tiene el campo "{1}" !

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2012-10-16 11:07:26 UTC (rev 15760)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBPersistenceHandler.java	2012-10-16 11:16:13 UTC (rev 15761)
@@ -143,7 +143,8 @@
                     AbstractClassMetaData cmd = op.getClassMetaData();
                     if (!storeMgr.managesClass(cmd.getFullClassName()))
                     {
-                        storeMgr.addClass(cmd.getFullClassName(), op.getExecutionContext().getClassLoaderResolver());
+                        // Make sure schema exists (using this connection)
+                        storeMgr.addClasses(new String[] {cmd.getFullClassName()}, op.getExecutionContext().getClassLoaderResolver(), db);
                     }
 
                     if (NucleusLogger.DATASTORE_PERSIST.isDebugEnabled())
@@ -200,17 +201,18 @@
         storeMgr.assertReadOnlyForUpdateOfObject(op);
 
         ExecutionContext ec = op.getExecutionContext();
-        AbstractClassMetaData cmd = op.getClassMetaData();
-        if (!storeMgr.managesClass(cmd.getFullClassName()))
-        {
-            storeMgr.addClass(cmd.getFullClassName(), ec.getClassLoaderResolver());
-        }
-
         ManagedConnection mconn = storeMgr.getConnection(ec);
         try
         {
             DB db = (DB)mconn.getConnection();
 
+            AbstractClassMetaData cmd = op.getClassMetaData();
+            if (!storeMgr.managesClass(cmd.getFullClassName()))
+            {
+                // Make sure schema exists, using this connection
+                storeMgr.addClasses(new String[] {cmd.getFullClassName()}, ec.getClassLoaderResolver(), db);
+            }
+
             long startTime = System.currentTimeMillis();
             if (NucleusLogger.DATASTORE_PERSIST.isDebugEnabled())
             {

Modified: platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java
===================================================================
--- platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java	2012-10-16 11:07:26 UTC (rev 15760)
+++ platform/store.mongodb/trunk/src/java/org/datanucleus/store/mongodb/MongoDBStoreManager.java	2012-10-16 11:16:13 UTC (rev 15761)
@@ -221,39 +221,50 @@
             return;
         }
 
+        ManagedConnection mconn = getConnection(-1);
+        try
+        {
+            DB db = (DB)mconn.getConnection();
+
+            addClasses(classNames, clr, db);
+        }
+        finally
+        {
+            mconn.release();
+        }
+    }
+
+    public void addClasses(String[] classNames, ClassLoaderResolver clr, DB db)
+    {
+        if (classNames == null)
+        {
+            return;
+        }
+
         // Filter out any "simple" type classes
         String[] filteredClassNames = 
             getNucleusContext().getTypeManager().filterOutSupportedSecondClassNames(classNames);
 
         // Find the ClassMetaData for these classes and all referenced by these classes
-        ManagedConnection mconn = getConnection(-1);
-        try
+        Iterator iter = getMetaDataManager().getReferencedClasses(filteredClassNames, clr).iterator();
+        while (iter.hasNext())
         {
-            DB db = (DB)mconn.getConnection();
-            Iterator iter = getMetaDataManager().getReferencedClasses(filteredClassNames, clr).iterator();
-            while (iter.hasNext())
+            ClassMetaData cmd = (ClassMetaData)iter.next();
+            if (cmd.getPersistenceModifier() == ClassPersistenceModifier.PERSISTENCE_CAPABLE)
             {
-                ClassMetaData cmd = (ClassMetaData)iter.next();
-                if (cmd.getPersistenceModifier() == ClassPersistenceModifier.PERSISTENCE_CAPABLE)
+                if (!storeDataMgr.managesClass(cmd.getFullClassName()))
                 {
-                    if (!storeDataMgr.managesClass(cmd.getFullClassName()))
+                    StoreData sd = storeDataMgr.get(cmd.getFullClassName());
+                    if (sd == null)
                     {
-                        StoreData sd = storeDataMgr.get(cmd.getFullClassName());
-                        if (sd == null)
-                        {
-                            registerStoreData(newStoreData(cmd, clr));
-                        }
+                        registerStoreData(newStoreData(cmd, clr));
+                    }
 
-                        // Create schema for class
-                        createSchemaForClass(cmd, db);
-                    }
+                    // Create schema for class
+                    createSchemaForClass(cmd, db);
                 }
             }
         }
-        finally
-        {
-            mconn.release();
-        }
     }
 
     /* (non-Javadoc)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.