You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by el...@apache.org on 2013/03/02 01:34:30 UTC
svn commit: r1451792 - in
/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree:
BTree.java BTreeConfiguration.java Leaf.java Node.java Page.java exception/
exception/KeyNotFoundException.java
Author: elecharny
Date: Sat Mar 2 00:34:29 2013
New Revision: 1451792
URL: http://svn.apache.org/r1451792
Log:
o Added a name to the BTree class
o Created a new package for exceptions, moved the KeyNotFoundException there
Added:
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/exception/
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/exception/KeyNotFoundException.java
- copied, changed from r1441858, labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/KeyNotFoundException.java
Modified:
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTree.java
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTreeConfiguration.java
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Leaf.java
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Node.java
labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Page.java
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=1451792&r1=1451791&r2=1451792&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 Sat Mar 2 00:34:29 2013
@@ -37,6 +37,7 @@ import java.util.concurrent.LinkedBlocki
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.ReentrantLock;
+import org.apache.mavibot.btree.exception.KeyNotFoundException;
import org.apache.mavibot.btree.serializer.BufferHandler;
import org.apache.mavibot.btree.serializer.ElementSerializer;
import org.apache.mavibot.btree.serializer.LongSerializer;
@@ -67,6 +68,9 @@ public class BTree<K, V>
/** The default journal file suffix */
public static final String JOURNAL_SUFFIX = ".log";
+ /** The BTree name */
+ private String name;
+
/** A field used to generate new revisions in a thread safe way */
private AtomicLong revision;
@@ -363,9 +367,10 @@ public class BTree<K, V>
*
* @param comparator The comparator to use
*/
- public BTree( ElementSerializer<K> keySerializer, ElementSerializer<V> valueSerializer ) throws IOException
+ public BTree( String name, ElementSerializer<K> keySerializer, ElementSerializer<V> valueSerializer )
+ throws IOException
{
- this( null, null, keySerializer, valueSerializer, DEFAULT_PAGE_SIZE );
+ this( name, null, null, keySerializer, valueSerializer, DEFAULT_PAGE_SIZE );
}
@@ -374,10 +379,10 @@ public class BTree<K, V>
*
* @param comparator The comparator to use
*/
- public BTree( ElementSerializer<K> keySerializer, ElementSerializer<V> valueSerializer, int pageSize )
+ public BTree( String name, ElementSerializer<K> keySerializer, ElementSerializer<V> valueSerializer, int pageSize )
throws IOException
{
- this( null, null, keySerializer, valueSerializer, pageSize );
+ this( name, null, null, keySerializer, valueSerializer, pageSize );
}
@@ -388,10 +393,11 @@ public class BTree<K, V>
* @param comparator The comparator to use
* @param serializer The serializer to use
*/
- public BTree( String path, String file, ElementSerializer<K> keySerializer, ElementSerializer<V> valueSerializer )
+ public BTree( String name, String path, String file, ElementSerializer<K> keySerializer,
+ ElementSerializer<V> valueSerializer )
throws IOException
{
- this( path, file, keySerializer, valueSerializer, DEFAULT_PAGE_SIZE );
+ this( name, path, file, keySerializer, valueSerializer, DEFAULT_PAGE_SIZE );
}
@@ -403,10 +409,13 @@ public class BTree<K, V>
* @param serializer The serializer to use
* @param pageSize The number of elements we can store in a page
*/
- public BTree( String path, String file, ElementSerializer<K> keySerializer, ElementSerializer<V> valueSerializer,
+ public BTree( String name, String path, String file, ElementSerializer<K> keySerializer,
+ ElementSerializer<V> valueSerializer,
int pageSize )
throws IOException
{
+ this.name = name;
+
if ( ( path == null ) && ( file == null ) )
{
inMemory = true;
@@ -1285,6 +1294,24 @@ public class BTree<K, V>
/**
+ * @return the name
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+
+ /**
+ * @param name the name to set
+ */
+ public void setName( String name )
+ {
+ this.name = name;
+ }
+
+
+ /**
* @return the file
*/
public File getFile()
Modified: labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTreeConfiguration.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTreeConfiguration.java?rev=1451792&r1=1451791&r2=1451792&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTreeConfiguration.java (original)
+++ labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/BTreeConfiguration.java Sat Mar 2 00:34:29 2013
@@ -46,6 +46,9 @@ public class BTreeConfiguration<K, V>
private ElementSerializer<K> keySerializer;
private ElementSerializer<V> valueSerializer;
+ /** The BTree name */
+ private String name;
+
/** The path where the BTree file will be stored. Default to the local
* temporary directory.
*/
@@ -296,4 +299,22 @@ public class BTreeConfiguration<K, V>
{
this.writeBufferSize = writeBufferSize;
}
+
+
+ /**
+ * @return the name
+ */
+ public String getName()
+ {
+ return name;
+ }
+
+
+ /**
+ * @param name the name to set
+ */
+ public void setName( String name )
+ {
+ this.name = name;
+ }
}
Modified: labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Leaf.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Leaf.java?rev=1451792&r1=1451791&r2=1451792&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Leaf.java (original)
+++ labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Leaf.java Sat Mar 2 00:34:29 2013
@@ -23,6 +23,8 @@ package org.apache.mavibot.btree;
import java.lang.reflect.Array;
import java.util.LinkedList;
+import org.apache.mavibot.btree.exception.KeyNotFoundException;
+
/**
* A MVCC Leaf. It stores the keys and values. It does not have any children.
Modified: labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Node.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Node.java?rev=1451792&r1=1451791&r2=1451792&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Node.java (original)
+++ labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Node.java Sat Mar 2 00:34:29 2013
@@ -24,6 +24,8 @@ import java.io.IOException;
import java.lang.reflect.Array;
import java.util.LinkedList;
+import org.apache.mavibot.btree.exception.KeyNotFoundException;
+
/**
* A MVCC Node. It stores the keys and references to its children page. It does not
Modified: labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Page.java
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Page.java?rev=1451792&r1=1451791&r2=1451792&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Page.java (original)
+++ labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/Page.java Sat Mar 2 00:34:29 2013
@@ -23,6 +23,8 @@ package org.apache.mavibot.btree;
import java.io.IOException;
import java.util.LinkedList;
+import org.apache.mavibot.btree.exception.KeyNotFoundException;
+
/**
* A MVCC Page interface.
Copied: labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/exception/KeyNotFoundException.java (from r1441858, labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/KeyNotFoundException.java)
URL: http://svn.apache.org/viewvc/labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/exception/KeyNotFoundException.java?p2=labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/exception/KeyNotFoundException.java&p1=labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/KeyNotFoundException.java&r1=1441858&r2=1451792&rev=1451792&view=diff
==============================================================================
--- labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/KeyNotFoundException.java (original)
+++ labs/mavibot/trunk/mavibot/src/main/java/org/apache/mavibot/btree/exception/KeyNotFoundException.java Sat Mar 2 00:34:29 2013
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.mavibot.btree;
+package org.apache.mavibot.btree.exception;
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org