[332888] Remove the concept of MetaIDs

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

6 files changed, 16 insertions, 139 deletions

diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java
index db43ae7aa4..0dc4383887 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/ObjectivityStoreAccessor.java
@@ -18,8 +18,6 @@ import org.eclipse.emf.cdo.common.branch.CDOBranchVersion;
 import org.eclipse.emf.cdo.common.commit.CDOCommitInfo;
 import org.eclipse.emf.cdo.common.commit.CDOCommitInfoHandler;
 import org.eclipse.emf.cdo.common.id.CDOID;
-import org.eclipse.emf.cdo.common.id.CDOIDMeta;
-import org.eclipse.emf.cdo.common.id.CDOIDUtil;
 import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
 import org.eclipse.emf.cdo.common.model.EMFUtil;
 import org.eclipse.emf.cdo.common.model.lob.CDOLobHandler;
@@ -49,7 +47,6 @@ import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranch;
 import org.eclipse.emf.cdo.spi.common.branch.InternalCDOBranchManager;
 import org.eclipse.emf.cdo.spi.common.commit.CDOChangeSetSegment;
 import org.eclipse.emf.cdo.spi.common.commit.InternalCDOCommitInfoManager;
-import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageRegistry;
 import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageUnit;
 import org.eclipse.emf.cdo.spi.common.revision.DetachedCDORevision;
 import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
@@ -66,10 +63,8 @@ import org.eclipse.net4j.util.om.monitor.OMMonitor;
 import org.eclipse.net4j.util.om.trace.ContextTracer;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EModelElement;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 
 import com.objy.db.app.oo;
@@ -692,28 +687,6 @@ public class ObjectivityStoreAccessor extends StoreAccessor implements IObjectiv
     return getStore().getRepository().getPackageRegistry();
   }
 
