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 2010/10/31 19:21:41 UTC

svn commit: r1029447 - in /directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations: add/ compare/ delete/ modify/ move/ moveAndRename/ rename/ search/

Author: elecharny
Date: Sun Oct 31 18:21:41 2010
New Revision: 1029447

URL: http://svn.apache.org/viewvc?rev=1029447&view=rev
Log:
Removed the cacheSize parameter from the CreateIndex @

Modified:
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/delete/DeletePerfIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/move/MovePerfIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java?rev=1029447&r1=1029446&r2=1029447&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/add/AddPerfIT.java Sun Oct 31 18:21:41 2010
@@ -56,9 +56,9 @@ import org.junit.runner.RunWith;
                         "objectClass: domain\n\n" ),
                 indexes = 
                 {
-                    @CreateIndex( attribute = "objectClass", cacheSize = 1000 ),
-                    @CreateIndex( attribute = "sn", cacheSize = 1000 ),
-                    @CreateIndex( attribute = "cn", cacheSize = 1000 )
+                    @CreateIndex( attribute = "objectClass" ),
+                    @CreateIndex( attribute = "sn" ),
+                    @CreateIndex( attribute = "cn" )
                 } )
                 
         },

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java?rev=1029447&r1=1029446&r2=1029447&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java Sun Oct 31 18:21:41 2010
@@ -42,13 +42,27 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(FrameworkRunner.class)
-@CreateDS(name = "ComparePerfDS", partitions =
-    { @CreatePartition(name = "example", suffix = "dc=example,dc=com", contextEntry = @ContextEntry(entryLdif = "dn: dc=example,dc=com\n"
-        + "dc: example\n" + "objectClass: top\n" + "objectClass: domain\n\n"), indexes =
-        { @CreateIndex(attribute = "objectClass", cacheSize = 1000), @CreateIndex(attribute = "sn", cacheSize = 1000),
-            @CreateIndex(attribute = "cn", cacheSize = 1000) })
-
-    }, enableChangeLog = false)
+@CreateDS(
+    name = "ComparePerfDS", 
+    partitions =
+    { 
+        @CreatePartition(
+            name = "example", 
+            suffix = "dc=example,dc=com", 
+            contextEntry = @ContextEntry(
+                entryLdif = 
+                    "dn: dc=example,dc=com\n" +
+                    "dc: example\n" + 
+                    "objectClass: top\n" + 
+                    "objectClass: domain\n\n"), 
+            indexes =
+            { 
+                @CreateIndex(attribute = "objectClass"), 
+                @CreateIndex(attribute = "sn"),
+                @CreateIndex(attribute = "cn") 
+            } )
+    }, 
+    enableChangeLog = false )
 public class ComparePerfIT extends AbstractLdapTestUnit
 {
     /**

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/delete/DeletePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/delete/DeletePerfIT.java?rev=1029447&r1=1029446&r2=1029447&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/delete/DeletePerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/delete/DeletePerfIT.java Sun Oct 31 18:21:41 2010
@@ -55,9 +55,9 @@ import org.junit.runner.RunWith;
                         "objectClass: domain\n\n" ),
                 indexes = 
                 {
-                    @CreateIndex( attribute = "objectClass", cacheSize = 1000 ),
-                    @CreateIndex( attribute = "sn", cacheSize = 1000 ),
-                    @CreateIndex( attribute = "cn", cacheSize = 1000 )
+                    @CreateIndex( attribute = "objectClass" ),
+                    @CreateIndex( attribute = "sn" ),
+                    @CreateIndex( attribute = "cn" )
                 } )
                 
         },

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java?rev=1029447&r1=1029446&r2=1029447&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java Sun Oct 31 18:21:41 2010
@@ -49,11 +49,19 @@ import org.junit.runner.RunWith;
  * @version $Rev$
  */
 @RunWith(FrameworkRunner.class)
-@CreateDS(name = "ModifyPerfDS", partitions =
-    { @CreatePartition(name = "example", suffix = "dc=example,dc=com", contextEntry = @ContextEntry(entryLdif = "dn: dc=example,dc=com\n"
+@CreateDS(
+    name = "ModifyPerfDS", 
+    partitions =
+    { 
+        @CreatePartition(
+            name = "example", 
+            suffix = "dc=example,dc=com", 
+            contextEntry = @ContextEntry(entryLdif = "dn: dc=example,dc=com\n"
         + "dc: example\n" + "objectClass: top\n" + "objectClass: domain\n\n"), indexes =
-        { @CreateIndex(attribute = "objectClass", cacheSize = 1000), @CreateIndex(attribute = "sn", cacheSize = 1000),
-            @CreateIndex(attribute = "cn", cacheSize = 1000) })
+        { 
+                @CreateIndex(attribute = "objectClass"), 
+                @CreateIndex(attribute = "sn"),
+                @CreateIndex(attribute = "cn") })
 
     }, enableChangeLog = false)
 public class ModifyPerfIT extends AbstractLdapTestUnit

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/move/MovePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/move/MovePerfIT.java?rev=1029447&r1=1029446&r2=1029447&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/move/MovePerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/move/MovePerfIT.java Sun Oct 31 18:21:41 2010
@@ -56,9 +56,9 @@ import org.junit.runner.RunWith;
                         "objectClass: domain\n\n"), 
             indexes =
             { 
-                @CreateIndex(attribute = "objectClass", cacheSize = 1000), 
-                @CreateIndex(attribute = "sn", cacheSize = 1000),
-                @CreateIndex(attribute = "cn", cacheSize = 1000) 
+                @CreateIndex(attribute = "objectClass"), 
+                @CreateIndex(attribute = "sn"),
+                @CreateIndex(attribute = "cn") 
             })
     }, 
     enableChangeLog = false)

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java?rev=1029447&r1=1029446&r2=1029447&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java Sun Oct 31 18:21:41 2010
@@ -33,7 +33,6 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.integ.IntegrationUtils;
 import org.apache.directory.shared.ldap.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.entry.Entry;
