Author: elecharny
Date: Tue Aug 14 09:51:22 2012
New Revision: 1372813
URL: http://svn.apache.org/viewvc?rev=1372813&view=rev
Log:
Added the readTimeOut variable in the BTree, with a default value of 10 seconds
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
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=1372813&r1=1372812&r2=1372813&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
Tue Aug 14 09:51:22 2012
@@ -91,6 +91,12 @@ public class BTree<K, V>
/** The thread responsible for the cleanup of timed out reads */
private Thread readTransactionsThread;
+ /** Define a default delay for a read transaction. This is 10 seconds */
+ public static final long DEFAULT_READ_TIMEOUT = 10 * 1000L;
+
+ /** The read transaction timeout */
+ private long readTimeOut = DEFAULT_READ_TIMEOUT;
+
/**
* Create a thread that is responsible of cleaning the transactions when
@@ -108,7 +114,7 @@ public class BTree<K, V>
while ( !Thread.currentThread().isInterrupted() )
{
- long timeoutDate = System.currentTimeMillis() - 10000L;
+ long timeoutDate = System.currentTimeMillis() -
readTimeOut;
// Loop on all the transactions from the queue
while ( ( transaction = readTransactions.peek() ) !=
null )
@@ -132,8 +138,8 @@ public class BTree<K, V>
break;
}
- //System.out.println( "Sleep for 10 seconds" );
- Thread.sleep( 10000L );
+ // Wait until we reach the timeout
+ Thread.sleep( readTimeOut );
}
}
catch ( InterruptedException ie )
@@ -168,6 +174,7 @@ public class BTree<K, V>
pageSize = configuration.getPageSize();
comparator = configuration.getComparator();
serializer = configuration.getSerializer();
+ readTimeOut = configuration.getReadTimeOut();
if ( comparator == null )
{
@@ -886,6 +893,24 @@ public class BTree<K, V>
/**
+ * @return the readTimeOut
+ */
+ public long getReadTimeOut()
+ {
+ return readTimeOut;
+ }
+
+
+ /**
+ * @param readTimeOut the readTimeOut to set
+ */
+ public void setReadTimeOut( long readTimeOut )
+ {
+ this.readTimeOut = readTimeOut;
+ }
+
+
+ /**
* @see Object#toString()
*/
public String toString()
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=1372813&r1=1372812&r2=1372813&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
Tue Aug 14 09:51:22 2012
@@ -69,7 +69,7 @@ public class BTreeConfiguration<K, V>
* The default value is 10000 (10 seconds). If the value is 0 or below,
* the delay is considered as infinite
*/
- private long readTimeOut = 10 * 1000L;
+ private long readTimeOut = BTree.DEFAULT_READ_TIMEOUT;
/** The maximal size of the journal. When this size is reached, the tree
is
* flushed on disk.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