-  private InternalCDOPackageRegistry getInternalPackageRegistry()
-  {
-    return (InternalCDOPackageRegistry)getPackageRegistry();
-  }
-
-  // TODO - move the following two calls to perhaps a MetaDataManager (as in cdo.db package).
-  // we shouldn't pollute this class with extra stuff.
-  // The meta info is definitely useful for FeatureMapEntry details.
-  public long getMetaID(EModelElement modelElement)
-  {
-    CDOID cdoid = getInternalPackageRegistry().getMetaInstanceMapper().lookupMetaInstanceID(
-        (InternalEObject)modelElement);
-    return CDOIDUtil.getLong(cdoid);
-  }
-
-  public EModelElement getMetaInstance(long id)
-  {
-    CDOIDMeta cdoid = CDOIDUtil.createMeta(id);
-    InternalEObject metaInstance = getInternalPackageRegistry().getMetaInstanceMapper().lookupMetaInstance(cdoid);
-    return (EModelElement)metaInstance;
-  }
-
   /**
    * TODO - 1) make sure that we return the root resource when we asked for "null" pathPrefix. 2) Create the "null"
    * resource folder if it doesn't exist, perhaps when we initialize the store.
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java
index b7a455e3f8..a39584fa4c 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyObject.java
@@ -16,7 +16,6 @@ import org.eclipse.emf.cdo.common.id.CDOIDExternal;
 import org.eclipse.emf.cdo.common.model.EMFUtil;
 import org.eclipse.emf.cdo.common.revision.CDOList;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
-import org.eclipse.emf.cdo.common.revision.CDORevisionUtil;
 import org.eclipse.emf.cdo.server.internal.objectivity.ObjectivityStoreAccessor;
 import org.eclipse.emf.cdo.server.internal.objectivity.bundle.OM;
 import org.eclipse.emf.cdo.server.internal.objectivity.mapper.IManyTypeMapper;
@@ -463,11 +462,7 @@ public class ObjyObject
               FeatureMap.Entry entry = (FeatureMap.Entry)value;
               EStructuralFeature entryFeature = entry.getEStructuralFeature();
               Object entryValue = entry.getValue();
-              long metaId = storeAccessor.getMetaID(entryFeature);
 
-              // System.out.println("-->> FeatureMap.Entry (" + i + ") -> feature:" + entryFeature.getName() +
-              // " - value:"
-              // + entryValue + " - MetaID: " + metaId);
               ooId oid = null;
               if (entryValue instanceof CDOIDExternal)
               {
@@ -488,9 +483,10 @@ public class ObjyObject
                   TRACER_DEBUG.trace("OBJY: don't know what kind of entryValue is this!!! - " + entryValue);
                 }
               }
+
               // FeatureMapEntry is a presistent class.
-              ObjyFeatureMapEntry featureMapEntry = new ObjyFeatureMapEntry(entryFeature.getName(), oid, metaId,
-                  objectId);
+              ObjyFeatureMapEntry featureMapEntry = new ObjyFeatureMapEntry(entryFeature.getName(), oid, objectId);
+
               // this.cluster(featureMapEntry);
               values[i] = featureMapEntry;
             }
@@ -674,7 +670,6 @@ public class ObjyObject
               else if (objects[i] instanceof ObjyFeatureMapEntry)
               {
                 ObjyFeatureMapEntry mapEntry = (ObjyFeatureMapEntry)objects[i];
-                long metaId = mapEntry.getMetaId();
                 ooId oid = mapEntry.getObject();
                 CDOID cdoId = null;
                 Class_Object refClassObject = Class_Object.class_object_from_oid(oid);
@@ -688,13 +683,13 @@ public class ObjyObject
                 {
                   cdoId = OBJYCDOIDUtil.getCDOID((ooId)objects[i]);
                 }
-                EStructuralFeature entryFeature = (EStructuralFeature)storeAccessor.getMetaInstance(metaId);
-                FeatureMap.Entry entry = CDORevisionUtil.createFeatureMapEntry(entryFeature, cdoId);
-                // for verifications...
-                entryFeature = entry.getEStructuralFeature();
 
-                list.add(entry);
-                refClassObject = null;
+                throw new UnsupportedOperationException("FIXME");
+
+                // FIXME Uncomment the following 3 lines:
+                // FeatureMap.Entry entry = CDORevisionUtil.createFeatureMapEntry(entryFeature, cdoId);
+                // list.add(entry);
+                // refClassObject = null;
               }
               else
               {
@@ -786,7 +781,6 @@ public class ObjyObject
           else if (objects[i] instanceof ObjyFeatureMapEntry)
           {
             ObjyFeatureMapEntry mapEntry = (ObjyFeatureMapEntry)objects[i];
-            long metaId = mapEntry.getMetaId();
             ooId oid = mapEntry.getObject();
             CDOID cdoId = null;
             Class_Object refClassObject = Class_Object.class_object_from_oid(oid);
@@ -799,13 +793,12 @@ public class ObjyObject
             {
               cdoId = OBJYCDOIDUtil.getCDOID((ooId)objects[i]);
             }
-            // get the entry feature using the metaId.
-            EStructuralFeature entryFeature = (EStructuralFeature)storeAccessor.getMetaInstance(metaId);
-            FeatureMap.Entry entry = CDORevisionUtil.createFeatureMapEntry(entryFeature, cdoId);
-            // for verifications...
-            entryFeature = entry.getEStructuralFeature();
 
-            results.add(entry);
+            throw new UnsupportedOperationException("FIXME");
+
+            // FIXME Uncomment the following 2 lines:
+            // FeatureMap.Entry entry = CDORevisionUtil.createFeatureMapEntry(entryFeature, cdoId);
+            // results.add(entry);
           }
         }
       }
@@ -1123,11 +1116,7 @@ public class ObjyObject
           else if (objects[i] instanceof ObjyFeatureMapEntry)
           {
             ObjyFeatureMapEntry mapEntry = (ObjyFeatureMapEntry)objects[i];
-            // long metaId = mapEntry.getMetaId();
-            // String name = mapEntry.getTagName();
             ooId oid = mapEntry.getObject();
-            // System.out.println("-->> FeatureMapEntry (" + i + ") -> feature:" + name + " - value:" + oid
-            // + " - metaId: " + metaId);
             ooObj obj = ooObj.create_ooObj(oid);
             obj.delete();
           }
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyPackageHandler.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyPackageHandler.java
index abcf249bbe..081ce80e5b 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyPackageHandler.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/db/ObjyPackageHandler.java
@@ -10,8 +10,6 @@
  */
 package org.eclipse.emf.cdo.server.internal.objectivity.db;
 
-import org.eclipse.emf.cdo.common.id.CDOIDMeta;
-import org.eclipse.emf.cdo.common.id.CDOIDMetaRange;
 import org.eclipse.emf.cdo.common.model.CDOModelUtil;
 import org.eclipse.emf.cdo.common.model.CDOPackageRegistry;
 import org.eclipse.emf.cdo.common.model.CDOPackageUnit;
