You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by se...@apache.org on 2011/07/27 22:32:09 UTC
svn commit: r1151618 -
/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/
Author: seelmann
Date: Wed Jul 27 20:32:07 2011
New Revision: 1151618
URL: http://svn.apache.org/viewvc?rev=1151618&view=rev
Log:
Fix compilation errors
Modified:
directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedOneLevelScopeCursor.java
directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedOptimizer.java
directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubstringCursor.java
directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubstringEvaluator.java
directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubtreeScopeCursor.java
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedOneLevelScopeCursor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedOneLevelScopeCursor.java?rev=1151618&r1=1151617&r2=1151618&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedOneLevelScopeCursor.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedOneLevelScopeCursor.java Wed Jul 27 20:32:07 2011
@@ -312,9 +312,4 @@ public class ExtendedOneLevelScopeCursor
throw new InvalidCursorPositionException( "Cursor has not been positioned yet." );
}
-
- public boolean isElementReused()
- {
- return scopeCursor.isElementReused() || ( dereferencedCursor != null && dereferencedCursor.isElementReused() );
- }
}
\ No newline at end of file
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedOptimizer.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedOptimizer.java?rev=1151618&r1=1151617&r2=1151618&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedOptimizer.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedOptimizer.java Wed Jul 27 20:32:07 2011
@@ -93,9 +93,9 @@ public class ExtendedOptimizer<E, ID ext
private long getSubstringScan( SubstringNode node ) throws Exception
{
- if ( db.hasIndexOn( node.getAttribute() ) )
+ if ( db.hasIndexOn( node.getAttributeType() ) )
{
- Index<?, E, ID> idx = db.getIndex( node.getAttribute() );
+ Index<?, E, ID> idx = db.getIndex( node.getAttributeType() );
if ( idx instanceof IndexSubstringExtension<?, ?, ?> )
{
IndexSubstringExtension<?, E, ID> substringIdx = ( IndexSubstringExtension<?, E, ID> ) idx;
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubstringCursor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubstringCursor.java?rev=1151618&r1=1151617&r2=1151618&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubstringCursor.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubstringCursor.java Wed Jul 27 20:32:07 2011
@@ -51,12 +51,12 @@ public class ExtendedSubstringCursor<ID
throws Exception
{
evaluator = substringEvaluator;
- hasIndex = db.hasIndexOn( evaluator.getExpression().getAttribute() );
+ hasIndex = db.hasIndexOn( evaluator.getExpression().getAttributeType() );
if ( hasIndex )
{
Index<String, Entry, ID> idx = ( Index<String, Entry, ID> ) db.getIndex( evaluator
- .getExpression().getAttribute() );
+ .getExpression().getAttributeType() );
if ( idx instanceof IndexSubstringExtension<?, ?, ?> )
{
wrapped = ( ( IndexSubstringExtension ) idx ).forwardSubstringCursor( evaluator.getExpression() );
@@ -82,7 +82,7 @@ public class ExtendedSubstringCursor<ID
* knows to use it, when it itself detects the lack of an index on
* the node's attribute.
*/
- wrapped = db.getNdnIndex().forwardCursor();
+ wrapped = db.getEntryUuidIndex().forwardCursor();
}
}
@@ -237,12 +237,6 @@ public class ExtendedSubstringCursor<ID
}
- public boolean isElementReused()
- {
- return wrapped.isElementReused();
- }
-
-
public void close() throws Exception
{
super.close();
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubstringEvaluator.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubstringEvaluator.java?rev=1151618&r1=1151617&r2=1151618&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubstringEvaluator.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubstringEvaluator.java Wed Jul 27 20:32:07 2011
@@ -103,10 +103,10 @@ public class ExtendedSubstringEvaluator<
// compile the regular expression to search for a matching attribute
regex = node.getRegex( normalizer );
- if ( db.hasIndexOn( node.getAttribute() ) )
+ if ( db.hasIndexOn( node.getAttributeType() ) )
{
//noinspection unchecked
- idx = ( Index<String, Entry, ID> ) db.getIndex( node.getAttribute() );
+ idx = ( Index<String, Entry, ID> ) db.getIndex( node.getAttributeType() );
}
else
{
@@ -260,8 +260,7 @@ public class ExtendedSubstringEvaluator<
*/
for ( Value<?> value : attr )
{
- value.normalize( normalizer );
- String strValue = ( String ) value.getNormalizedValue();
+ String strValue = ( String ) value.getNormValue();
// Once match is found cleanup and return true
if ( regex.matcher( strValue ).matches() )
@@ -301,8 +300,7 @@ public class ExtendedSubstringEvaluator<
*/
for ( Value<?> value : attr )
{
- value.normalize( normalizer );
- String strValue = ( String ) value.getNormalizedValue();
+ String strValue = ( String ) value.getNormValue();
// Once match is found cleanup and return true
if ( regex.matcher( strValue ).matches() )
@@ -352,8 +350,7 @@ public class ExtendedSubstringEvaluator<
*/
for ( Value<?> value : attr )
{
- value.normalize( normalizer );
- String strValue = ( String ) value.getNormalizedValue();
+ String strValue = ( String ) value.getNormValue();
// Once match is found cleanup and return true
if ( regex.matcher( strValue ).matches() )
@@ -395,8 +392,7 @@ public class ExtendedSubstringEvaluator<
*/
for ( Value<?> value : attr )
{
- value.normalize( normalizer );
- String strValue = ( String ) value.getNormalizedValue();
+ String strValue = ( String ) value.getNormValue();
// Once match is found cleanup and return true
if ( regex.matcher( strValue ).matches() )
Modified: directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubtreeScopeCursor.java
URL: http://svn.apache.org/viewvc/directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubtreeScopeCursor.java?rev=1151618&r1=1151617&r2=1151618&view=diff
==============================================================================
--- directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubtreeScopeCursor.java (original)
+++ directory/sandbox/seelmann/hbase-partition/src/main/java/org/apache/directory/server/core/partition/hbase/xdbmext/ExtendedSubtreeScopeCursor.java Wed Jul 27 20:32:07 2011
@@ -20,6 +20,7 @@
package org.apache.directory.server.core.partition.hbase.xdbmext;
+import org.apache.directory.server.core.partition.Partition;
import org.apache.directory.server.xdbm.AbstractIndexCursor;
import org.apache.directory.server.xdbm.Index;
import org.apache.directory.server.xdbm.IndexCursor;
@@ -110,7 +111,7 @@ public class ExtendedSubtreeScopeCursor<
{
try
{
- this.contextEntryId = db.getEntryId( db.getSuffixDn() );
+ this.contextEntryId = db.getEntryId( ((Partition)db).getSuffixDn() );
}
catch ( Exception e )
{
@@ -340,9 +341,4 @@ public class ExtendedSubtreeScopeCursor<
throw new InvalidCursorPositionException( "Cursor has not been positioned yet." );
}
-
- public boolean isElementReused()
- {
- return scopeCursor.isElementReused() || ( dereferencedCursor != null && dereferencedCursor.isElementReused() );
- }
}