Author: elecharny
Date: Thu Jul 18 00:29:55 2013
New Revision: 1504333
URL: http://svn.apache.org/r1504333
Log:
o Initialized the offset and lastOffset to -1 for new Page
o Added a logger for BTree
Modified:
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/AbstractPage.java
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java
Modified:
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/AbstractPage.java
URL:
http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/AbstractPage.java?rev=1504333&r1=1504332&r2=1504333&view=diff
==============================================================================
---
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/AbstractPage.java
(original)
+++
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/AbstractPage.java
Thu Jul 18 00:29:55 2013
@@ -48,10 +48,10 @@ import java.lang.reflect.Array;
protected int nbElems;
/** The first {@link PageIO} storing the serialized Page on disk */
- private long offset;
+ private long offset = -1L;
/** The last {@link PageIO} storing the serialized Page on disk */
- private long lastOffset;
+ private long lastOffset = -1L;
/**
Modified:
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java
URL:
http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java?rev=1504333&r1=1504332&r2=1504333&view=diff
==============================================================================
---
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java
(original)
+++
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java
Thu Jul 18 00:29:55 2013
@@ -41,6 +41,8 @@ import org.apache.mavibot.btree.exceptio
import org.apache.mavibot.btree.serializer.BufferHandler;
import org.apache.mavibot.btree.serializer.ElementSerializer;
import org.apache.mavibot.btree.serializer.LongSerializer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
@@ -53,7 +55,10 @@ import org.apache.mavibot.btree.serializ
*/
public class BTree<K, V>
{
- /** The Hader for a managed BTree */
+ /** The LoggerFactory used by this class */
+ protected static final Logger LOG = LoggerFactory.getLogger( BTree.class );
+
+ /** The Header for a managed BTree */
private BTreeHeader btreeHeader;
/** Default page size (number of entries per node) */
@@ -496,19 +501,19 @@ public class BTree<K, V>
// We will extract the Type to use for keys, using the comparator for
that
Class<?> comparatorClass = comparator.getClass();
Type[] types = comparatorClass.getGenericInterfaces();
-
+
if ( types[0] instanceof Class )
{
- keyType = ( Class<?> ) types[0];
+ keyType = ( Class<?> ) types[0];
}
else
{
- Type[] argumentTypes = ( ( ParameterizedType ) types[0]
).getActualTypeArguments();
-
- if ( ( argumentTypes != null ) && ( argumentTypes.length > 0 )
&& ( argumentTypes[0] instanceof Class<?> ) )
- {
- keyType = ( Class<?> ) argumentTypes[0];
- }
+ Type[] argumentTypes = ( ( ParameterizedType ) types[0]
).getActualTypeArguments();
+
+ if ( ( argumentTypes != null ) && ( argumentTypes.length > 0 ) &&
( argumentTypes[0] instanceof Class<?> ) )
+ {
+ keyType = ( Class<?> ) argumentTypes[0];
+ }
}
writeLock = new ReentrantLock();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