@@ -19,7 +17,6 @@ import org.eclipse.emf.cdo.common.model.EMFUtil;
 import org.eclipse.emf.cdo.server.internal.objectivity.bundle.OM;
 import org.eclipse.emf.cdo.server.internal.objectivity.schema.ObjyPackageInfo;
 import org.eclipse.emf.cdo.server.internal.objectivity.schema.ObjyPackageUnit;
-import org.eclipse.emf.cdo.server.internal.objectivity.utils.OBJYCDOIDUtil;
 import org.eclipse.emf.cdo.server.internal.objectivity.utils.ObjyDb;
 import org.eclipse.emf.cdo.server.internal.objectivity.utils.SmartLock;
 import org.eclipse.emf.cdo.spi.common.model.InternalCDOPackageInfo;
@@ -141,12 +138,6 @@ public class ObjyPackageHandler
     ooPackageInfo.setUnitID(packageInfo.getPackageUnit().getID());
     ooPackageInfo.setPackageName(packageInfo.getEPackage().getName());
 
-    CDOIDMetaRange metaIDRange = packageInfo.getMetaIDRange();
-    long metaLB = metaIDRange == null ? 0L : ((CDOIDMeta)metaIDRange.getLowerBound()).getLongValue();
-    long metaUB = metaIDRange == null ? 0L : ((CDOIDMeta)metaIDRange.getUpperBound()).getLongValue();
-    ooPackageInfo.setMetaLB(metaLB);
-    ooPackageInfo.setMetaUB(metaUB);
-
     return ooPackageInfo;
   }
 
@@ -224,11 +215,6 @@ public class ObjyPackageHandler
     packageInfo.setPackageURI(ooPackageInfo.getPackageURI());
     packageInfo.setParentURI(ooPackageInfo.getParentURI());
     // TODO - do we need this!!!! setUnitID(packageInfo.getPackageUnit().getID());
-    long metaLB = ooPackageInfo.getMetaLB();
-    long metaUB = ooPackageInfo.getMetaUB();
-    CDOIDMetaRange metaIDRange = metaLB == 0 ? null : OBJYCDOIDUtil.createMetaRange(OBJYCDOIDUtil.createMeta(metaLB),
-        (int)(metaUB - metaLB) + 1);
-    packageInfo.setMetaIDRange(metaIDRange);
 
     return packageInfo;
   }
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapEntry.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapEntry.java
index fc0c662a9b..5f1abe7bf4 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapEntry.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyFeatureMapEntry.java
@@ -4,7 +4,7 @@
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *    Simon McDuff - initial API and implementation
  *    Ibrahim Sallam - code refactoring for CDO 3.0
@@ -14,19 +14,14 @@ package org.eclipse.emf.cdo.server.internal.objectivity.schema;
 import org.eclipse.emf.cdo.server.internal.objectivity.db.ObjySchema;
 
 import com.objy.as.app.Class_Object;
-import com.objy.as.app.Numeric_Value;
 import com.objy.as.app.Proposed_Class;
 import com.objy.as.app.String_Value;
 import com.objy.as.app.d_Access_Kind;
 import com.objy.as.app.d_Module;
