You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2011/01/02 10:09:17 UTC
svn commit: r1054369 - in /directory/apacheds/branches/apacheds-AP:
core-api/src/main/java/org/apache/directory/server/core/
core-api/src/test/java/org/apache/directory/server/core/
core/src/main/java/org/apache/directory/server/core/
Author: elecharny
Date: Sun Jan 2 09:09:17 2011
New Revision: 1054369
URL: http://svn.apache.org/viewvc?rev=1054369&view=rev
Log:
Added a DN->Subentry cache
Modified:
directory/apacheds/branches/apacheds-AP/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
directory/apacheds/branches/apacheds-AP/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java
directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
Modified: directory/apacheds/branches/apacheds-AP/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java?rev=1054369&r1=1054368&r2=1054369&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java (original)
+++ directory/apacheds/branches/apacheds-AP/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java Sun Jan 2 09:09:17 2011
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Set;
import org.apache.directory.server.core.administrative.AdministrativePoint;
+import org.apache.directory.server.core.administrative.Subentry;
import org.apache.directory.server.core.administrative.SubentryCache;
import org.apache.directory.server.core.changelog.ChangeLog;
import org.apache.directory.server.core.entry.ServerEntryFactory;
@@ -551,9 +552,15 @@ public interface DirectoryService extend
DnNode<AdministrativePoint> getTriggerExecutionAPCache();
/**
- * @return The subentry cache
+ * @return The subentry UUID cache
*/
- SubentryCache getSubentryCache();
+ SubentryCache getSubentryUuidCache();
+
+
+ /**
+ * @return The subentry DN cache
+ */
+ DnNode<Subentry> getSubentryDnCache();
/**
Modified: directory/apacheds/branches/apacheds-AP/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java?rev=1054369&r1=1054368&r2=1054369&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java (original)
+++ directory/apacheds/branches/apacheds-AP/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java Sun Jan 2 09:09:17 2011
@@ -28,6 +28,7 @@ import java.util.Set;
import javax.naming.ldap.LdapContext;
import org.apache.directory.server.core.administrative.AdministrativePoint;
+import org.apache.directory.server.core.administrative.Subentry;
import org.apache.directory.server.core.administrative.SubentryCache;
import org.apache.directory.server.core.changelog.ChangeLog;
import org.apache.directory.server.core.event.EventService;
@@ -521,7 +522,16 @@ public class MockDirectoryService implem
/**
* {@inheritDoc}
*/
- public SubentryCache getSubentryCache()
+ public SubentryCache getSubentryUuidCache()
+ {
+ return null;
+ }
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public DnNode<Subentry> getSubentryDnCache()
{
return null;
}
Modified: directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=1054369&r1=1054368&r2=1054369&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/apacheds/branches/apacheds-AP/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Sun Jan 2 09:09:17 2011
@@ -41,6 +41,7 @@ import javax.naming.directory.Attributes
import org.apache.directory.server.constants.ServerDNConstants;
import org.apache.directory.server.core.admin.AdministrativePointInterceptor;
import org.apache.directory.server.core.administrative.AdministrativePoint;
+import org.apache.directory.server.core.administrative.Subentry;
import org.apache.directory.server.core.administrative.SubentryCache;
import org.apache.directory.server.core.authn.AuthenticationInterceptor;
import org.apache.directory.server.core.authz.AciAuthorizationInterceptor;
@@ -260,9 +261,12 @@ public class DefaultDirectoryService imp
/** The TriggerExecution AdministrativePoint cache */
private DnNode<AdministrativePoint> triggerExecutionAPCache;
- /** the hash mapping the DN of a subentry to its SubtreeSpecification/types */
+ /** the hash mapping the UUID of a subentry to its SubtreeSpecification/types */
private final SubentryCache subentryCache = new SubentryCache();
+ /** the hash mapping the DN of a subentry to its SubtreeSpecification/types */
+ private final DnNode<Subentry> subentryDnCache = new DnNode<Subentry>();
+
/** a container to hold all the ppolicies */
private PpolicyConfigContainer pwdPolicyContainer;
@@ -1922,11 +1926,19 @@ public class DefaultDirectoryService imp
/**
* {@inheritDoc}
*/
- public SubentryCache getSubentryCache()
+ public SubentryCache getSubentryUuidCache()
{
return subentryCache;
}
-
+
+
+ /**
+ * {@inheritDoc}
+ */
+ public DnNode<Subentry> getSubentryDnCache()
+ {
+ return subentryDnCache;
+ }
/**