-import org.apache.directory.shared.ldap.message.Response;
 import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -46,11 +45,27 @@ import org.junit.runner.RunWith;
  * @version $Rev$
  */
 @RunWith(FrameworkRunner.class)
-@CreateDS(name = "MovePerfDS", partitions =
-    { @CreatePartition(name = "example", suffix = "dc=example,dc=com", contextEntry = @ContextEntry(entryLdif = "dn: dc=example,dc=com\n"
-        + "dc: example\n" + "objectClass: top\n" + "objectClass: domain\n\n"), indexes =
-        { @CreateIndex(attribute = "objectClass", cacheSize = 1000), @CreateIndex(attribute = "sn", cacheSize = 1000),
-            @CreateIndex(attribute = "cn", cacheSize = 1000) }) }, enableChangeLog = false)
+@CreateDS(
+    name = "MovePerfDS", 
+    partitions =
+    { 
+        @CreatePartition(
+            name = "example", 
+            suffix = "dc=example,dc=com", 
+            contextEntry = @ContextEntry(
+                entryLdif = 
+                    "dn: dc=example,dc=com\n" +
+                    "dc: example\n" + 
+                    "objectClass: top\n" + 
+                    "objectClass: domain\n\n"), 
+            indexes =
+            { 
+                @CreateIndex(attribute = "objectClass"), 
+                @CreateIndex(attribute = "sn"),
+                @CreateIndex(attribute = "cn") 
+            }) 
+   }, 
+   enableChangeLog = false)
 public class MoveAndRenamePerfIT extends AbstractLdapTestUnit
 {
     /**

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java?rev=1029447&r1=1029446&r2=1029447&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/rename/RenamePerfIT.java Sun Oct 31 18:21:41 2010
@@ -55,9 +55,9 @@ import org.junit.runner.RunWith;
                         "objectClass: domain\n\n"), 
             indexes =
             { 
-                @CreateIndex(attribute = "objectClass", cacheSize = 1000), 
-                @CreateIndex(attribute = "sn", cacheSize = 1000),
-                @CreateIndex(attribute = "cn", cacheSize = 1000) 
+                @CreateIndex(attribute = "objectClass"), 
+                @CreateIndex(attribute = "sn"),
+                @CreateIndex(attribute = "cn") 
             })
     }, 
     enableChangeLog = false)

Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java?rev=1029447&r1=1029446&r2=1029447&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java Sun Oct 31 18:21:41 2010
@@ -45,19 +45,30 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(FrameworkRunner.class)
-@CreateDS(name = "AddPerfDS", partitions =
-    { @CreatePartition(name = "example", suffix = "dc=example,dc=com", contextEntry = @ContextEntry(entryLdif = "dn: dc=example,dc=com\n"
-        +
+@CreateDS(
+    name = "AddPerfDS", 
+    partitions =
+    { 
+        @CreatePartition(
+            name = "example", 
+            suffix = "dc=example,dc=com", 
+            contextEntry = 
+                @ContextEntry(
+                    entryLdif = 
+                        "dn: dc=example,dc=com\n" +
                         "dc: example\n" +
                         "objectClass: top\n" +
-                        "objectClass: domain\n\n"), indexes =
-        {
-                    @CreateIndex(attribute = "objectClass", cacheSize = 1000),
-                    @CreateIndex(attribute = "sn", cacheSize = 1000),
-                    @CreateIndex(attribute = "cn", cacheSize = 1000),
-                    @CreateIndex(attribute = "userCertificate", cacheSize = 1000) })
+                        "objectClass: domain\n\n"), 
+            indexes =
+            {
+                @CreateIndex(attribute = "objectClass"),
+                @CreateIndex(attribute = "sn"),
+                @CreateIndex(attribute = "cn"),
+                @CreateIndex(attribute = "userCertificate") 
+            })
 
-    }, enableChangeLog = false)
+    }, 
+    enableChangeLog = false)
 @ApplyLdifs(
     {
         "dn: m-oid=2.2.0, ou=attributeTypes, cn=apachemeta, ou=schema",