directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: rev 47557 - in incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db: . jdbm
Date Thu, 30 Sep 2004 06:01:11 GMT
Author: akarasulu
Date: Wed Sep 29 23:01:10 2004
New Revision: 47557

Removed:
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/EnumeratorMonitor.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/EnumeratorMonitorAdapter.java
Modified:
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/ConjunctionEnumerator.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/Database.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/DefaultSearchEngine.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/DisjunctionEnumerator.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/NegationEnumerator.java
   incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/JdbmDatabase.java
Log:
unneeded stuff and formatting

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/ConjunctionEnumerator.java
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/ConjunctionEnumerator.java
(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/ConjunctionEnumerator.java
Wed Sep 29 23:01:10 2004
@@ -37,9 +37,9 @@
 public class ConjunctionEnumerator implements Enumerator
 {
     /** Top level evaluator Avalon dependency */
-    private Evaluator evaluator;
+    private ExpressionEvaluator evaluator;
     /** Top level expression enumerator - non Avalon dependency avaoids cycle */
-    private Enumerator enumerator;
+    private ExpressionEnumerator enumerator;
 
 
     /**
@@ -48,7 +48,8 @@
      * @param enumerator the top level expression enumerator
      * @param evaluator the top level expression evaluator
      */
-    public ConjunctionEnumerator( Enumerator enumerator, Evaluator evaluator )
+    public ConjunctionEnumerator( ExpressionEnumerator enumerator,
+                                  ExpressionEvaluator evaluator )
     {
         this.enumerator = enumerator;
         this.evaluator = evaluator;

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/Database.java
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/Database.java	(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/Database.java	Wed
Sep 29 23:01:10 2004
@@ -269,8 +269,7 @@
      * @param entry TODO
      * @throws NamingException TODO
      */
-    void add( String updn, Name dn, Attributes entry )
-        throws NamingException;
+    void add( String updn, Name dn, Attributes entry ) throws NamingException;
 
     /**
      * TODO Document me!
@@ -383,8 +382,7 @@
      * @param mods TODO
      * @throws NamingException TODO
      */
-    void modify( Name dn, int modOp, Attributes mods )
-        throws NamingException;
+    void modify( Name dn, int modOp, Attributes mods ) throws NamingException;
     
     /**
      * TODO Document me!
@@ -393,8 +391,7 @@
      * @param mods TODO
      * @throws NamingException TODO
      */
-    void modify( Name dn, ModificationItem [] mods )
-        throws NamingException;
+    void modify( Name dn, ModificationItem [] mods ) throws NamingException;
 
     /**
      * TODO Document me!
@@ -404,8 +401,7 @@
      * @param deleteOldRdn TODO
      * @throws NamingException TODO
      */
-    void modifyRdn( Name dn, String newRdn, boolean deleteOldRdn )
-        throws NamingException;
+    void modifyRdn( Name dn, String newRdn, boolean deleteOldRdn ) throws NamingException;
 
     /**
      * TODO Document me!
@@ -428,7 +424,7 @@
      * @throws NamingException if a database failure results
      */
     void move( Name oldChildDn, Name newParentDn, String newRdn,
-        boolean deleteOldRdn ) throws NamingException;
+               boolean deleteOldRdn ) throws NamingException;
 
     /**
      * Gets the count of the total number of entries in the database.

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/DefaultSearchEngine.java
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/DefaultSearchEngine.java
(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/DefaultSearchEngine.java
Wed Sep 29 23:01:10 2004
@@ -47,9 +47,9 @@
     /** the Database this DefaultSearchEngine operates on */
     private Database db;
     /** Evaluator flyweight used for filter expression assertions */
-    private Evaluator evaluator;
+    private ExpressionEvaluator evaluator;
     /** Enumerator flyweight that creates enumerations on filter expressions */
-    private Enumerator enumerator;
+    private ExpressionEnumerator enumerator;
     
 
     // ------------------------------------------------------------------------
@@ -61,7 +61,9 @@
      * Creates a DefaultSearchEngine for searching a Database without setting
      * up the database.
      */
-    public DefaultSearchEngine( Database db, Evaluator evaluator, Enumerator enumerator )
+    public DefaultSearchEngine( Database db,
+                                ExpressionEvaluator evaluator,
+                                ExpressionEnumerator enumerator )
     {
         this.db = db;
         this.evaluator = evaluator;
@@ -84,8 +86,8 @@
     /**
      * @see SearchEngine#search(Name, Map, ExprNode,SearchControls)
      */
-    public NamingEnumeration search( Name base, Map env,
-        ExprNode filter, SearchControls searchCtls )
+    public NamingEnumeration search( Name base, Map env, ExprNode filter,
+                                     SearchControls searchCtls )
         throws NamingException
     {
         Name effectiveBase = null;

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/DisjunctionEnumerator.java
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/DisjunctionEnumerator.java
(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/DisjunctionEnumerator.java
Wed Sep 29 23:01:10 2004
@@ -36,15 +36,15 @@
 public class DisjunctionEnumerator implements Enumerator
 {
     /** Top level expression enumerator - non Avalon dependency avaoids cycle */
-    private Enumerator enumerator;
+    private ExpressionEnumerator enumerator;
 
 
     /**
      * Creates a disjunction enumerator using a top level enumerator.
-     *
+     *                
      * @param enumerator the top level enumerator
      */
-    public DisjunctionEnumerator( Enumerator enumerator )
+    public DisjunctionEnumerator( ExpressionEnumerator enumerator )
     {
         this.enumerator = enumerator;
     }

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/NegationEnumerator.java
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/NegationEnumerator.java
(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/NegationEnumerator.java
Wed Sep 29 23:01:10 2004
@@ -37,7 +37,7 @@
     /** Database this conjunction is applied upon */
     private Database db = null;
     /** Top level expression evaluator */
-    private Evaluator evaluator;
+    private ExpressionEvaluator evaluator;
 
 
     /**
@@ -46,7 +46,7 @@
      * @param db the database to use for enumerations
      * @param evaluator the top level evaluator
      */
-    public NegationEnumerator( Database db, Evaluator evaluator )
+    public NegationEnumerator( Database db, ExpressionEvaluator evaluator )
     {
         this.db = db;
         this.evaluator = evaluator;

Modified: incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/JdbmDatabase.java
==============================================================================
--- incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/JdbmDatabase.java
(original)
+++ incubator/directory/eve/trunk/backend/core/src/java/org/apache/eve/db/jdbm/JdbmDatabase.java
Wed Sep 29 23:01:10 2004
@@ -105,8 +105,7 @@
     /**
      * @see Database#addIndexOn(AttributeType)
      */
-    public void addIndexOn( AttributeType spec )
-        throws NamingException
+    public void addIndexOn( AttributeType spec ) throws NamingException
     {
         Index idx = new JdbmIndex( spec, wkdir );
         indices.put( spec.getName().toLowerCase(), idx );
@@ -325,8 +324,7 @@
      * 
      * @see Database#getEntryId(String)
      */
-    public Index getSystemIndex( String indexName )
-        throws IndexNotFoundException
+    public Index getSystemIndex( String indexName ) throws IndexNotFoundException
     {
         String lowerCased = indexName.toLowerCase();
 
@@ -349,8 +347,7 @@
     /**
      * @see Database#getEntryId(String)
      */
-    public BigInteger getEntryId( String dn )
-        throws NamingException
+    public BigInteger getEntryId( String dn ) throws NamingException
     {
         return ndnIdx.forwardLookup( dn );
     }
@@ -359,8 +356,7 @@
     /**
      * @see Database#getEntryDn(java.math.BigInteger)
      */
-    public String getEntryDn( BigInteger id )
-        throws NamingException
+    public String getEntryDn( BigInteger id ) throws NamingException
     {
         return ( String ) ndnIdx.reverseLookup( id );
     }
@@ -369,8 +365,7 @@
     /**
      * @see Database#getParentId(String)
      */
-    public BigInteger getParentId( String dn )
-        throws  NamingException
+    public BigInteger getParentId( String dn ) throws NamingException
     {
         BigInteger childId = ndnIdx.forwardLookup( dn );
         return ( BigInteger ) heirarchyIdx.reverseLookup( childId );
@@ -378,20 +373,18 @@
 
 
     /**
-     * @see Database#getParentId(java.math.BigInteger)
+     * @see Database#getParentId(BigInteger)
      */
-    public BigInteger getParentId( BigInteger childId )
-        throws NamingException
+    public BigInteger getParentId( BigInteger childId ) throws NamingException
     {
         return ( BigInteger ) heirarchyIdx.reverseLookup( childId );
     }
     
     
     /**
-     * @see Database#getEntryUpdn(java.math.BigInteger)
+     * @see Database#getEntryUpdn(BigInteger)
      */
-    public String getEntryUpdn( BigInteger id )
-        throws NamingException
+    public String getEntryUpdn( BigInteger id ) throws NamingException
     {
         return ( String ) updnIdx.reverseLookup( id );
     }
@@ -400,8 +393,7 @@
     /**
      * @see Database#getEntryUpdn(String)
      */
-    public String getEntryUpdn( String dn )
-        throws NamingException
+    public String getEntryUpdn( String dn ) throws NamingException
     {
         BigInteger id = ndnIdx.forwardLookup( dn );
         return ( String ) updnIdx.reverseLookup( id );
@@ -472,7 +464,6 @@
      */
     private void addAliasIndices( BigInteger aliasId, Name aliasDn, 
         String aliasTarget ) throws NamingException
-        // Attributes aliasEntry ) throws NamingException
     {
         Name targetDn = null;            // Name value of aliasedObjectName
         BigInteger targetId = null;      // Id of the aliasedObjectName
@@ -605,8 +596,7 @@
     /**
      * @see Database#add(String,Name,Attributes)
      */
-    public void add( String updn, Name dn, Attributes entry )
-        throws NamingException
+    public void add( String updn, Name dn, Attributes entry ) throws NamingException
     {
         BigInteger id = master.getNextId();
         BigInteger parentId = null;
@@ -663,7 +653,7 @@
 
 
     /**
-     * @see Database#lookup(java.math.BigInteger)
+     * @see Database#lookup(BigInteger)
      */
     public Attributes lookup( BigInteger id ) throws NamingException
     {
@@ -672,10 +662,9 @@
 
 
     /**
-     * @see Database#delete(java.math.BigInteger)
+     * @see Database#delete(BigInteger)
      */
-    public void delete( BigInteger id )
-        throws  NamingException
+    public void delete( BigInteger id ) throws  NamingException
     {
         Attributes entry = lookup( id );
         BigInteger parentId = getParentId( id ); 
@@ -721,8 +710,7 @@
     /**
      * @see Database#list(java.math.BigInteger)
      */
-    public NamingEnumeration list( BigInteger id )
-        throws  NamingException
+    public NamingEnumeration list( BigInteger id ) throws  NamingException
     {
         return heirarchyIdx.listIndices( id );
     }
@@ -731,8 +719,7 @@
     /**
      * @see Database#getChildCount(java.math.BigInteger)
      */
-    public int getChildCount( BigInteger id )
-        throws  NamingException
+    public int getChildCount( BigInteger id ) throws NamingException
     {
         return heirarchyIdx.count( id );
     }
@@ -750,8 +737,7 @@
     /**
      * @see Database#getSuffixEntry()
      */
-    public Attributes getSuffixEntry()
-        throws  NamingException
+    public Attributes getSuffixEntry() throws NamingException
     {
         BigInteger id = getEntryId( suffix.toString() );
 
@@ -767,8 +753,7 @@
     /**
      * @see Database#sync()
      */
-    public void sync()
-        throws NamingException
+    public void sync() throws NamingException
     {
         ArrayList array = new ArrayList();
         array.addAll( indices.values() );
@@ -830,8 +815,7 @@
     /**
      * @see Database#close()
      */
-    public void close()
-        throws NamingException
+    public void close() throws NamingException
     {
         ArrayList array = new ArrayList();
         array.addAll( indices.values() );
@@ -945,8 +929,7 @@
     /**
      * @see Database#getProperty(String)
      */
-    public String getProperty( String propertyName )
-        throws NamingException
+    public String getProperty( String propertyName ) throws NamingException
     {
         return master.getProperty( propertyName );
     }
@@ -1114,8 +1097,8 @@
      * @throws NamingException if index alteration or attribute modification 
      * fails.
      */
-    private void replace( BigInteger id, Attributes entry, 
-        Attribute mods ) throws NamingException
+    private void replace( BigInteger id, Attributes entry, Attribute mods )
+        throws NamingException
     {
         if ( hasUserIndexOn( mods.getID() ) )
         {
@@ -1156,8 +1139,7 @@
      * @see Database#modify(javax.naming.Name, int,
      * javax.naming.directory.Attributes)
      */
-    public void modify( Name dn, int modOp, Attributes mods ) 
-        throws NamingException 
+    public void modify( Name dn, int modOp, Attributes mods ) throws NamingException
     {
         NamingEnumeration attrs = null;
         BigInteger id = getEntryId( dn.toString() );
@@ -1211,8 +1193,7 @@
      * @see Database#modify(javax.naming.Name,
      * javax.naming.directory.ModificationItem[])
      */
-    public void modify( Name dn, ModificationItem [] mods ) 
-        throws NamingException 
+    public void modify( Name dn, ModificationItem [] mods ) throws NamingException
     {
         BigInteger id = getEntryId( dn.toString() );
         Attributes entry = master.get( id );
@@ -1449,8 +1430,7 @@
      * @see Database#move(javax.naming.Name,
      * javax.naming.Name)
      */
-    public void move( Name oldChildDn, Name newParentDn ) 
-        throws NamingException 
+    public void move( Name oldChildDn, Name newParentDn ) throws NamingException
     {
         // Get the child and the new parent to be entries and Ids
         BigInteger childId = getEntryId( oldChildDn.toString() );
@@ -1497,8 +1477,7 @@
      * @param movedBase the base at which the move occured - the moved node
      * @throws NamingException if system indices fail
      */
-    private void dropMovedAliasIndices( final Name movedBase )
-        throws NamingException
+    private void dropMovedAliasIndices( final Name movedBase ) throws NamingException
     {
         // Find all the aliases from movedBase down
         IndexAssertion isBaseDescendant = new IndexAssertion()

Mime
View raw message