[337152] [Mongo] Create a MongoDBStore

https://bugs.eclipse.org/bugs/show_bug.cgi?id=337152

3 files changed, 115 insertions, 28 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStore.java b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStore.java
index b0f8cb4c97..207a86a24d 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStore.java
@@ -41,6 +41,12 @@ import java.util.Map.Entry;
 import java.util.Set;

 

 /**

+ * TODO:

+ * <ul>

+ * <li>Are indexes always unique? Do unique indexes exist?

+ * <li>Are <code>_id</code> fields in embedded objects automatically indexed?

+ * </ul>

+ * 

  * @author Eike Stepper

  */

 public class MongoDBStore extends Store implements IMongoDBStore

@@ -294,6 +300,21 @@ public class MongoDBStore extends Store implements IMongoDBStore
     packageUnitsCollection = db.getCollection("cdo.packageUnits");

     commitInfosCollection = db.getCollection("cdo.commitInfos");

 

+    DBObject packages_pk = new BasicDBObject("packages.id", 1);

+    commitInfosCollection.ensureIndex(packages_pk, "packages_pk");

+

+    DBObject packages_time = new BasicDBObject("packages.time", 1);

+    commitInfosCollection.ensureIndex(packages_time, "packages_time");

+

+    DBObject revisions_pk = new BasicDBObject("revisions.cdo_id", 1).append("revisions.cdo_version", 1);

+    commitInfosCollection.ensureIndex(revisions_pk, "revisions_pk");

+

+    DBObject revisions_created = new BasicDBObject("revisions.cdo_created", 1);

+    commitInfosCollection.ensureIndex(revisions_created, "revisions_created");

+

+    DBObject revisions_revised = new BasicDBObject("revisions.cdo_revised", 1);

+    commitInfosCollection.ensureIndex(revisions_revised, "revisions_revised");

+

     LifecycleUtil.activate(idHandler);

     setObjectIDTypes(idHandler.getObjectIDTypes());

 

diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStoreAccessor.java
index b470a4d9b8..36d04287f1 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStoreAccessor.java
@@ -58,6 +58,7 @@ import com.mongodb.DBObject;
 

 import java.io.IOException;

 import java.io.OutputStream;

+import java.util.ArrayList;

 import java.util.Collection;

 import java.util.Iterator;

 import java.util.List;

@@ -267,7 +268,7 @@ public class MongoDBStoreAccessor extends StoreAccessorBase implements IMongoDBS
   {

     try

     {

-      monitor.begin(107);

+      monitor.begin(104);

       CDOBranchPoint branchPoint = context.getBranchPoint();

 

       DBObject doc = new BasicDBObject();

@@ -299,34 +300,23 @@ public class MongoDBStoreAccessor extends StoreAccessorBase implements IMongoDBS
       InternalCDOPackageUnit[] newPackageUnits = context.getNewPackageUnits();

       if (!ObjectUtil.isEmpty(newPackageUnits))

       {

-        doc.put("meta", marshallPackageUnits(newPackageUnits));

+        doc.put("packages", marshallPackageUnits(newPackageUnits));

       }

 

       monitor.worked();

       addIDMappings(context, monitor.fork());

       context.applyIDMappings(monitor.fork());

 

-      InternalCDORevision[] newObjects = context.getNewObjects();

-      if (!ObjectUtil.isEmpty(newObjects))

+      List<DBObject> docs = new ArrayList<DBObject>();

+      marshalRevisions(docs, context.getNewObjects());

+      marshalRevisions(docs, context.getDirtyObjects());

+      if (!docs.isEmpty())

       {

-        doc.put("new", marshallRevisions(newObjects));

+        doc.put("revisions", docs);

       }

 

       monitor.worked();

-      InternalCDORevisionDelta[] dirtyObjectDeltas = context.getDirtyObjectDeltas();

-      if (!ObjectUtil.isEmpty(dirtyObjectDeltas))

-      {

-        doc.put("changed", marshallRevisionDeltas(dirtyObjectDeltas));

-      }

-

-      monitor.worked();

-      Map<CDOID, EClass> detachedObjectTypes = context.getDetachedObjectTypes();

-      if (!ObjectUtil.isEmpty(detachedObjectTypes))

-      {

-        doc.put("detached", marshallObjectTypes(detachedObjectTypes));

-      }

 

-      monitor.worked();

       getStore().getCommitInfosCollection().insert(doc);

       monitor.worked(100);

 

@@ -355,7 +345,7 @@ public class MongoDBStoreAccessor extends StoreAccessorBase implements IMongoDBS
     return getStore().getIDHandler().getNextCDOID(revision);

   }

 

-  protected DBObject[] marshallPackageUnits(InternalCDOPackageUnit[] packageUnits)

+  private DBObject[] marshallPackageUnits(InternalCDOPackageUnit[] packageUnits)

   {

     DBObject[] result = new DBObject[packageUnits.length];

     InternalCDOPackageRegistry packageRegistry = getStore().getRepository().getPackageRegistry();

@@ -367,10 +357,10 @@ public class MongoDBStoreAccessor extends StoreAccessorBase implements IMongoDBS
       byte[] bytes = EMFUtil.getEPackageBytes(ePackage, ZIP_PACKAGE_BYTES, packageRegistry);

 

       DBObject doc = new BasicDBObject();

-      doc.put("_id", packageUnit.getID());

-      doc.put("originalType", packageUnit.getOriginalType().toString());

-      doc.put("timeStamp", packageUnit.getTimeStamp());

-      doc.put("packageData", bytes);

+      doc.put("id", packageUnit.getID());

+      doc.put("type", packageUnit.getOriginalType().toString());

+      doc.put("time", packageUnit.getTimeStamp());

+      doc.put("data", bytes);

 

       result[i] = doc;

     }

@@ -378,7 +368,16 @@ public class MongoDBStoreAccessor extends StoreAccessorBase implements IMongoDBS
     return result;

   }

 

