You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2007/12/24 21:30:44 UTC
svn commit: r606737 - in /directory/sandbox/akarasulu/bigbang/apacheds:
core-cursor/src/main/java/org/apache/directory/server/core/cursor/
jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/
jdbm-cursor/src/main...
Author: akarasulu
Date: Mon Dec 24 12:30:41 2007
New Revision: 606737
URL: http://svn.apache.org/viewvc?rev=606737&view=rev
Log:
committing but will abandon this branch for now since I think we need a simpler version of a Cursor instead of paying for all these additional methods
Added:
directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/
directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/AfterInnerState.java
directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/AfterLastState.java
directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/BeforeFirstState.java
directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/BeforeInnerState.java
directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/ClosedState.java
directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/EmptyCursorState.java
directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/KeyCursor.java (contents, props changed)
- copied, changed from r604725, directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/KeyCursor.java
directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/OnFirstState.java
directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/OnInnerState.java
directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/OnLastState.java
directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/OpenedState.java
directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/
directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/KeyCursorTest.java
- copied, changed from r604677, directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/KeyCursorTest.java
Removed:
directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/KeyCursor.java
directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/KeyCursorTest.java
Modified:
directory/sandbox/akarasulu/bigbang/apacheds/core-cursor/src/main/java/org/apache/directory/server/core/cursor/CursorStateEnum.java
directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
Modified: directory/sandbox/akarasulu/bigbang/apacheds/core-cursor/src/main/java/org/apache/directory/server/core/cursor/CursorStateEnum.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/core-cursor/src/main/java/org/apache/directory/server/core/cursor/CursorStateEnum.java?rev=606737&r1=606736&r2=606737&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/core-cursor/src/main/java/org/apache/directory/server/core/cursor/CursorStateEnum.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/core-cursor/src/main/java/org/apache/directory/server/core/cursor/CursorStateEnum.java Mon Dec 24 12:30:41 2007
@@ -27,20 +27,22 @@
*/
public enum CursorStateEnum
{
+ /** the Cursor has been created and so has not been positioned yet */
+ JUST_OPENED,
/** the Cursor is positioned just before the first element */
BEFORE_FIRST,
/** the Cursor is positioned just after the last element */
AFTER_LAST,
/** the Cursor is positioned just before an element but not on any element */
- BEFORE_ELEMENT,
+ BEFORE_INNER,
/** the Cursor is positioned just after an element but not on any element */
- AFTER_ELEMENT,
+ AFTER_INNER,
/** the Cursor is positioned on the first element */
ON_FIRST,
/** the Cursor is positioned on the last element */
ON_LAST,
/** the Cursor is positioned on an element */
- ON_INTERIOR_ELEMENT,
+ ON_INNER,
/** the Cursor is closed and not operations can be performed on it */
CLOSED
}
Added: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/AfterInnerState.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/AfterInnerState.java?rev=606737&view=auto
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/AfterInnerState.java (added)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/AfterInnerState.java Mon Dec 24 12:30:41 2007
@@ -0,0 +1,95 @@
+/*
+ * 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.partition.impl.btree.jdbm.cursor.keyonly;
+
+import org.apache.directory.server.core.cursor.CursorState;
+
+import java.io.IOException;
+
+
+/**
+ * The KeyCursor's state when positioned just after an element.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class AfterInnerState<E> implements CursorState<E>
+{
+ private final KeyCursor cursor;
+
+
+ public AfterInnerState( KeyCursor cursor )
+ {
+ this.cursor = cursor;
+ }
+
+
+ public void before( E element ) throws IOException
+ {
+
+ }
+
+
+ public void after( E element ) throws IOException
+ {
+
+ }
+
+
+ public void beforeFirst() throws IOException
+ {
+
+ }
+
+
+ public void afterLast() throws IOException
+ {
+
+ }
+
+
+ public boolean relative( int offset ) throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean first() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean last() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean previous() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean next() throws IOException
+ {
+ return false;
+ }
+}
Added: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/AfterLastState.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/AfterLastState.java?rev=606737&view=auto
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/AfterLastState.java (added)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/AfterLastState.java Mon Dec 24 12:30:41 2007
@@ -0,0 +1,95 @@
+/*
+ * 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.partition.impl.btree.jdbm.cursor.keyonly;
+
+import org.apache.directory.server.core.cursor.CursorState;
+
+import java.io.IOException;
+
+
+/**
+ * The KeyCursor's after last state.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class AfterLastState<E> implements CursorState<E>
+{
+ private final KeyCursor cursor;
+
+
+ public AfterLastState( KeyCursor cursor )
+ {
+ this.cursor = cursor;
+ }
+
+
+ public void before( E element ) throws IOException
+ {
+
+ }
+
+
+ public void after( E element ) throws IOException
+ {
+
+ }
+
+
+ public void beforeFirst() throws IOException
+ {
+
+ }
+
+
+ public void afterLast() throws IOException
+ {
+
+ }
+
+
+ public boolean relative( int offset ) throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean first() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean last() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean previous() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean next() throws IOException
+ {
+ return false;
+ }
+}
Added: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/BeforeFirstState.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/BeforeFirstState.java?rev=606737&view=auto
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/BeforeFirstState.java (added)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/BeforeFirstState.java Mon Dec 24 12:30:41 2007
@@ -0,0 +1,95 @@
+/*
+ * 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.partition.impl.btree.jdbm.cursor.keyonly;
+
+import org.apache.directory.server.core.cursor.CursorState;
+
+import java.io.IOException;
+
+
+/**
+ * KeyCursor state where the Cursor is positioned before the first element.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class BeforeFirstState<E> implements CursorState<E>
+{
+ private final KeyCursor cursor;
+
+
+ public BeforeFirstState( KeyCursor cursor )
+ {
+ this.cursor = cursor;
+ }
+
+
+ public void before( E element ) throws IOException
+ {
+
+ }
+
+
+ public void after( E element ) throws IOException
+ {
+
+ }
+
+
+ public void beforeFirst() throws IOException
+ {
+
+ }
+
+
+ public void afterLast() throws IOException
+ {
+
+ }
+
+
+ public boolean relative( int offset ) throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean first() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean last() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean previous() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean next() throws IOException
+ {
+ return false;
+ }
+}
Added: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/BeforeInnerState.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/BeforeInnerState.java?rev=606737&view=auto
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/BeforeInnerState.java (added)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/BeforeInnerState.java Mon Dec 24 12:30:41 2007
@@ -0,0 +1,95 @@
+/*
+ * 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.partition.impl.btree.jdbm.cursor.keyonly;
+
+import org.apache.directory.server.core.cursor.CursorState;
+
+import java.io.IOException;
+
+
+/**
+ * The KeyCursor's state before an element.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class BeforeInnerState<E> implements CursorState<E>
+{
+ private final KeyCursor cursor;
+
+
+ public BeforeInnerState( KeyCursor cursor )
+ {
+ this.cursor = cursor;
+ }
+
+
+ public void before( E element ) throws IOException
+ {
+
+ }
+
+
+ public void after( E element ) throws IOException
+ {
+
+ }
+
+
+ public void beforeFirst() throws IOException
+ {
+
+ }
+
+
+ public void afterLast() throws IOException
+ {
+
+ }
+
+
+ public boolean relative( int offset ) throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean first() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean last() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean previous() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean next() throws IOException
+ {
+ return false;
+ }
+}
Added: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/ClosedState.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/ClosedState.java?rev=606737&view=auto
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/ClosedState.java (added)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/ClosedState.java Mon Dec 24 12:30:41 2007
@@ -0,0 +1,88 @@
+/*
+ * 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.partition.impl.btree.jdbm.cursor.keyonly;
+
+
+import org.apache.directory.server.core.cursor.CursorState;
+import org.apache.directory.server.core.cursor.CursorClosedException;
+
+import java.io.IOException;
+
+
+/**
+ * Closed state for KeyCursor
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class ClosedState<E> implements CursorState<E>
+{
+ public void before( E element ) throws IOException
+ {
+ throw new CursorClosedException();
+ }
+
+
+ public void after( E element ) throws IOException
+ {
+ throw new CursorClosedException();
+ }
+
+
+ public void beforeFirst() throws IOException
+ {
+ throw new CursorClosedException();
+ }
+
+
+ public void afterLast() throws IOException
+ {
+ throw new CursorClosedException();
+ }
+
+
+ public boolean relative( int offset ) throws IOException
+ {
+ throw new CursorClosedException();
+ }
+
+
+ public boolean first() throws IOException
+ {
+ throw new CursorClosedException();
+ }
+
+
+ public boolean last() throws IOException
+ {
+ throw new CursorClosedException();
+ }
+
+
+ public boolean previous() throws IOException
+ {
+ throw new CursorClosedException();
+ }
+
+
+ public boolean next() throws IOException
+ {
+ throw new CursorClosedException();
+ }
+}
Added: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/EmptyCursorState.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/EmptyCursorState.java?rev=606737&view=auto
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/EmptyCursorState.java (added)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/EmptyCursorState.java Mon Dec 24 12:30:41 2007
@@ -0,0 +1,95 @@
+/*
+ * 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.partition.impl.btree.jdbm.cursor.keyonly;
+
+import org.apache.directory.server.core.cursor.CursorState;
+
+import java.io.IOException;
+
+
+/**
+ * A KeyCursor which is empty is a special condition.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class EmptyCursorState<E> implements CursorState<E>
+{
+ private final KeyCursor cursor;
+
+
+ EmptyCursorState( KeyCursor cursor )
+ {
+ this.cursor = cursor;
+ }
+
+
+ public void before( E element ) throws IOException
+ {
+
+ }
+
+
+ public void after( E element ) throws IOException
+ {
+
+ }
+
+
+ public void beforeFirst() throws IOException
+ {
+
+ }
+
+
+ public void afterLast() throws IOException
+ {
+
+ }
+
+
+ public boolean relative( int offset ) throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean first() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean last() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean previous() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean next() throws IOException
+ {
+ return false;
+ }
+}
Copied: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/KeyCursor.java (from r604725, directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/KeyCursor.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/KeyCursor.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/KeyCursor.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/KeyCursor.java&r1=604725&r2=606737&rev=606737&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/KeyCursor.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/KeyCursor.java Mon Dec 24 12:30:41 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.directory.server.core.partition.impl.btree.jdbm.cursor;
+package org.apache.directory.server.core.partition.impl.btree.jdbm.cursor.keyonly;
import jdbm.btree.BTree;
@@ -26,6 +26,7 @@
import org.apache.directory.server.core.cursor.AbstractCursor;
import org.apache.directory.server.core.cursor.InconsistentCursorStateException;
import org.apache.directory.server.core.cursor.InvalidCursorPositionException;
+import org.apache.directory.server.core.cursor.CursorState;
import org.apache.directory.shared.ldap.NotImplementedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,14 +44,26 @@
public class KeyCursor<E> extends AbstractCursor<E>
{
private static final Logger LOG = LoggerFactory.getLogger( KeyCursor.class );
- private final Tuple jdbmTuple = new Tuple();
+ private final Tuple tuple = new Tuple();
+ private final CursorState afterInner = new AfterInnerState( this );
+ private final CursorState afterLast = new AfterLastState( this );
+ private final CursorState beforeFirst = new BeforeFirstState( this );
+ private final CursorState beforeInner = new BeforeInnerState( this );
+ private final CursorState closed = new ClosedState();
+ private final CursorState opened = new OpenedState( this );
+ private final CursorState onFirst = new OnFirstState( this );
+ private final CursorState onInner = new OnInnerState( this );
+ private final CursorState onLast = new OnLastState( this );
+ private final CursorState empty = new EmptyCursorState( this );
+
+ private CursorState state = opened;
private BTree btree;
private TupleBrowser browser;
private int size; // cache the size to prevent needless lookups
- private boolean afterLast;
- private boolean beforeFirst;
- private boolean success;
+
+ private E first;
+ private E last;
/**
@@ -62,7 +75,7 @@
KeyCursor( BTree btree ) throws IOException
{
this.btree = btree;
- beforeFirst();
+ this.size = btree.size();
}
@@ -72,8 +85,8 @@
success = false;
afterLast = false;
beforeFirst = false;
- jdbmTuple.setKey( null );
- jdbmTuple.setValue( null );
+ tuple.setKey( null );
+ tuple.setValue( null );
}
@@ -91,7 +104,6 @@
afterLast = false;
success = false;
size = btree.size();
- pos = BEFORE_FIRST;
browser = btree.browse();
}
}
@@ -117,17 +129,17 @@
// respectively before the first or after the last position
// -------------------------------------------------------------------
- if ( ( relativePosition + pos ) >= size )
- {
- afterLast();
- return false;
- }
-
- if ( ( relativePosition + pos ) < 0 )
- {
- beforeFirst();
- return false;
- }
+// if ( ( relativePosition + pos ) >= size )
+// {
+// afterLast();
+// return false;
+// }
+//
+// if ( ( relativePosition + pos ) < 0 )
+// {
+// beforeFirst();
+// return false;
+// }
// -------------------------------------------------------------------
// Special case where position is valid and that's the new position
@@ -168,10 +180,10 @@
return next();
}
- if ( pos == 0 )
- {
- return success;
- }
+// if ( pos == 0 )
+// {
+// return success;
+// }
beforeFirst();
return next();
@@ -185,10 +197,10 @@
return previous();
}
- if ( pos == ( size - 1 ) )
- {
- return success;
- }
+// if ( pos == ( size - 1 ) )
+// {
+// return success;
+// }
afterLast();
return previous();
@@ -197,13 +209,15 @@
public boolean isFirst() throws IOException
{
- return pos == 0;
+// return pos == 0;
+ throw new NotImplementedException();
}
public boolean isLast() throws IOException
{
- return pos == ( size - 1 );
+// return pos == ( size - 1 );
+ throw new NotImplementedException();
}
@@ -228,29 +242,29 @@
if ( afterLast )
{
- success = browser.getPrevious( jdbmTuple );
+ success = browser.getPrevious( tuple );
if ( success )
{
afterLast = false;
beforeFirst = false;
- pos = size - 1;
+// pos = size - 1;
}
return success;
}
- if ( pos == 0 )
- {
- success = false;
- afterLast = false;
- beforeFirst = true;
- pos = BEFORE_FIRST;
- return false;
- }
+// if ( pos == 0 )
+// {
+// success = false;
+// afterLast = false;
+// beforeFirst = true;
+// pos = BEFORE_FIRST;
+// return false;
+// }
- success = browser.getPrevious( jdbmTuple );
+ success = browser.getPrevious( tuple );
if ( success )
{
- pos--;
+// pos--;
}
return success;
}
@@ -265,29 +279,29 @@
if ( beforeFirst )
{
- success = browser.getNext( jdbmTuple );
+ success = browser.getNext( tuple );
if ( success )
{
afterLast = false;
beforeFirst = false;
- pos = 0;
+// pos = 0;
}
return success;
}
- if ( pos == size - 1 )
- {
- success = false;
- afterLast = true;
- beforeFirst = false;
- pos = size;
- return false;
- }
+// if ( pos == size - 1 )
+// {
+// success = false;
+// afterLast = true;
+// beforeFirst = false;
+// pos = size;
+// return false;
+// }
- success = browser.getNext( jdbmTuple );
+ success = browser.getNext( tuple );
if ( success )
{
- pos++;
+// pos++;
}
return success;
}
@@ -295,7 +309,8 @@
private boolean inRangeOnValue()
{
- return pos > BEFORE_FIRST && pos < size;
+// return pos > BEFORE_FIRST && pos < size;
+ throw new NotImplementedException();
}
@@ -310,7 +325,7 @@
if ( success )
{
//noinspection unchecked
- return ( E ) jdbmTuple.getKey();
+ return ( E ) tuple.getKey();
}
else
{
@@ -323,5 +338,146 @@
public boolean isElementReused()
{
return false;
+ }
+
+
+ BTree getBtree()
+ {
+ return btree;
+ }
+
+
+ Tuple getTuple()
+ {
+ return tuple;
+ }
+
+
+ CursorState getState()
+ {
+ return state;
+ }
+
+
+ void setState( CursorState state )
+ {
+ this.state = state;
+ }
+
+
+ TupleBrowser getBrowser()
+ {
+ return browser;
+ }
+
+
+ void setBrowser( TupleBrowser browser )
+ {
+ this.browser = browser;
+ }
+
+
+ int size()
+ {
+ return size;
+ }
+
+
+ E getFirst() throws IOException
+ {
+ if ( size == 0 )
+ {
+ return null;
+ }
+
+ if ( first != null )
+ {
+ return first;
+ }
+
+ TupleBrowser browser = btree.browse();
+ Tuple tuple = new Tuple();
+ if ( browser.getNext( tuple ) )
+ {
+ return first = ( E ) tuple.getKey();
+ }
+
+ return first = null;
+ }
+
+
+ E getLast() throws IOException
+ {
+ if ( size == 0 )
+ {
+ return null;
+ }
+
+ if ( last != null )
+ {
+ return last;
+ }
+
+ TupleBrowser browser = btree.browse( null );
+ Tuple tuple = new Tuple();
+ if ( browser.getPrevious( tuple ) )
+ {
+ return last = ( E ) tuple.getKey();
+ }
+ return last = null;
+ }
+
+
+ public CursorState getAfterInner()
+ {
+ return afterInner;
+ }
+
+
+ public CursorState getAfterLast()
+ {
+ return afterLast;
+ }
+
+
+ public CursorState getBeforeFirst()
+ {
+ return beforeFirst;
+ }
+
+
+ public CursorState getBeforeInner()
+ {
+ return beforeInner;
+ }
+
+
+ public CursorState getClosed()
+ {
+ return closed;
+ }
+
+
+ public CursorState getOpened()
+ {
+ return opened;
+ }
+
+
+ public CursorState getOnFirst()
+ {
+ return onFirst;
+ }
+
+
+ public CursorState getOnInner()
+ {
+ return onInner;
+ }
+
+
+ public CursorState getOnLast()
+ {
+ return onLast;
}
}
Propchange: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/KeyCursor.java
------------------------------------------------------------------------------
svn:executable = *
Added: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/OnFirstState.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/OnFirstState.java?rev=606737&view=auto
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/OnFirstState.java (added)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/OnFirstState.java Mon Dec 24 12:30:41 2007
@@ -0,0 +1,95 @@
+/*
+ * 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.partition.impl.btree.jdbm.cursor.keyonly;
+
+import org.apache.directory.server.core.cursor.CursorState;
+
+import java.io.IOException;
+
+
+/**
+ * The state of the KeyCursor when on the first element.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class OnFirstState<E> implements CursorState<E>
+{
+ private final KeyCursor cursor;
+
+
+ public OnFirstState( KeyCursor cursor )
+ {
+ this.cursor = cursor;
+ }
+
+
+ public void before( E element ) throws IOException
+ {
+
+ }
+
+
+ public void after( E element ) throws IOException
+ {
+
+ }
+
+
+ public void beforeFirst() throws IOException
+ {
+
+ }
+
+
+ public void afterLast() throws IOException
+ {
+
+ }
+
+
+ public boolean relative( int offset ) throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean first() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean last() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean previous() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean next() throws IOException
+ {
+ return false;
+ }
+}
Added: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/OnInnerState.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/OnInnerState.java?rev=606737&view=auto
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/OnInnerState.java (added)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/OnInnerState.java Mon Dec 24 12:30:41 2007
@@ -0,0 +1,95 @@
+/*
+ * 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.partition.impl.btree.jdbm.cursor.keyonly;
+
+import org.apache.directory.server.core.cursor.CursorState;
+
+import java.io.IOException;
+
+
+/**
+ * The state of the KeyCursor when it is positioned on some inner element.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class OnInnerState<E> implements CursorState<E>
+{
+ private final KeyCursor cursor;
+
+
+ public OnInnerState( KeyCursor cursor )
+ {
+ this.cursor = cursor;
+ }
+
+
+ public void before( E element ) throws IOException
+ {
+
+ }
+
+
+ public void after( E element ) throws IOException
+ {
+
+ }
+
+
+ public void beforeFirst() throws IOException
+ {
+
+ }
+
+
+ public void afterLast() throws IOException
+ {
+
+ }
+
+
+ public boolean relative( int offset ) throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean first() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean last() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean previous() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean next() throws IOException
+ {
+ return false;
+ }
+}
Added: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/OnLastState.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/OnLastState.java?rev=606737&view=auto
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/OnLastState.java (added)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/OnLastState.java Mon Dec 24 12:30:41 2007
@@ -0,0 +1,95 @@
+/*
+ * 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.partition.impl.btree.jdbm.cursor.keyonly;
+
+import org.apache.directory.server.core.cursor.CursorState;
+
+import java.io.IOException;
+
+
+/**
+ * The state of the KeyCursor when it is positioned on the last element.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class OnLastState<E> implements CursorState<E>
+{
+ private final KeyCursor cursor;
+
+
+ public OnLastState( KeyCursor cursor )
+ {
+ this.cursor = cursor;
+ }
+
+
+ public void before( E element ) throws IOException
+ {
+
+ }
+
+
+ public void after( E element ) throws IOException
+ {
+
+ }
+
+
+ public void beforeFirst() throws IOException
+ {
+
+ }
+
+
+ public void afterLast() throws IOException
+ {
+
+ }
+
+
+ public boolean relative( int offset ) throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean first() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean last() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean previous() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean next() throws IOException
+ {
+ return false;
+ }
+}
Added: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/OpenedState.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/OpenedState.java?rev=606737&view=auto
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/OpenedState.java (added)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/OpenedState.java Mon Dec 24 12:30:41 2007
@@ -0,0 +1,122 @@
+/*
+ * 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.partition.impl.btree.jdbm.cursor.keyonly;
+
+
+import org.apache.directory.server.core.cursor.CursorState;
+
+import java.io.IOException;
+
+import jdbm.helper.Tuple;
+import jdbm.helper.TupleBrowser;
+
+
+/**
+ * The KeyCursor's state right after it is opened.
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ * @version $Rev$, $Date$
+ */
+public class OpenedState<E> implements CursorState<E>
+{
+ private final KeyCursor cursor;
+
+
+ public OpenedState( KeyCursor cursor )
+ {
+ this.cursor = cursor;
+ }
+
+
+ public void before( E element ) throws IOException
+ {
+ // if there is nothing in the btree then we abandon
+ if ( cursor.size() == 0 )
+ {
+
+ }
+
+
+ TupleBrowser browser = cursor.getBtree().browse( element );
+
+ /*
+ * We need to figure out if we are before some inner element, before
+ * the first element or after the last element. To do so we need to
+ * check of the next element is the first element, and check if the
+ * previous element is the last element.
+ */
+ Tuple tuple = new Tuple();
+ if ( browser.getNext( tuple ) )
+ {
+
+ }
+ else
+ {
+ // we must be after the last
+ }
+ }
+
+
+ public void after( E element ) throws IOException
+ {
+ cursor.setBrowser( cursor.getBtree().browse( element ) );
+ }
+
+
+ public void beforeFirst() throws IOException
+ {
+
+ }
+
+
+ public void afterLast() throws IOException
+ {
+
+ }
+
+
+ public boolean relative( int offset ) throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean first() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean last() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean previous() throws IOException
+ {
+ return false;
+ }
+
+
+ public boolean next() throws IOException
+ {
+ return false;
+ }
+}
Copied: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/KeyCursorTest.java (from r604677, directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/KeyCursorTest.java)
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/KeyCursorTest.java?p2=directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/KeyCursorTest.java&p1=directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/KeyCursorTest.java&r1=604677&r2=606737&rev=606737&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/KeyCursorTest.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-cursor/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/cursor/keyonly/KeyCursorTest.java Mon Dec 24 12:30:41 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.directory.server.core.partition.impl.btree.jdbm.cursor;
+package org.apache.directory.server.core.partition.impl.btree.jdbm.cursor.keyonly;
import org.junit.*;
@@ -28,6 +28,7 @@
import static org.junit.Assert.assertNull;
import org.apache.directory.server.core.cursor.Cursor;
+import org.apache.directory.server.core.partition.impl.btree.jdbm.cursor.keyonly.KeyCursor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java?rev=606737&r1=606736&r2=606737&view=diff
==============================================================================
--- directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java (original)
+++ directory/sandbox/akarasulu/bigbang/apacheds/jdbm-store/src/main/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmTable.java Mon Dec 24 12:30:41 2007
@@ -29,7 +29,7 @@
import org.apache.directory.server.core.cursor.IteratorCursor;
import org.apache.directory.server.core.cursor.SingletonCursor;
import org.apache.directory.server.core.partition.impl.btree.*;
-import org.apache.directory.server.core.partition.impl.btree.jdbm.cursor.KeyCursor;
+import org.apache.directory.server.core.partition.impl.btree.jdbm.cursor.keyonly.KeyCursor;
import org.apache.directory.server.core.partition.impl.btree.jdbm.cursor.TupleCursor;
import org.apache.directory.server.schema.SerializableComparator;