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 2012/09/12 19:25:40 UTC
svn commit: r1384044 [2/2] - in /directory/apacheds/branches/apacheds-mvbt:
ldif-partition/src/main/java/org/apache/directory/server/core/partition/ldif/
server-config/src/main/java/org/apache/directory/server/config/
xdbm-partition/src/main/java/org/a...
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java?rev=1384044&r1=1384043&r2=1384044&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java Wed Sep 12 17:25:39 2012
@@ -30,7 +30,7 @@ import java.io.File;
import org.apache.commons.io.FileUtils;
import org.apache.directory.server.core.api.partition.Partition;
import org.apache.directory.server.core.partition.impl.avl.AvlPartition;
-import org.apache.directory.server.xdbm.ForwardIndexEntry;
+import org.apache.directory.server.xdbm.IndexEntry;
import org.apache.directory.server.xdbm.Store;
import org.apache.directory.server.xdbm.StoreUtils;
import org.apache.directory.server.xdbm.impl.avl.AvlIndex;
@@ -629,7 +629,7 @@ public class SubstringTest
{
SubstringNode node = new SubstringNode( schemaManager.getAttributeType( "sn" ), "walk", null );
SubstringEvaluator evaluator = new SubstringEvaluator( node, store, schemaManager );
- ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
+ IndexEntry<String, String> indexEntry = new IndexEntry<String, String>();
indexEntry.setId( Strings.getUUID( 5L ) );
assertTrue( evaluator.evaluate( indexEntry ) );
indexEntry.setId( Strings.getUUID( 3L ) );
@@ -641,35 +641,35 @@ public class SubstringTest
node = new SubstringNode( schemaManager.getAttributeType( "sn" ), "wa", null );
evaluator = new SubstringEvaluator( node, store, schemaManager );
- indexEntry = new ForwardIndexEntry<String, String>();
+ indexEntry = new IndexEntry<String, String>();
indexEntry.setId( Strings.getUUID( 5L ) );
indexEntry.setEntry( store.lookup( Strings.getUUID( 5L ) ) );
assertTrue( evaluator.evaluate( indexEntry ) );
node = new SubstringNode( schemaManager.getAttributeType( "searchGuide" ), "j", null );
evaluator = new SubstringEvaluator( node, store, schemaManager );
- indexEntry = new ForwardIndexEntry<String, String>();
+ indexEntry = new IndexEntry<String, String>();
indexEntry.setId( Strings.getUUID( 6L ) );
indexEntry.setEntry( store.lookup( Strings.getUUID( 6L ) ) );
assertFalse( evaluator.evaluate( indexEntry ) );
node = new SubstringNode( schemaManager.getAttributeType( "st" ), "j", null );
evaluator = new SubstringEvaluator( node, store, schemaManager );
- indexEntry = new ForwardIndexEntry<String, String>();
+ indexEntry = new IndexEntry<String, String>();
indexEntry.setId( Strings.getUUID( 6L ) );
indexEntry.setEntry( store.lookup( Strings.getUUID( 6L ) ) );
assertFalse( evaluator.evaluate( indexEntry ) );
node = new SubstringNode( schemaManager.getAttributeType( "name" ), "j", null );
evaluator = new SubstringEvaluator( node, store, schemaManager );
- indexEntry = new ForwardIndexEntry<String, String>();
+ indexEntry = new IndexEntry<String, String>();
indexEntry.setId( Strings.getUUID( 6L ) );
indexEntry.setEntry( store.lookup( Strings.getUUID( 6L ) ) );
assertTrue( evaluator.evaluate( indexEntry ) );
node = new SubstringNode( schemaManager.getAttributeType( "name" ), "s", null );
evaluator = new SubstringEvaluator( node, store, schemaManager );
- indexEntry = new ForwardIndexEntry<String, String>();
+ indexEntry = new IndexEntry<String, String>();
indexEntry.setId( Strings.getUUID( 6L ) );
indexEntry.setEntry( store.lookup( Strings.getUUID( 6L ) ) );
assertTrue( evaluator.evaluate( indexEntry ) );
@@ -681,7 +681,7 @@ public class SubstringTest
{
SubstringNode node = new SubstringNode( schemaManager.getAttributeType( "cn" ), "jim", null );
SubstringEvaluator evaluator = new SubstringEvaluator( node, store, schemaManager );
- ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
+ IndexEntry<String, String> indexEntry = new IndexEntry<String, String>();
indexEntry.setId( Strings.getUUID( 6L ) );
assertTrue( evaluator.evaluate( indexEntry ) );
indexEntry.setId( Strings.getUUID( 3L ) );
@@ -690,14 +690,14 @@ public class SubstringTest
node = new SubstringNode( schemaManager.getAttributeType( "cn" ), "j", null );
evaluator = new SubstringEvaluator( node, store, schemaManager );
- indexEntry = new ForwardIndexEntry<String, String>();
+ indexEntry = new IndexEntry<String, String>();
indexEntry.setId( Strings.getUUID( 6L ) );
indexEntry.setEntry( store.lookup( Strings.getUUID( 6L ) ) );
assertTrue( evaluator.evaluate( indexEntry ) );
node = new SubstringNode( schemaManager.getAttributeType( "cn" ), "s", null );
evaluator = new SubstringEvaluator( node, store, schemaManager );
- indexEntry = new ForwardIndexEntry<String, String>();
+ indexEntry = new IndexEntry<String, String>();
indexEntry.setId( Strings.getUUID( 6L ) );
indexEntry.setEntry( store.lookup( Strings.getUUID( 6L ) ) );
assertFalse( evaluator.evaluate( indexEntry ) );
@@ -760,7 +760,7 @@ public class SubstringTest
cursor = new SubstringCursor( store, evaluator );
// test before()
- ForwardIndexEntry<String, String> entry = new ForwardIndexEntry<String, String>();
+ IndexEntry<String, String> entry = new IndexEntry<String, String>();
entry.setKey( SchemaConstants.SN_AT_OID );
cursor.before( entry );
}
@@ -783,7 +783,7 @@ public class SubstringTest
cursor = new SubstringCursor( store, evaluator );
// test before()
- ForwardIndexEntry<String, String> entry = new ForwardIndexEntry<String, String>();
+ IndexEntry<String, String> entry = new IndexEntry<String, String>();
entry.setKey( SchemaConstants.SN_AT_OID );
cursor.after( entry );
}
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=1384044&r1=1384043&r2=1384044&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Wed Sep 12 17:25:39 2012
@@ -34,7 +34,6 @@ import org.apache.commons.io.FileUtils;
import org.apache.directory.server.core.api.interceptor.context.AddOperationContext;
import org.apache.directory.server.core.api.partition.Partition;
import org.apache.directory.server.core.partition.impl.avl.AvlPartition;
-import org.apache.directory.server.xdbm.ForwardIndexEntry;
import org.apache.directory.server.xdbm.IndexEntry;
import org.apache.directory.server.xdbm.Store;
import org.apache.directory.server.xdbm.StoreUtils;
@@ -899,7 +898,7 @@ public class SubtreeScopeTest
ScopeNode node = new ScopeNode( AliasDerefMode.NEVER_DEREF_ALIASES, dn, baseId, SearchScope.SUBTREE );
SubtreeScopeEvaluator evaluator = new SubtreeScopeEvaluator( store, node );
- ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
+ IndexEntry<String, String> indexEntry = new IndexEntry<String, String>();
indexEntry.setId( Strings.getUUID( 6L ) );
assertTrue( evaluator.evaluate( indexEntry ) );
}
@@ -920,15 +919,15 @@ public class SubtreeScopeTest
* With dereferencing the evaluator does not accept candidates that
* are aliases. This is done to filter out aliases from the results.
*/
- ForwardIndexEntry<String, String> indexEntry = new ForwardIndexEntry<String, String>();
+ IndexEntry<String, String> indexEntry = new IndexEntry<String, String>();
indexEntry.setId( Strings.getUUID( 11L ) );
assertFalse( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, String>();
+ indexEntry = new IndexEntry<String, String>();
indexEntry.setId( Strings.getUUID( 8L ) );
assertTrue( evaluator.evaluate( indexEntry ) );
- indexEntry = new ForwardIndexEntry<String, String>();
+ indexEntry = new IndexEntry<String, String>();
indexEntry.setId( Strings.getUUID( 6L ) );
assertFalse( evaluator.evaluate( indexEntry ) );
}
@@ -972,7 +971,7 @@ public class SubtreeScopeTest
cursor = new SubtreeScopeCursor( store, evaluator );
// test before()
- ForwardIndexEntry<String, String> entry = new ForwardIndexEntry<String, String>();
+ IndexEntry<String, String> entry = new IndexEntry<String, String>();
entry.setKey( Strings.getUUID( 3L ) );
cursor.before( entry );
}
@@ -998,7 +997,7 @@ public class SubtreeScopeTest
cursor = new SubtreeScopeCursor( store, evaluator );
// test after()
- ForwardIndexEntry<String, String> entry = new ForwardIndexEntry<String, String>();
+ IndexEntry<String, String> entry = new IndexEntry<String, String>();
entry.setKey( Strings.getUUID( 3L ) );
cursor.after( entry );
}
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java?rev=1384044&r1=1384043&r2=1384044&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java Wed Sep 12 17:25:39 2012
@@ -30,7 +30,6 @@ import java.util.Map;
import javax.swing.tree.TreeNode;
import org.apache.directory.server.core.partition.impl.btree.AbstractBTreePartition;
-import org.apache.directory.server.xdbm.ForwardIndexEntry;
import org.apache.directory.server.xdbm.IndexEntry;
import org.apache.directory.server.xdbm.search.Evaluator;
import org.apache.directory.server.xdbm.search.SearchEngine;
@@ -80,13 +79,13 @@ public class EntryNode implements TreeNo
try
{
- List<ForwardIndexEntry> recordForwards = new ArrayList<ForwardIndexEntry>();
+ List<IndexEntry> recordForwards = new ArrayList<IndexEntry>();
Cursor<IndexEntry<String, String>> childList = null; //db.list( id );
while ( childList.next() )
{
IndexEntry old = childList.get();
- ForwardIndexEntry newRec = new ForwardIndexEntry();
+ IndexEntry newRec = new IndexEntry();
newRec.copy( old );
recordForwards.add( newRec );
}
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java?rev=1384044&r1=1384043&r2=1384044&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/IndexDialog.java Wed Sep 12 17:25:39 2012
@@ -46,7 +46,6 @@ import javax.swing.table.DefaultTableMod
import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.xdbm.ForwardIndexEntry;
import org.apache.directory.server.xdbm.Index;
import org.apache.directory.server.xdbm.IndexEntry;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
@@ -306,7 +305,7 @@ public class IndexDialog<K, O, ID> exten
else if ( scanType.equals( GREATER_CURSOR ) )
{
list = index.forwardCursor();
- ForwardIndexEntry<K, ID> entry = new ForwardIndexEntry<K, ID>();
+ IndexEntry<K, ID> entry = new IndexEntry<K, ID>();
entry.setKey( key );
list.before( entry );
while ( list.next() )
@@ -322,7 +321,7 @@ public class IndexDialog<K, O, ID> exten
else if ( scanType.equals( LESS_CURSOR ) )
{
list = index.forwardCursor();
- ForwardIndexEntry<K, ID> entry = new ForwardIndexEntry<K, ID>();
+ IndexEntry<K, ID> entry = new IndexEntry<K, ID>();
entry.setKey( key );
list.after( entry );
while ( list.previous() )
Modified: directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java?rev=1384044&r1=1384043&r2=1384044&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java (original)
+++ directory/apacheds/branches/apacheds-mvbt/xdbm-tools/src/main/java/org/apache/directory/server/xdbm/tools/IndexDialog.java Wed Sep 12 17:25:39 2012
@@ -46,7 +46,6 @@ import javax.swing.table.DefaultTableMod
import org.apache.commons.lang.exception.ExceptionUtils;
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.server.xdbm.ForwardIndexEntry;
import org.apache.directory.server.xdbm.Index;
import org.apache.directory.server.xdbm.IndexEntry;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
@@ -308,7 +307,7 @@ public class IndexDialog<K, O, ID> exten
else if ( scanType.equals( GREATER_CURSOR ) )
{
list = index.forwardCursor();
- ForwardIndexEntry<K, ID> entry = new ForwardIndexEntry<K, ID>();
+ IndexEntry<K, ID> entry = new IndexEntry<K, ID>();
entry.setKey( key );
list.before( entry );
while ( list.next() )
@@ -324,7 +323,7 @@ public class IndexDialog<K, O, ID> exten
else if ( scanType.equals( LESS_CURSOR ) )
{
list = index.forwardCursor();
- ForwardIndexEntry<K, ID> entry = new ForwardIndexEntry<K, ID>();
+ IndexEntry<K, ID> entry = new IndexEntry<K, ID>();
entry.setKey( key );
list.after( entry );
while ( list.previous() )