-  protected DBObject[] marshallRevisions(InternalCDORevision[] revisions)

+  private void marshalRevisions(List<DBObject> docs, InternalCDORevision[] revisions)

+  {

+    for (InternalCDORevision revision : revisions)

+    {

+      DBObject doc = marshallRevision(revision);

+      docs.add(doc);

+    }

+  }

+

+  private DBObject[] marshallRevisions(InternalCDORevision[] revisions)

   {

     DBObject[] result = new DBObject[revisions.length];

     for (int i = 0; i < revisions.length; i++)

@@ -390,7 +389,7 @@ public class MongoDBStoreAccessor extends StoreAccessorBase implements IMongoDBS
     return result;

   }

 

-  protected DBObject marshallRevision(InternalCDORevision revision)

+  private DBObject marshallRevision(InternalCDORevision revision)

   {

     IDHandler idHandler = getStore().getIDHandler();

 

@@ -436,7 +435,7 @@ public class MongoDBStoreAccessor extends StoreAccessorBase implements IMongoDBS
     return doc;

   }

 

-  protected DBObject[] marshallRevisionDeltas(InternalCDORevisionDelta[] revisionDeltas)

+  private DBObject[] marshallRevisionDeltas(InternalCDORevisionDelta[] revisionDeltas)

   {

     DBObject[] result = new DBObject[revisionDeltas.length];

     for (int i = 0; i < revisionDeltas.length; i++)

@@ -448,7 +447,7 @@ public class MongoDBStoreAccessor extends StoreAccessorBase implements IMongoDBS
     return result;

   }

 

-  protected DBObject marshallRevisionDelta(InternalCDORevisionDelta revisionDelta)

+  private DBObject marshallRevisionDelta(InternalCDORevisionDelta revisionDelta)

   {

     IDHandler idHandler = getStore().getIDHandler();

 

diff --git a/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/InitialTestMongoDB.java b/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/InitialTestMongoDB.java
index ba22af454a..13348870d0 100644
--- a/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/InitialTestMongoDB.java
+++ b/plugins/org.eclipse.emf.cdo.tests.mongodb/src/org/eclipse/emf/cdo/tests/mongodb/InitialTestMongoDB.java
@@ -11,6 +11,7 @@
 package org.eclipse.emf.cdo.tests.mongodb;

 

 import org.eclipse.emf.cdo.eresource.CDOResource;

+import org.eclipse.emf.cdo.server.internal.mongodb.MongoDBStore;

 import org.eclipse.emf.cdo.session.CDOSession;

 import org.eclipse.emf.cdo.tests.AbstractCDOTest;

 import org.eclipse.emf.cdo.tests.config.IScenario;

@@ -21,6 +22,15 @@ import org.eclipse.emf.cdo.tests.config.impl.SessionConfig.Net4j;
 import org.eclipse.emf.cdo.tests.model1.Supplier;

 import org.eclipse.emf.cdo.transaction.CDOTransaction;

 

+import org.eclipse.net4j.util.concurrent.ConcurrencyUtil;

+

+import com.mongodb.BasicDBObject;

+import com.mongodb.DBCollection;

+import com.mongodb.DBCursor;

+import com.mongodb.DBObject;

+

+import java.io.PrintStream;

+

 /**

  * @author Eike Stepper

  */

@@ -37,7 +47,64 @@ public class InitialTestMongoDB extends AbstractCDOTest
     resource.getContents().add(supplier);

     transaction.commit();

 

-    sleep(1000000L);

+    query(new BasicDBObject("revisions", new BasicDBObject("$elemMatch", new BasicDBObject("cdo_resource", 1))));

+  }

+

+  protected void query(DBObject query)

+  {

+    System.err.println();

+    System.err.println("Query:");

+    showDocument(query, "");

+    System.err.println();

+    System.err.println("Results:");

+

+    MongoDBStore store = (MongoDBStore)getRepository().getStore();

+    DBCollection collection = store.getCommitInfosCollection();

+    DBCursor cursor = collection.find(query);

+

+    int i = 0;

+    while (cursor.hasNext())

+    {

+      ++i;

+      System.out.println("" + i + " = ");

+      showDocument(cursor.next(), "    ");

+    }

+

+    ConcurrencyUtil.sleep(1000000L);

+  }

+

+  protected void showDocument(DBObject doc, String level)

+  {

+    PrintStream pout = System.out;

+    for (String key : doc.keySet())

+    {

+      pout.print(level);

+      pout.print(key);

+      pout.print(" = ");

+

+      Object value = doc.get(key);

+      if (value instanceof DBObject)

+      {

+        DBObject child = (DBObject)value;

+        pout.println();

+        showDocument(child, level + "    ");

+      }

+      else

+      {

+        if (value instanceof String)

+        {

+          pout.print("\"");

+        }

+

+        pout.print(value);

+        if (value instanceof String)

+        {

+          pout.print("\"");

+        }

+

+        pout.println();

+      }

+    }

   }

 

   @Override