-import com.objy.as.app.ooBaseType;
 import com.objy.db.app.ooId;
 
 public class ObjyFeatureMapEntry
 {
-  // caching some details.
-  protected long metaId;
-
   protected String tagName;
 
   protected ooId object;
@@ -35,8 +30,6 @@ public class ObjyFeatureMapEntry
 
   public static final String MapEntryClassName = "ObjyFeatureMapEntry";
 
-  public static final String MetaId = "metaId";
-
   public static final String EntryName = "tagName";
 
   public static final String EntryObject = "object";
@@ -50,13 +43,6 @@ public class ObjyFeatureMapEntry
       Proposed_Class B = top_mod.propose_new_class(MapEntryClassName);
       B.add_base_class(com.objy.as.app.d_Module.LAST, com.objy.as.app.d_Access_Kind.d_PUBLIC, "ooObj");
 
-      B.add_basic_attribute(com.objy.as.app.d_Module.LAST, // Access kind
-          d_Access_Kind.d_PUBLIC, // Access kind
-          ObjyFeatureMapEntry.MetaId, // Attribute name
-          1, // # elements in fixed-size array
-          ooBaseType.ooINT64 // type
-      );
-
       B.add_embedded_class_attribute(com.objy.as.app.d_Module.LAST, // Access kind
           d_Access_Kind.d_PUBLIC, // Access kind
           ObjyFeatureMapEntry.EntryName, // Attribute name
@@ -78,16 +64,13 @@ public class ObjyFeatureMapEntry
    * @param tagName
    * @param oid
    */
-  public ObjyFeatureMapEntry(String tagName, ooId oid, long metaId, ooId near)
+  public ObjyFeatureMapEntry(String tagName, ooId oid, ooId near)
   {
     this.tagName = tagName;
     object = oid;
-    this.metaId = metaId;
 
     classObject = Class_Object.new_persistent_object(ObjySchema.getObjyClass(MapEntryClassName).getASClass(), near,
         false);
-    Numeric_Value numericValue = new Numeric_Value(metaId);
-    classObject.nset_numeric(MetaId, numericValue);
     String_Value stringValue = classObject.nget_string(EntryName);
     stringValue.update();
     String newValue = this.tagName;
@@ -105,9 +88,6 @@ public class ObjyFeatureMapEntry
   {
     this.classObject = classObject;
 
-    Numeric_Value numericValue = classObject.nget_numeric(MetaId);
-    metaId = numericValue.longValue();
-
     String_Value value = classObject.nget_string(EntryName);
     // for objy10.0 -> this.tagName = (value == null || value.toString() == null || value.toString().isEmpty()) ? null :
     // value.toString();
@@ -140,14 +120,4 @@ public class ObjyFeatureMapEntry
   {
     return classObject.objectID();
   }
-
-  public long getMetaId()
-  {
-    return metaId;
-  }
-
-  public void setMetaId(long metaId)
-  {
-    this.metaId = metaId;
-  }
 }
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyPackageInfo.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyPackageInfo.java
index 27e6f9be6d..afd5840f69 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyPackageInfo.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/schema/ObjyPackageInfo.java
@@ -25,10 +25,6 @@ public class ObjyPackageInfo extends ooObj
 
   protected String unitID;
 
-  protected long metaLB;
-
-  protected long metaUB;
-
   protected ToOneRelationship packageUnit;
 
   private String name;
@@ -105,30 +101,6 @@ public class ObjyPackageInfo extends ooObj
     this.unitID = unitID;
   }
 
-  public long getMetaLB()
-  {
-    fetch();
-    return metaLB;
-  }
-
-  public void setMetaLB(long metaLB)
-  {
-    markModified();
-    this.metaLB = metaLB;
-  }
-
-  public long getMetaUB()
-  {
-    fetch();
-    return metaUB;
-  }
-
-  public void setMetaUB(long metaUB)
-  {
-    markModified();
-    this.metaUB = metaUB;
-  }
-
   public void setPackageName(String name)
   {
     markModified();
diff --git a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/utils/OBJYCDOIDUtil.java b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/utils/OBJYCDOIDUtil.java
index b1cc8dd951..729070e4bf 100644
--- a/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/utils/OBJYCDOIDUtil.java
+++ b/plugins/org.eclipse.emf.cdo.server.objectivity/src/org/eclipse/emf/cdo/server/internal/objectivity/utils/OBJYCDOIDUtil.java
@@ -13,8 +13,6 @@ package org.eclipse.emf.cdo.server.internal.objectivity.utils;
 
 import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.common.id.CDOIDExternal;
-import org.eclipse.emf.cdo.common.id.CDOIDMeta;
-import org.eclipse.emf.cdo.common.id.CDOIDMetaRange;
 import org.eclipse.emf.cdo.common.id.CDOIDObject;
 import org.eclipse.emf.cdo.common.id.CDOIDUtil;
 import org.eclipse.emf.cdo.server.internal.objectivity.schema.ObjyProxy;
@@ -137,19 +135,8 @@ public class OBJYCDOIDUtil
     return getContainerId(longCdoID);
   }
 
-  public static CDOIDMeta createMeta(long value)
-  {
-    return CDOIDUtil.createMeta(value);
-  }
-
-  public static CDOIDMetaRange createMetaRange(CDOID lowerBound, int count)
-  {
-    return CDOIDUtil.createMetaRange(lowerBound, count);
-  }
-
   public static CDOIDExternal createCDIDExternal(ObjyProxy proxyObject)
   {
     return CDOIDUtil.createExternal(proxyObject.getUri());
   }
-
 }