Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 41006 invoked from network); 15 Dec 2007 01:00:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Dec 2007 01:00:03 -0000 Received: (qmail 53053 invoked by uid 500); 15 Dec 2007 00:59:52 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 53001 invoked by uid 500); 15 Dec 2007 00:59:52 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 52990 invoked by uid 99); 15 Dec 2007 00:59:52 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Dec 2007 16:59:52 -0800 X-ASF-Spam-Status: No, hits=-99.6 required=10.0 tests=ALL_TRUSTED,SUBJECT_FUZZY_TION X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 15 Dec 2007 00:59:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1881F1A9850; Fri, 14 Dec 2007 16:59:40 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r604361 [2/4] - in /directory/sandbox/akarasulu/bigbang: apacheds/btree-base/src/main/java/org/apache/directory/server/core/partition/impl/btree/ apacheds/core-entry/src/main/java/org/apache/directory/server/core/entry/ apacheds/core-integ/... Date: Sat, 15 Dec 2007 00:58:49 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20071215005941.1881F1A9850@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Added: directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/CursorClosedException.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/CursorClosedException.java?rev=604361&view=auto ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/CursorClosedException.java (added) +++ directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/CursorClosedException.java Fri Dec 14 16:58:40 2007 @@ -0,0 +1,43 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.directory.server.core.cursor; + + +import java.io.IOException; + + +/** + * A specific form of IOException to note that an operation is being + * attempted on a closed Cursor. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +public class CursorClosedException extends IOException +{ + public CursorClosedException() + { + } + + + public CursorClosedException( String s ) + { + super( s ); + } +} Propchange: directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/CursorClosedException.java ------------------------------------------------------------------------------ svn:executable = * Added: directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/EmptyCursor.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/EmptyCursor.java?rev=604361&view=auto ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/EmptyCursor.java (added) +++ directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/EmptyCursor.java Fri Dec 14 16:58:40 2007 @@ -0,0 +1,128 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.directory.server.core.cursor; + + +import java.io.IOException; + + +/** + * An empty Cursor implementation. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +public class EmptyCursor extends AbstractCursor +{ + public void beforeFirst() throws CursorClosedException + { + checkClosed( "beforeFirst()" ); + } + + + public void afterLast() throws CursorClosedException + { + checkClosed( "afterLast()" ); + } + + + @SuppressWarnings ( { "UnusedDeclaration" } ) + public boolean absolute( int absolutePosition ) throws CursorClosedException + { + checkClosed( "absolute()" ); + return false; + } + + + @SuppressWarnings ( { "UnusedDeclaration" } ) + public boolean relative( int relativePosition ) throws CursorClosedException + { + checkClosed( "relative()" ); + return false; + } + + + public boolean first() throws CursorClosedException + { + checkClosed( "first()" ); + return false; + } + + + public boolean last() throws CursorClosedException + { + checkClosed( "last()" ); + return false; + } + + + public boolean isFirst() throws CursorClosedException + { + checkClosed( "isFirst()" ); + return false; + } + + + public boolean isLast() throws CursorClosedException + { + checkClosed( "isLast()" ); + return false; + } + + + public boolean isAfterLast() throws CursorClosedException + { + checkClosed( "isAfterLast()" ); + return false; + } + + + public boolean isBeforeFirst() throws CursorClosedException + { + checkClosed( "isBeforeFirst()" ); + return false; + } + + + public boolean previous() throws CursorClosedException + { + checkClosed( "previous()" ); + return false; + } + + + public boolean next() throws CursorClosedException + { + checkClosed( "next()" ); + return false; + } + + + public E get() throws IOException + { + checkClosed( "get()" ); + throw new InvalidCursorPositionException( "This cursor is empty and cannot return elements!" ); + } + + + public boolean isElementReused() + { + return false; + } +} Propchange: directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/EmptyCursor.java ------------------------------------------------------------------------------ svn:executable = * Added: directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/InconsistentCursorStateException.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/InconsistentCursorStateException.java?rev=604361&view=auto ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/InconsistentCursorStateException.java (added) +++ directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/InconsistentCursorStateException.java Fri Dec 14 16:58:40 2007 @@ -0,0 +1,44 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.directory.server.core.cursor; + + +import java.io.IOException; + + +/** + * Thrown to indicate a condition in the Cursor where the state seems + * inconsistent based on internal accounting. This may indicate the + * underlying structure has changed after the Cursor has been created. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +public class InconsistentCursorStateException extends IOException +{ + public InconsistentCursorStateException() + { + } + + + public InconsistentCursorStateException( String s ) + { + super( s ); + } +} \ No newline at end of file Propchange: directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/InconsistentCursorStateException.java ------------------------------------------------------------------------------ svn:executable = * Added: directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/InvalidCursorPositionException.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/InvalidCursorPositionException.java?rev=604361&view=auto ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/InvalidCursorPositionException.java (added) +++ directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/InvalidCursorPositionException.java Fri Dec 14 16:58:40 2007 @@ -0,0 +1,42 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.directory.server.core.cursor; + +import java.io.IOException; + + +/** + * Thrown to indicate an illegal position state for a Cursor when a call to + * get is made. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +public class InvalidCursorPositionException extends IOException +{ + public InvalidCursorPositionException () + { + } + + + public InvalidCursorPositionException ( String s ) + { + super( s ); + } +} Propchange: directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/InvalidCursorPositionException.java ------------------------------------------------------------------------------ svn:executable = * Added: directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/IteratorCursor.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/IteratorCursor.java?rev=604361&view=auto ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/IteratorCursor.java (added) +++ directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/IteratorCursor.java Fri Dec 14 16:58:40 2007 @@ -0,0 +1,133 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.directory.server.core.cursor; + +import java.io.IOException; +import java.util.Iterator; + + +/** + * A limited Cursor over an Iterator of elements. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +public class IteratorCursor extends AbstractCursor +{ + private final Iterator values; + private Object current; + + + public IteratorCursor( Iterator values ) + { + this.values = values; + } + + + public void beforeFirst() throws IOException + { + throw new UnsupportedOperationException( "Cannot advance before first on the underlying Iterator." ); + } + + + public void afterLast() throws IOException + { + throw new UnsupportedOperationException( "Cannot adanvce after last on the underlying Iterator." ); + } + + + public boolean absolute( int absolutePosition ) throws IOException + { + throw new UnsupportedOperationException( "Cannot advance to an absolute postion on the underlying Iterator." ); + } + + + public boolean relative( int relativePosition ) throws IOException + { + throw new UnsupportedOperationException( "Cannot advance to a relative position on the underlying Iterator." ); + } + + + public boolean first() throws IOException + { + throw new UnsupportedOperationException( "Cannot advance to first position on the underlying Iterator." ); + } + + + public boolean last() throws IOException + { + throw new UnsupportedOperationException( "Cannot advance to last position on the underlying Iterator." ); + } + + + public boolean isFirst() throws IOException + { + throw new UnsupportedOperationException( "Cannot determine position on the underlying Iterator." ); + } + + + public boolean isLast() throws IOException + { + throw new UnsupportedOperationException( "Cannot determine position on the underlying Iterator." ); + } + + + public boolean isAfterLast() throws IOException + { + throw new UnsupportedOperationException( "Cannot determine position on the underlying Iterator." ); + } + + + public boolean isBeforeFirst() throws IOException + { + throw new UnsupportedOperationException( "Cannot determine position on the underlying Iterator." ); + } + + + public boolean previous() throws IOException + { + throw new UnsupportedOperationException( "Cannot back up on the underlying Iterator." ); + } + + + public boolean next() throws IOException + { + checkClosed( "next()" ); + if ( values.hasNext() ) + { + current = values.next(); + return true; + } + + return false; + } + + + public Object get() throws IOException + { + checkClosed( "get()" ); + return current; + } + + + public boolean isElementReused() + { + return false; + } +} Propchange: directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/IteratorCursor.java ------------------------------------------------------------------------------ svn:executable = * Modified: directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/ListCursor.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/ListCursor.java?rev=604361&r1=604360&r2=604361&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/ListCursor.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/ListCursor.java Fri Dec 14 16:58:40 2007 @@ -31,12 +31,11 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ -public class ListCursor implements Cursor +public class ListCursor extends AbstractCursor { private final List list; private final int start; private final int end; - private boolean closed; private int index = -1; @@ -138,15 +137,6 @@ } - protected void checkClosed( String operation ) throws IOException - { - if ( closed ) - { - throw new IOException( "Attempting " + operation + " operation on a closed Cursor." ); - } - } - - public void beforeFirst() throws IOException { checkClosed( "beforeFirst()" ); @@ -260,12 +250,6 @@ } - public boolean isClosed() - { - return closed; - } - - public boolean previous() throws IOException { checkClosed( "previous()" ); @@ -348,11 +332,5 @@ public boolean isElementReused() { return true; - } - - - public void close() - { - closed = true; } } Added: directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/SingletonCursor.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/SingletonCursor.java?rev=604361&view=auto ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/SingletonCursor.java (added) +++ directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/SingletonCursor.java Fri Dec 14 16:58:40 2007 @@ -0,0 +1,243 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.directory.server.core.cursor; + + +import java.io.IOException; + + +/** + * A Cursor on a single element. + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +public class SingletonCursor extends AbstractCursor +{ + private boolean beforeFirst = true; + private boolean afterLast; + private boolean onSingleton; + private final E singleton; + + + public SingletonCursor( E singleton ) + { + this.singleton = singleton; + } + + + public void beforeFirst() throws IOException + { + checkClosed( "()" ); + beforeFirst = true; + afterLast = false; + onSingleton = false; + } + + + public void afterLast() throws IOException + { + checkClosed( "()" ); + beforeFirst = false; + afterLast = true; + onSingleton = false; + } + + + public boolean absolute( int absolutePosition ) throws IOException + { + checkClosed( "()" ); + if ( absolutePosition == 0 ) + { + beforeFirst = false; + onSingleton = true; + afterLast = false; + return true; + } + else if ( absolutePosition > 0 ) + { + beforeFirst = false; + onSingleton = false; + afterLast = true; + return false; + } + else + { + beforeFirst = true; + onSingleton = false; + afterLast = false; + return false; + } + } + + + public boolean relative( int relativePosition ) throws IOException + { + checkClosed( "()" ); + + if ( relativePosition == 0 ) + { + return true; + } + + if ( ( relativePosition == -1 && afterLast ) || + ( relativePosition == 1 && beforeFirst ) ) + { + beforeFirst = false; + onSingleton = true; + afterLast = false; + return true; + } + + if ( relativePosition > 1 ) + { + beforeFirst = false; + onSingleton = false; + afterLast = true; + return false; + } + + // below this then relativePosition < 1 + beforeFirst = true; + onSingleton = false; + afterLast = false; + return false; + } + + + public boolean first() throws IOException + { + checkClosed( "()" ); + beforeFirst = false; + onSingleton = true; + afterLast = false; + return true; + } + + + public boolean last() throws IOException + { + checkClosed( "()" ); + beforeFirst = false; + onSingleton = true; + afterLast = false; + return true; + } + + + public boolean isFirst() throws IOException + { + checkClosed( "()" ); + return onSingleton; + } + + + public boolean isLast() throws IOException + { + checkClosed( "()" ); + return onSingleton; + } + + + public boolean isAfterLast() throws IOException + { + checkClosed( "()" ); + return afterLast; + } + + + public boolean isBeforeFirst() throws IOException + { + checkClosed( "()" ); + return beforeFirst; + } + + + public boolean previous() throws IOException + { + checkClosed( "()" ); + if ( beforeFirst ) + { + return false; + } + + if ( afterLast ) + { + beforeFirst = false; + onSingleton = true; + afterLast = false; + return true; + } + + // must be on the singleton + beforeFirst = true; + onSingleton = false; + afterLast = false; + return false; + } + + + public boolean next() throws IOException + { + checkClosed( "()" ); + if ( beforeFirst ) + { + beforeFirst = false; + onSingleton = true; + afterLast = false; + return true; + } + + if ( afterLast ) + { + return false; + } + + // must be on the singleton + beforeFirst = false; + onSingleton = false; + afterLast = true; + return false; + } + + + public E get() throws IOException + { + checkClosed( "()" ); + if ( onSingleton ) + { + return singleton; + } + + if ( beforeFirst ) + { + throw new InvalidCursorPositionException( "Cannot access element if positioned before first." ); + } + else + { + throw new InvalidCursorPositionException( "Cannot access element if positioned after last." ); + } + } + + + public boolean isElementReused() + { + return true; + } +} Propchange: directory/sandbox/akarasulu/bigbang/apacheds/core-shared/src/main/java/org/apache/directory/server/core/cursor/SingletonCursor.java ------------------------------------------------------------------------------ svn:executable = * Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java?rev=604361&r1=604360&r2=604361&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultOptimizer.java Fri Dec 14 16:58:40 2007 @@ -256,7 +256,14 @@ if ( db.hasUserIndexOn( node.getAttribute() ) ) { Index idx = db.getUserIndex( node.getAttribute() ); - return Long.valueOf( idx.count( node.getValue() ) ); + try + { + return Long.valueOf( idx.count( node.getValue() ) ); + } + catch ( java.io.IOException e ) + { + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + } } // count for non-indexed attribute is unknown so we presume da worst @@ -278,7 +285,14 @@ if ( db.hasUserIndexOn( node.getAttribute() ) ) { Index idx = db.getUserIndex( node.getAttribute() ); - int count = idx.count( node.getValue(), isGreaterThan ); + try + { + int count = idx.count( node.getValue(), isGreaterThan ); + } + catch ( java.io.IOException e ) + { + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + } return Long.valueOf( count ); } @@ -301,7 +315,14 @@ if ( db.hasUserIndexOn( node.getAttribute() ) ) { Index idx = db.getUserIndex( node.getAttribute() ); - int count = idx.count(); + try + { + int count = idx.count(); + } + catch ( java.io.IOException e ) + { + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + } return Long.valueOf( count ); } @@ -322,7 +343,14 @@ if ( db.hasUserIndexOn( node.getAttribute() ) ) { Index idx = db.getExistanceIndex(); - int count = idx.count( node.getAttribute() ); + try + { + int count = idx.count( node.getAttribute() ); + } + catch ( java.io.IOException e ) + { + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + } return Long.valueOf( count ); } Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java?rev=604361&r1=604360&r2=604361&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/DefaultSearchEngine.java Fri Dec 14 16:58:40 2007 @@ -90,7 +90,14 @@ { Name effectiveBase; Long baseId = db.getEntryId( base.toString() ); - String aliasedBase = ( String ) db.getAliasIndex().reverseLookup( baseId ); + try + { + String aliasedBase = ( String ) db.getAliasIndex().reverseLookup( baseId ); + } + catch ( java.io.IOException e ) + { + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + } // -------------------------------------------------------------------- // Determine the eective base with aliases Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java?rev=604361&r1=604360&r2=604361&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/ExpressionEnumerator.java Fri Dec 14 16:58:40 2007 @@ -194,8 +194,15 @@ { NamingEnumeration baseEnumeration = null; NamingEnumeration enumeration = null; - - baseEnumeration = db.getNdnIndex().listIndices(); + + try + { + baseEnumeration = db.getNdnIndex().listIndices(); + } + catch ( java.io.IOException e ) + { + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + } IndexAssertion assertion = new IndexAssertion() { @@ -290,7 +297,14 @@ if ( db.hasUserIndexOn( node.getAttribute() ) ) { Index idx = db.getExistanceIndex(); - return idx.listIndices( node.getAttribute() ); + try + { + return idx.listIndices( node.getAttribute() ); + } + catch ( java.io.IOException e ) + { + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + } } return nonIndexedScan( node ); @@ -312,7 +326,14 @@ { Index idx = db.getUserIndex( node.getAttribute() ); - return idx.listIndices( node.getValue(), isGreaterOrLesser ); + try + { + return idx.listIndices( node.getValue(), isGreaterOrLesser ); + } + catch ( java.io.IOException e ) + { + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + } } return nonIndexedScan( node ); @@ -332,7 +353,14 @@ if ( db.hasUserIndexOn( node.getAttribute() ) ) { Index idx = db.getUserIndex( node.getAttribute() ); - return idx.listIndices( node.getValue() ); + try + { + return idx.listIndices( node.getValue() ); + } + catch ( java.io.IOException e ) + { + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + } } return nonIndexedScan( node ); @@ -349,8 +377,15 @@ */ private NamingEnumeration nonIndexedScan( final LeafNode node ) throws NamingException { - NamingEnumeration underlying = db.getNdnIndex().listIndices(); - + try + { + NamingEnumeration underlying = db.getNdnIndex().listIndices(); + } + catch ( java.io.IOException e ) + { + e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. + } + IndexAssertion assertion = new IndexAssertion() { public boolean assertCandidate( IndexRecord record ) throws NamingException Modified: directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java?rev=604361&r1=604360&r2=604361&view=diff ============================================================================== --- directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java (original) +++ directory/sandbox/akarasulu/bigbang/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/LeafEvaluator.java Fri Dec 14 16:58:40 2007 @@ -124,7 +124,7 @@ * @throws NamingException */ private boolean matchValue( SimpleNode node, Attribute attr, AttributeType type, Normalizer normalizer, - Comparator comparator ) throws NamingException + Comparator