performance improvement on restricted class check.

orientechnologies · Feb 16, 2015 · d3f9d0e · d3f9d0e
1 parent 8bbaaca
commit d3f9d0e
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 9 deletions.
diff --git a/core/src/main/java/com/orientechnologies/orient/core/metadata/schema/OImmutableClass.java b/core/src/main/java/com/orientechnologies/orient/core/metadata/schema/OImmutableClass.java
@@ -17,6 +17,7 @@
 import com.orientechnologies.orient.core.index.OIndex;
 import com.orientechnologies.orient.core.index.OIndexManager;
 import com.orientechnologies.orient.core.metadata.schema.clusterselection.OClusterSelectionStrategy;
+import com.orientechnologies.orient.core.metadata.security.OSecurityShared;
 import com.orientechnologies.orient.core.record.impl.ODocument;
 
 /**
@@ -49,6 +50,7 @@ public class OImmutableClass implements OClass {
   private OImmutableClass                 superClass;
   // do not do it volatile it is already SAFE TO USE IT in MT mode.
   private Collection<OImmutableClass>     baseClasses;
+  private boolean                         restricted;
 
   public OImmutableClass(OClass oClass, OImmutableSchema schema) {
     isAbstract = oClass.isAbstract();
@@ -119,6 +121,7 @@ public void init() {
 
     } while (currentMapClass != null);
     allPropertiesMap = Collections.unmodifiableMap(allPropsMap);
+    this.restricted = isSubClassOf(OSecurityShared.RESTRICTED_CLASSNAME);
 
   }
 
@@ -667,4 +670,9 @@ private void initBaseClasses() {
       baseClasses = result;
     }
   }
+
+  public boolean isRestricted() {
+    return restricted;
+  }
+
 }
diff --git a/.../main/java/com/orientechnologies/orient/core/metadata/security/ORestrictedAccessHook.java b/.../main/java/com/orientechnologies/orient/core/metadata/security/ORestrictedAccessHook.java
@@ -28,6 +28,7 @@
 import com.orientechnologies.orient.core.exception.OSecurityException;
 import com.orientechnologies.orient.core.hook.ODocumentHookAbstract;
 import com.orientechnologies.orient.core.metadata.schema.OClass;
+import com.orientechnologies.orient.core.metadata.schema.OImmutableClass;
 import com.orientechnologies.orient.core.record.impl.ODocument;
 import com.orientechnologies.orient.core.record.impl.ODocumentInternal;
 
@@ -47,8 +48,8 @@ public DISTRIBUTED_EXECUTION_MODE getDistributedExecutionMode() {
 
   @Override
   public RESULT onRecordBeforeCreate(final ODocument iDocument) {
-    final OClass cls = ODocumentInternal.getImmutableSchemaClass(iDocument);
+    final OImmutableClass cls = ODocumentInternal.getImmutableSchemaClass(iDocument);
-    if (cls != null && cls.isSubClassOf(OSecurityShared.RESTRICTED_CLASSNAME)) {
+    if (cls != null && cls.isRestricted()) {
       String fieldNames = cls.getCustom(OSecurityShared.ONCREATE_FIELD);
       if (fieldNames == null)
         fieldNames = OSecurityShared.ALLOW_ALL_FIELD;
@@ -102,8 +103,8 @@ public RESULT onRecordBeforeDelete(final ODocument iDocument) {
 
   @SuppressWarnings("unchecked")
   protected boolean isAllowed(final ODocument iDocument, final String iAllowOperation, final boolean iReadOriginal) {
-    final OClass cls = ODocumentInternal.getImmutableSchemaClass(iDocument);
+    final OImmutableClass cls = ODocumentInternal.getImmutableSchemaClass(iDocument);
-    if (cls != null && cls.isSubClassOf(OSecurityShared.RESTRICTED_CLASSNAME)) {
+    if (cls != null && cls.isRestricted()) {
 
       final ODatabaseDocument db = ODatabaseRecordThreadLocal.INSTANCE.get();
 

diff --git a/core/src/main/java/com/orientechnologies/orient/core/record/impl/ODocument.java b/core/src/main/java/com/orientechnologies/orient/core/record/impl/ODocument.java
@@ -40,6 +40,7 @@
 import com.orientechnologies.orient.core.metadata.OMetadataInternal;
 import com.orientechnologies.orient.core.metadata.schema.OClass;
 import com.orientechnologies.orient.core.metadata.schema.OGlobalProperty;
+import com.orientechnologies.orient.core.metadata.schema.OImmutableClass;
 import com.orientechnologies.orient.core.metadata.schema.OImmutableSchema;
 import com.orientechnologies.orient.core.metadata.schema.OProperty;
 import com.orientechnologies.orient.core.metadata.schema.OSchema;
@@ -87,7 +88,7 @@ public class ODocument extends ORecordAbstract implements Iterable<Entry<String,
   protected transient List<WeakReference<ORecordElement>> _owners                 = null;
   protected OImmutableSchema                              _schema;
   private String                                          _className;
-  private OClass                                          _immutableClazz;
+  private OImmutableClass                                 _immutableClazz;
   private int                                             _immutableSchemaVersion = 1;
 
   /**
@@ -2039,7 +2040,7 @@ protected void fillClassIfNeed(final String iClassName) {
       setClassNameIfExists(iClassName);
   }
 
-  protected OClass getImmutableSchemaClass() {
+  protected OImmutableClass getImmutableSchemaClass() {
     if (_className == null)
       fetchClassName();
 
@@ -2052,11 +2053,11 @@ protected OClass getImmutableSchemaClass() {
 
       if (_immutableClazz == null) {
         _immutableSchemaVersion = immutableSchema.getVersion();
-        _immutableClazz = immutableSchema.getClass(_className);
+        _immutableClazz = (OImmutableClass) immutableSchema.getClass(_className);
       } else {
         if (_immutableSchemaVersion < immutableSchema.getVersion()) {
           _immutableSchemaVersion = immutableSchema.getVersion();
-          _immutableClazz = immutableSchema.getClass(_className);
+          _immutableClazz = (OImmutableClass) immutableSchema.getClass(_className);
         }
       }
     }

diff --git a/core/src/main/java/com/orientechnologies/orient/core/record/impl/ODocumentInternal.java b/core/src/main/java/com/orientechnologies/orient/core/record/impl/ODocumentInternal.java
@@ -27,6 +27,7 @@
 import com.orientechnologies.orient.core.db.record.ORecordElement;
 import com.orientechnologies.orient.core.metadata.schema.OClass;
 import com.orientechnologies.orient.core.metadata.schema.OGlobalProperty;
+import com.orientechnologies.orient.core.metadata.schema.OImmutableClass;
 import com.orientechnologies.orient.core.metadata.schema.OType;
 
 public class ODocumentInternal {
@@ -51,7 +52,7 @@ public static boolean rawContainsField(final ODocument oDocument, final String i
     return oDocument.rawContainsField(iFiledName);
   }
 
-  public static OClass getImmutableSchemaClass(final ODocument oDocument) {
+  public static OImmutableClass getImmutableSchemaClass(final ODocument oDocument) {
     return oDocument.getImmutableSchemaClass();
   }