diff --git a/build.xml b/build.xml
index 43a5db1363153a134175aba70cd1bdbf0fff7cfd..c6568f3701d2a39ec3f9cea16e33d27e06a08c6b 100644
--- a/build.xml
+++ b/build.xml
@@ -65,7 +65,12 @@
     </target>
 
    <target name="doc">
-      <javadoc sourcepath="${src.dir}" destdir="${doc.dir}/javadoc" packagenames="com.yahoo.ycsb,com.yahoo.ycsb.workloads"/> 
+      <javadoc destdir="${doc.dir}/javadoc" packagenames="com.yahoo.ycsb,com.yahoo.ycsb.workloads,com.yahoo.ycsb.db,com.yahoo.ycsb.generator,com.yahoo.ycsb.measurements"> 
+         <fileset dir="." defaultexcludes="yes">
+           <include name="src/**"/>
+           <include name="db/**/src/**"/>
+         </fileset>
+      </javadoc>
    </target>
 
 </project>
diff --git a/db/cassandra-0.5/src/com/yahoo/ycsb/db/CassandraClient5.java b/db/cassandra-0.5/src/com/yahoo/ycsb/db/CassandraClient5.java
index f634fc060b70a0adedde7bbad9cdf74169d97b2d..bf8b58f8a6f923bf89072711a1569db6f89e512b 100644
--- a/db/cassandra-0.5/src/com/yahoo/ycsb/db/CassandraClient5.java
+++ b/db/cassandra-0.5/src/com/yahoo/ycsb/db/CassandraClient5.java
@@ -36,8 +36,10 @@ import org.apache.thrift.protocol.TProtocol;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.cassandra.service.*;
 
+
+// XXXX if we do replication, fix the consistency levels
 /**
- * XXXX if we do replication, fix the consistency levels
+ * Cassandra 0.5 client for YCSB framework
  */
 public class CassandraClient5 extends DB
 {
diff --git a/db/cassandra-0.6/src/com/yahoo/ycsb/db/CassandraClient6.java b/db/cassandra-0.6/src/com/yahoo/ycsb/db/CassandraClient6.java
index e224b22ba64fa2dc4bcb8cf6a9ff464e0443e197..8c1967ff1b65cc718947c81bd947e2cbd7c98cfa 100644
--- a/db/cassandra-0.6/src/com/yahoo/ycsb/db/CassandraClient6.java
+++ b/db/cassandra-0.6/src/com/yahoo/ycsb/db/CassandraClient6.java
@@ -33,8 +33,10 @@ import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.cassandra.service.*;
 import org.apache.cassandra.thrift.*;
 
+
+//XXXX if we do replication, fix the consistency levels
 /**
- * XXXX if we do replication, fix the consistency levels
+ * Cassandra 0.6 client for YCSB framework
  */
 public class CassandraClient6 extends DB
 {
diff --git a/db/cassandra-0.7/src/com/yahoo/ycsb/db/CassandraClient7.java b/db/cassandra-0.7/src/com/yahoo/ycsb/db/CassandraClient7.java
index caddbea33554590dca84fd0383f87faf3eb0b805..1b3e3bf1a9ba5517b3fcd14619bfcac56b47d7b5 100644
--- a/db/cassandra-0.7/src/com/yahoo/ycsb/db/CassandraClient7.java
+++ b/db/cassandra-0.7/src/com/yahoo/ycsb/db/CassandraClient7.java
@@ -34,8 +34,10 @@ import org.apache.thrift.protocol.TProtocol;
 import org.apache.thrift.protocol.TBinaryProtocol;
 import org.apache.cassandra.thrift.*;
 
+
+//XXXX if we do replication, fix the consistency levels
 /**
- * XXXX if we do replication, fix the consistency levels
+ * Cassandra 0.7 client for YCSB framework
  */
 public class CassandraClient7 extends DB
 {
diff --git a/db/hbase/src/com/yahoo/ycsb/db/HBaseClient.java b/db/hbase/src/com/yahoo/ycsb/db/HBaseClient.java
index c61e8828c30e5eb3332c3fff05098c4772912386..d880f275ca47323307b72f374c03164ba92e6613 100644
--- a/db/hbase/src/com/yahoo/ycsb/db/HBaseClient.java
+++ b/db/hbase/src/com/yahoo/ycsb/db/HBaseClient.java
@@ -40,6 +40,9 @@ import org.apache.hadoop.hbase.client.ResultScanner;
 import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 
+/**
+ * HBase client for YCSB framework
+ */
 public class HBaseClient extends com.yahoo.ycsb.DB
 {
     public boolean _debug=false;
diff --git a/doc/coreproperties.html b/doc/coreproperties.html
index 2ec6e285459c085cafb7eaeea81d49b20d8c8025..81b2ede066e7e4f2fef6fa080b0e4f2db0fad6e1 100644
--- a/doc/coreproperties.html
+++ b/doc/coreproperties.html
@@ -3,8 +3,8 @@
 <TITLE>YCSB - Core workload package properties</TITLE>
 </HEAD>
 <BODY>
-<H1><img src="images/ycsblogo-small.png"> Yahoo! Cloud Serving Benchmark</H1>
-<H3>Version 0.1</H3>
+<H1><img src="images/ycsb.jpg" width=150> Yahoo! Cloud Serving Benchmark</H1>
+<H3>Version 0.1.2</H3>
 <HR>
 <A HREF="index.html">Home</A> - <A href="coreworkloads.html">Core workloads</A> - <a href="tipsfaq.html">Tips and FAQ</A>
 <HR>
diff --git a/doc/coreworkloads.html b/doc/coreworkloads.html
index 044ca8d218eccd1f2eb1e425ae873bb6369c8544..d039ac86fb1b477e9828544efd360842830d5a6f 100644
--- a/doc/coreworkloads.html
+++ b/doc/coreworkloads.html
@@ -3,8 +3,8 @@
 <TITLE>YCSB - Core workloads</TITLE>
 </HEAD>
 <BODY>
-<H1><img src="images/ycsblogo-small.png"> Yahoo! Cloud Serving Benchmark</H1>
-<H3>Version 0.1</H3>
+<H1><img src="images/ycsb.jpg" width=150> Yahoo! Cloud Serving Benchmark</H1>
+<H3>Version 0.1.2</H3>
 <HR>
 <A HREF="index.html">Home</A> - <A href="coreworkloads.html">Core workloads</A> - <a href="tipsfaq.html">Tips and FAQ</A>
 <HR>
diff --git a/doc/dblayer.html b/doc/dblayer.html
index 1e1a6744fa1b2b19c7bf133826cc617d825fcadc..35cdfdbf299ab479b9ac8a4c55e0b6263fd374fb 100644
--- a/doc/dblayer.html
+++ b/doc/dblayer.html
@@ -3,8 +3,8 @@
 <TITLE>YCSB - DB Interface Layer</TITLE>
 </HEAD>
 <BODY>
-<H1><img src="images/ycsblogo-small.png"> Yahoo! Cloud Serving Benchmark</H1>
-<H3>Version 0.1</H3>
+<H1><img src="images/ycsb.jpg" width=150> Yahoo! Cloud Serving Benchmark</H1>
+<H3>Version 0.1.2</H3>
 <HR>
 <A HREF="index.html">Home</A> - <A href="coreworkloads.html">Core workloads</A> - <a href="tipsfaq.html">Tips and FAQ</A>
 <HR>
@@ -95,4 +95,4 @@ db=com.foo.YourDBClass
 <HR>
 YCSB - Yahoo! Research - Contact cooperb@yahoo-inc.com.
 </BODY>
-</HTML>
\ No newline at end of file
+</HTML>
diff --git a/doc/images/ycsb.jpg b/doc/images/ycsb.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..793a689166bbfdb618f86eea8cd21fd711b8e5ad
Binary files /dev/null and b/doc/images/ycsb.jpg differ
diff --git a/doc/index.html b/doc/index.html
index a2ef77a3bbf12c6157123a3fe3a9750abda95ebc..0aeb3eef1483cbfd6214896cfcd6cafa140a91b4 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -3,8 +3,8 @@
 <title>YCSB - Yahoo! Cloud Serving Benchmark</title>
 </head>
 <body>
-<H1><img src="images/ycsblogo-small.png"> Yahoo! Cloud Serving Benchmark</H1>
-<H3>Version 0.1</H3>
+<H1><img src="images/ycsb.jpg" width=150> Yahoo! Cloud Serving Benchmark</H1>
+<H3>Version 0.1.2</H3>
 <hr>
 <A HREF="index.html">Home</A> - <A href="coreworkloads.html">Core workloads</A> - <a href="tipsfaq.html">Tips and FAQ</A>
 <HR>
diff --git a/doc/javadoc/allclasses-frame.html b/doc/javadoc/allclasses-frame.html
index 01857b31ba11323b268e11b8f352db8470685caf..082b089272b0f7b5af864828df968b1f64e50096 100644
--- a/doc/javadoc/allclasses-frame.html
+++ b/doc/javadoc/allclasses-frame.html
@@ -2,11 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
 All Classes
 </TITLE>
 
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
@@ -22,11 +23,19 @@ All Classes
 <TR>
 <TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="com/yahoo/ycsb/BasicDB.html" title="class in com.yahoo.ycsb" target="classFrame">BasicDB</A>
 <BR>
+<A HREF="com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db" target="classFrame">CassandraClient5</A>
+<BR>
+<A HREF="com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db" target="classFrame">CassandraClient6</A>
+<BR>
+<A HREF="com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db" target="classFrame">CassandraClient7</A>
+<BR>
 <A HREF="com/yahoo/ycsb/Client.html" title="class in com.yahoo.ycsb" target="classFrame">Client</A>
 <BR>
+<A HREF="com/yahoo/ycsb/CommandLine.html" title="class in com.yahoo.ycsb" target="classFrame">CommandLine</A>
+<BR>
 <A HREF="com/yahoo/ycsb/workloads/CoreWorkload.html" title="class in com.yahoo.ycsb.workloads" target="classFrame">CoreWorkload</A>
 <BR>
-<A HREF="com/yahoo/ycsb/CounterGenerator.html" title="class in com.yahoo.ycsb" target="classFrame">CounterGenerator</A>
+<A HREF="com/yahoo/ycsb/generator/CounterGenerator.html" title="class in com.yahoo.ycsb.generator" target="classFrame">CounterGenerator</A>
 <BR>
 <A HREF="com/yahoo/ycsb/DB.html" title="class in com.yahoo.ycsb" target="classFrame">DB</A>
 <BR>
@@ -36,27 +45,31 @@ All Classes
 <BR>
 <A HREF="com/yahoo/ycsb/DBWrapper.html" title="class in com.yahoo.ycsb" target="classFrame">DBWrapper</A>
 <BR>
-<A HREF="com/yahoo/ycsb/DiscreteGenerator.html" title="class in com.yahoo.ycsb" target="classFrame">DiscreteGenerator</A>
+<A HREF="com/yahoo/ycsb/generator/DiscreteGenerator.html" title="class in com.yahoo.ycsb.generator" target="classFrame">DiscreteGenerator</A>
+<BR>
+<A HREF="com/yahoo/ycsb/generator/Generator.html" title="class in com.yahoo.ycsb.generator" target="classFrame">Generator</A>
+<BR>
+<A HREF="com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db" target="classFrame">HBaseClient</A>
 <BR>
-<A HREF="com/yahoo/ycsb/Generator.html" title="class in com.yahoo.ycsb" target="classFrame">Generator</A>
+<A HREF="com/yahoo/ycsb/generator/IntegerGenerator.html" title="class in com.yahoo.ycsb.generator" target="classFrame">IntegerGenerator</A>
 <BR>
-<A HREF="com/yahoo/ycsb/IntegerGenerator.html" title="class in com.yahoo.ycsb" target="classFrame">IntegerGenerator</A>
+<A HREF="com/yahoo/ycsb/measurements/Measurements.html" title="class in com.yahoo.ycsb.measurements" target="classFrame">Measurements</A>
 <BR>
-<A HREF="com/yahoo/ycsb/Measurements.html" title="class in com.yahoo.ycsb" target="classFrame">Measurements</A>
+<A HREF="com/yahoo/ycsb/db/MongoDbClient.html" title="class in com.yahoo.ycsb.db" target="classFrame">MongoDbClient</A>
 <BR>
-<A HREF="com/yahoo/ycsb/OneMeasurement.html" title="class in com.yahoo.ycsb" target="classFrame">OneMeasurement</A>
+<A HREF="com/yahoo/ycsb/measurements/OneMeasurement.html" title="class in com.yahoo.ycsb.measurements" target="classFrame">OneMeasurement</A>
 <BR>
-<A HREF="com/yahoo/ycsb/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb" target="classFrame">OneMeasurementHistogram</A>
+<A HREF="com/yahoo/ycsb/measurements/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb.measurements" target="classFrame">OneMeasurementHistogram</A>
 <BR>
-<A HREF="com/yahoo/ycsb/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb" target="classFrame">OneMeasurementTimeSeries</A>
+<A HREF="com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb.measurements" target="classFrame">OneMeasurementTimeSeries</A>
 <BR>
-<A HREF="com/yahoo/ycsb/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb" target="classFrame">ScrambledZipfianGenerator</A>
+<A HREF="com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb.generator" target="classFrame">ScrambledZipfianGenerator</A>
 <BR>
-<A HREF="com/yahoo/ycsb/SkewedLatestGenerator.html" title="class in com.yahoo.ycsb" target="classFrame">SkewedLatestGenerator</A>
+<A HREF="com/yahoo/ycsb/generator/SkewedLatestGenerator.html" title="class in com.yahoo.ycsb.generator" target="classFrame">SkewedLatestGenerator</A>
 <BR>
-<A HREF="com/yahoo/ycsb/UniformGenerator.html" title="class in com.yahoo.ycsb" target="classFrame">UniformGenerator</A>
+<A HREF="com/yahoo/ycsb/generator/UniformGenerator.html" title="class in com.yahoo.ycsb.generator" target="classFrame">UniformGenerator</A>
 <BR>
-<A HREF="com/yahoo/ycsb/UniformIntegerGenerator.html" title="class in com.yahoo.ycsb" target="classFrame">UniformIntegerGenerator</A>
+<A HREF="com/yahoo/ycsb/generator/UniformIntegerGenerator.html" title="class in com.yahoo.ycsb.generator" target="classFrame">UniformIntegerGenerator</A>
 <BR>
 <A HREF="com/yahoo/ycsb/UnknownDBException.html" title="class in com.yahoo.ycsb" target="classFrame">UnknownDBException</A>
 <BR>
@@ -66,7 +79,7 @@ All Classes
 <BR>
 <A HREF="com/yahoo/ycsb/WorkloadException.html" title="class in com.yahoo.ycsb" target="classFrame">WorkloadException</A>
 <BR>
-<A HREF="com/yahoo/ycsb/ZipfianGenerator.html" title="class in com.yahoo.ycsb" target="classFrame">ZipfianGenerator</A>
+<A HREF="com/yahoo/ycsb/generator/ZipfianGenerator.html" title="class in com.yahoo.ycsb.generator" target="classFrame">ZipfianGenerator</A>
 <BR>
 </FONT></TD>
 </TR>
diff --git a/doc/javadoc/allclasses-noframe.html b/doc/javadoc/allclasses-noframe.html
index e55dd312aed67b25cc7f926a7086d9ba6f9c1d80..3946613595a18929ad0590cc857c7c295e5fb5b9 100644
--- a/doc/javadoc/allclasses-noframe.html
+++ b/doc/javadoc/allclasses-noframe.html
@@ -2,11 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:26 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
 All Classes
 </TITLE>
 
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
@@ -22,11 +23,19 @@ All Classes
 <TR>
 <TD NOWRAP><FONT CLASS="FrameItemFont"><A HREF="com/yahoo/ycsb/BasicDB.html" title="class in com.yahoo.ycsb">BasicDB</A>
 <BR>
+<A HREF="com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A>
+<BR>
+<A HREF="com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A>
+<BR>
+<A HREF="com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A>
+<BR>
 <A HREF="com/yahoo/ycsb/Client.html" title="class in com.yahoo.ycsb">Client</A>
 <BR>
+<A HREF="com/yahoo/ycsb/CommandLine.html" title="class in com.yahoo.ycsb">CommandLine</A>
+<BR>
 <A HREF="com/yahoo/ycsb/workloads/CoreWorkload.html" title="class in com.yahoo.ycsb.workloads">CoreWorkload</A>
 <BR>
-<A HREF="com/yahoo/ycsb/CounterGenerator.html" title="class in com.yahoo.ycsb">CounterGenerator</A>
+<A HREF="com/yahoo/ycsb/generator/CounterGenerator.html" title="class in com.yahoo.ycsb.generator">CounterGenerator</A>
 <BR>
 <A HREF="com/yahoo/ycsb/DB.html" title="class in com.yahoo.ycsb">DB</A>
 <BR>
@@ -36,27 +45,31 @@ All Classes
 <BR>
 <A HREF="com/yahoo/ycsb/DBWrapper.html" title="class in com.yahoo.ycsb">DBWrapper</A>
 <BR>
-<A HREF="com/yahoo/ycsb/DiscreteGenerator.html" title="class in com.yahoo.ycsb">DiscreteGenerator</A>
+<A HREF="com/yahoo/ycsb/generator/DiscreteGenerator.html" title="class in com.yahoo.ycsb.generator">DiscreteGenerator</A>
+<BR>
+<A HREF="com/yahoo/ycsb/generator/Generator.html" title="class in com.yahoo.ycsb.generator">Generator</A>
+<BR>
+<A HREF="com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
 <BR>
-<A HREF="com/yahoo/ycsb/Generator.html" title="class in com.yahoo.ycsb">Generator</A>
+<A HREF="com/yahoo/ycsb/generator/IntegerGenerator.html" title="class in com.yahoo.ycsb.generator">IntegerGenerator</A>
 <BR>
-<A HREF="com/yahoo/ycsb/IntegerGenerator.html" title="class in com.yahoo.ycsb">IntegerGenerator</A>
+<A HREF="com/yahoo/ycsb/measurements/Measurements.html" title="class in com.yahoo.ycsb.measurements">Measurements</A>
 <BR>
-<A HREF="com/yahoo/ycsb/Measurements.html" title="class in com.yahoo.ycsb">Measurements</A>
+<A HREF="com/yahoo/ycsb/db/MongoDbClient.html" title="class in com.yahoo.ycsb.db">MongoDbClient</A>
 <BR>
-<A HREF="com/yahoo/ycsb/OneMeasurement.html" title="class in com.yahoo.ycsb">OneMeasurement</A>
+<A HREF="com/yahoo/ycsb/measurements/OneMeasurement.html" title="class in com.yahoo.ycsb.measurements">OneMeasurement</A>
 <BR>
-<A HREF="com/yahoo/ycsb/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb">OneMeasurementHistogram</A>
+<A HREF="com/yahoo/ycsb/measurements/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb.measurements">OneMeasurementHistogram</A>
 <BR>
-<A HREF="com/yahoo/ycsb/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb">OneMeasurementTimeSeries</A>
+<A HREF="com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb.measurements">OneMeasurementTimeSeries</A>
 <BR>
-<A HREF="com/yahoo/ycsb/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb">ScrambledZipfianGenerator</A>
+<A HREF="com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ScrambledZipfianGenerator</A>
 <BR>
-<A HREF="com/yahoo/ycsb/SkewedLatestGenerator.html" title="class in com.yahoo.ycsb">SkewedLatestGenerator</A>
+<A HREF="com/yahoo/ycsb/generator/SkewedLatestGenerator.html" title="class in com.yahoo.ycsb.generator">SkewedLatestGenerator</A>
 <BR>
-<A HREF="com/yahoo/ycsb/UniformGenerator.html" title="class in com.yahoo.ycsb">UniformGenerator</A>
+<A HREF="com/yahoo/ycsb/generator/UniformGenerator.html" title="class in com.yahoo.ycsb.generator">UniformGenerator</A>
 <BR>
-<A HREF="com/yahoo/ycsb/UniformIntegerGenerator.html" title="class in com.yahoo.ycsb">UniformIntegerGenerator</A>
+<A HREF="com/yahoo/ycsb/generator/UniformIntegerGenerator.html" title="class in com.yahoo.ycsb.generator">UniformIntegerGenerator</A>
 <BR>
 <A HREF="com/yahoo/ycsb/UnknownDBException.html" title="class in com.yahoo.ycsb">UnknownDBException</A>
 <BR>
@@ -66,7 +79,7 @@ All Classes
 <BR>
 <A HREF="com/yahoo/ycsb/WorkloadException.html" title="class in com.yahoo.ycsb">WorkloadException</A>
 <BR>
-<A HREF="com/yahoo/ycsb/ZipfianGenerator.html" title="class in com.yahoo.ycsb">ZipfianGenerator</A>
+<A HREF="com/yahoo/ycsb/generator/ZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ZipfianGenerator</A>
 <BR>
 </FONT></TD>
 </TR>
diff --git a/doc/javadoc/com/yahoo/ycsb/BasicDB.html b/doc/javadoc/com/yahoo/ycsb/BasicDB.html
index 0c97400030da6a90a721248dcea268a2fe645455..2d27db6ff1e704b4989112408c689b630b256b8f 100644
--- a/doc/javadoc/com/yahoo/ycsb/BasicDB.html
+++ b/doc/javadoc/com/yahoo/ycsb/BasicDB.html
@@ -2,19 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:52 PDT 2010 -->
 <TITLE>
 BasicDB
 </TITLE>
 
-<META NAME="keywords" CONTENT="com.yahoo.ycsb.BasicDB class">
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="BasicDB";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="BasicDB";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -23,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
diff --git a/doc/javadoc/com/yahoo/ycsb/Client.html b/doc/javadoc/com/yahoo/ycsb/Client.html
index 3bd51283e4191e34a9c479c2fe0349182b149933..4855a52c66a37afa64c7d5c7480af26efd1c1b35 100644
--- a/doc/javadoc/com/yahoo/ycsb/Client.html
+++ b/doc/javadoc/com/yahoo/ycsb/Client.html
@@ -2,19 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:52 PDT 2010 -->
 <TITLE>
 Client
 </TITLE>
 
-<META NAME="keywords" CONTENT="com.yahoo.ycsb.Client class">
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="Client";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Client";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -23,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
@@ -52,7 +55,7 @@ function windowTitle()
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../com/yahoo/ycsb/BasicDB.html" title="class in com.yahoo.ycsb"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/yahoo/ycsb/CounterGenerator.html" title="class in com.yahoo.ycsb"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../com/yahoo/ycsb/CommandLine.html" title="class in com.yahoo.ycsb"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/yahoo/ycsb/Client.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="Client.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
@@ -349,7 +352,7 @@ public static void <B>main</B>(java.lang.String[]&nbsp;args)</PRE>
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../com/yahoo/ycsb/BasicDB.html" title="class in com.yahoo.ycsb"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/yahoo/ycsb/CounterGenerator.html" title="class in com.yahoo.ycsb"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../com/yahoo/ycsb/CommandLine.html" title="class in com.yahoo.ycsb"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/yahoo/ycsb/Client.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="Client.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
diff --git a/doc/javadoc/com/yahoo/ycsb/DB.html b/doc/javadoc/com/yahoo/ycsb/DB.html
index 4aa547fcdeb37f1cf01b4a3876be400d568fc5bc..199b464fc75b792c8c996382e419ca7ddd135b35 100644
--- a/doc/javadoc/com/yahoo/ycsb/DB.html
+++ b/doc/javadoc/com/yahoo/ycsb/DB.html
@@ -2,19 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:52 PDT 2010 -->
 <TITLE>
 DB
 </TITLE>
 
-<META NAME="keywords" CONTENT="com.yahoo.ycsb.DB class">
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="DB";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="DB";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -23,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
@@ -51,7 +54,7 @@ function windowTitle()
 
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/yahoo/ycsb/CounterGenerator.html" title="class in com.yahoo.ycsb"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../com/yahoo/ycsb/CommandLine.html" title="class in com.yahoo.ycsb"><B>PREV CLASS</B></A>&nbsp;
 &nbsp;<A HREF="../../../com/yahoo/ycsb/DBException.html" title="class in com.yahoo.ycsb"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/yahoo/ycsb/DB.html" target="_top"><B>FRAMES</B></A>  &nbsp;
@@ -92,7 +95,7 @@ java.lang.Object
   <IMG SRC="../../../resources/inherit.gif" ALT="extended by "><B>com.yahoo.ycsb.DB</B>
 </PRE>
 <DL>
-<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../com/yahoo/ycsb/BasicDB.html" title="class in com.yahoo.ycsb">BasicDB</A>, <A HREF="../../../com/yahoo/ycsb/DBWrapper.html" title="class in com.yahoo.ycsb">DBWrapper</A></DD>
+<DT><B>Direct Known Subclasses:</B> <DD><A HREF="../../../com/yahoo/ycsb/BasicDB.html" title="class in com.yahoo.ycsb">BasicDB</A>, <A HREF="../../../com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A>, <A HREF="../../../com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A>, <A HREF="../../../com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A>, <A HREF="../../../com/yahoo/ycsb/DBWrapper.html" title="class in com.yahoo.ycsb">DBWrapper</A>, <A HREF="../../../com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>, <A HREF="../../../com/yahoo/ycsb/db/MongoDbClient.html" title="class in com.yahoo.ycsb.db">MongoDbClient</A></DD>
 </DL>
 <HR>
 <DL>
@@ -105,6 +108,18 @@ A layer for accessing a database to be benchmarked. Each thread in the client
  This class should be constructed using a no-argument constructor, so we can
  load it dynamically. Any argument-based initialization should be
  done by init().
+ 
+ Note that YCSB does not make any use of the return codes returned by this class.
+ Instead, it keeps a count of the return values and presents them to the user.
+ 
+ The semantics of methods such as insert, update and delete vary from database
+ to database.  In particular, operations may or may not be durable once these
+ methods commit, and some systems may return 'success' regardless of whether
+ or not a tuple with a matching key existed before the call.  Rather than dictate
+ the exact semantics of these methods, we recommend you either implement them
+ to match the database's default semantics, or the semantics of your 
+ target application.  For the sake of comparison between experiments we also 
+ recommend you explain the semantics you chose when presenting performance results.
 <P>
 
 <P>
@@ -332,7 +347,7 @@ public abstract int <B>read</B>(java.lang.String&nbsp;table,
 <P>
 <DD><DL>
 <DT><B>Parameters:</B><DD><CODE>table</CODE> - The name of the table<DD><CODE>key</CODE> - The record key of the record to read.<DD><CODE>fields</CODE> - The list of fields to read, or null for all of them<DD><CODE>result</CODE> - A HashMap of field/value pairs for the result
-<DT><B>Returns:</B><DD>Zero on success, a non-zero error code on error</DL>
+<DT><B>Returns:</B><DD>Zero on success, a non-zero error code on error or "not found".</DL>
 </DD>
 </DL>
 <HR>
@@ -350,7 +365,7 @@ public abstract int <B>scan</B>(java.lang.String&nbsp;table,
 <P>
 <DD><DL>
 <DT><B>Parameters:</B><DD><CODE>table</CODE> - The name of the table<DD><CODE>startkey</CODE> - The record key of the first record to read.<DD><CODE>recordcount</CODE> - The number of records to read<DD><CODE>fields</CODE> - The list of fields to read, or null for all of them<DD><CODE>result</CODE> - A Vector of HashMaps, where each HashMap is a set field/value pairs for one record
-<DT><B>Returns:</B><DD>Zero on success, a non-zero error code on error</DL>
+<DT><B>Returns:</B><DD>Zero on success, a non-zero error code on error.  See this class's description for a discussion of error codes.</DL>
 </DD>
 </DL>
 <HR>
@@ -367,7 +382,7 @@ public abstract int <B>update</B>(java.lang.String&nbsp;table,
 <P>
 <DD><DL>
 <DT><B>Parameters:</B><DD><CODE>table</CODE> - The name of the table<DD><CODE>key</CODE> - The record key of the record to write.<DD><CODE>values</CODE> - A HashMap of field/value pairs to update in the record
-<DT><B>Returns:</B><DD>Zero on success, a non-zero error code on error</DL>
+<DT><B>Returns:</B><DD>Zero on success, a non-zero error code on error.  See this class's description for a discussion of error codes.</DL>
 </DD>
 </DL>
 <HR>
@@ -384,7 +399,7 @@ public abstract int <B>insert</B>(java.lang.String&nbsp;table,
 <P>
 <DD><DL>
 <DT><B>Parameters:</B><DD><CODE>table</CODE> - The name of the table<DD><CODE>key</CODE> - The record key of the record to insert.<DD><CODE>values</CODE> - A HashMap of field/value pairs to insert in the record
-<DT><B>Returns:</B><DD>Zero on success, a non-zero error code on error</DL>
+<DT><B>Returns:</B><DD>Zero on success, a non-zero error code on error.  See this class's description for a discussion of error codes.</DL>
 </DD>
 </DL>
 <HR>
@@ -399,7 +414,7 @@ public abstract int <B>delete</B>(java.lang.String&nbsp;table,
 <P>
 <DD><DL>
 <DT><B>Parameters:</B><DD><CODE>table</CODE> - The name of the table<DD><CODE>key</CODE> - The record key of the record to delete.
-<DT><B>Returns:</B><DD>Zero on success, a non-zero error code on error</DL>
+<DT><B>Returns:</B><DD>Zero on success, a non-zero error code on error.  See this class's description for a discussion of error codes.</DL>
 </DD>
 </DL>
 <!-- ========= END OF CLASS DATA ========= -->
@@ -432,7 +447,7 @@ public abstract int <B>delete</B>(java.lang.String&nbsp;table,
 
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/yahoo/ycsb/CounterGenerator.html" title="class in com.yahoo.ycsb"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../com/yahoo/ycsb/CommandLine.html" title="class in com.yahoo.ycsb"><B>PREV CLASS</B></A>&nbsp;
 &nbsp;<A HREF="../../../com/yahoo/ycsb/DBException.html" title="class in com.yahoo.ycsb"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/yahoo/ycsb/DB.html" target="_top"><B>FRAMES</B></A>  &nbsp;
diff --git a/doc/javadoc/com/yahoo/ycsb/DBException.html b/doc/javadoc/com/yahoo/ycsb/DBException.html
index 537aa30c7763cb4390a9bfb80c2abc83c7f4bd44..72e533856ab42b4047553d3bdca26a15588ef329 100644
--- a/doc/javadoc/com/yahoo/ycsb/DBException.html
+++ b/doc/javadoc/com/yahoo/ycsb/DBException.html
@@ -2,19 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:52 PDT 2010 -->
 <TITLE>
 DBException
 </TITLE>
 
-<META NAME="keywords" CONTENT="com.yahoo.ycsb.DBException class">
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="DBException";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="DBException";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -23,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
diff --git a/doc/javadoc/com/yahoo/ycsb/DBFactory.html b/doc/javadoc/com/yahoo/ycsb/DBFactory.html
index 9b321ea74730e59ce5315f6d910240f8449c2c1f..6c54102f13970f5b725e7f6c35e26e8f1778d573 100644
--- a/doc/javadoc/com/yahoo/ycsb/DBFactory.html
+++ b/doc/javadoc/com/yahoo/ycsb/DBFactory.html
@@ -2,19 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:52 PDT 2010 -->
 <TITLE>
 DBFactory
 </TITLE>
 
-<META NAME="keywords" CONTENT="com.yahoo.ycsb.DBFactory class">
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="DBFactory";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="DBFactory";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -23,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
diff --git a/doc/javadoc/com/yahoo/ycsb/DBWrapper.html b/doc/javadoc/com/yahoo/ycsb/DBWrapper.html
index c51ad7dc7615576c3d9acf05459f520549fa4d9c..168c837d9961ec598720b527a5c020913f14edcb 100644
--- a/doc/javadoc/com/yahoo/ycsb/DBWrapper.html
+++ b/doc/javadoc/com/yahoo/ycsb/DBWrapper.html
@@ -2,19 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:52 PDT 2010 -->
 <TITLE>
 DBWrapper
 </TITLE>
 
-<META NAME="keywords" CONTENT="com.yahoo.ycsb.DBWrapper class">
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="DBWrapper";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="DBWrapper";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -23,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
@@ -52,7 +55,7 @@ function windowTitle()
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../com/yahoo/ycsb/DBFactory.html" title="class in com.yahoo.ycsb"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/yahoo/ycsb/DiscreteGenerator.html" title="class in com.yahoo.ycsb"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../com/yahoo/ycsb/UnknownDBException.html" title="class in com.yahoo.ycsb"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/yahoo/ycsb/DBWrapper.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="DBWrapper.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
@@ -454,7 +457,7 @@ public int <B>delete</B>(java.lang.String&nbsp;table,
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../com/yahoo/ycsb/DBFactory.html" title="class in com.yahoo.ycsb"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/yahoo/ycsb/DiscreteGenerator.html" title="class in com.yahoo.ycsb"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;<A HREF="../../../com/yahoo/ycsb/UnknownDBException.html" title="class in com.yahoo.ycsb"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/yahoo/ycsb/DBWrapper.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="DBWrapper.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
diff --git a/doc/javadoc/com/yahoo/ycsb/UnknownDBException.html b/doc/javadoc/com/yahoo/ycsb/UnknownDBException.html
index 104e1254a4a9a4d6a1a18f7245492bec10b8338a..3869cac1c31d871d4cf9eeb13b758f771df5f49e 100644
--- a/doc/javadoc/com/yahoo/ycsb/UnknownDBException.html
+++ b/doc/javadoc/com/yahoo/ycsb/UnknownDBException.html
@@ -2,19 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:52 PDT 2010 -->
 <TITLE>
 UnknownDBException
 </TITLE>
 
-<META NAME="keywords" CONTENT="com.yahoo.ycsb.UnknownDBException class">
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="UnknownDBException";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="UnknownDBException";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -23,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
@@ -51,7 +54,7 @@ function windowTitle()
 
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/yahoo/ycsb/UniformIntegerGenerator.html" title="class in com.yahoo.ycsb"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../com/yahoo/ycsb/DBWrapper.html" title="class in com.yahoo.ycsb"><B>PREV CLASS</B></A>&nbsp;
 &nbsp;<A HREF="../../../com/yahoo/ycsb/Utils.html" title="class in com.yahoo.ycsb"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/yahoo/ycsb/UnknownDBException.html" target="_top"><B>FRAMES</B></A>  &nbsp;
@@ -248,7 +251,7 @@ public <B>UnknownDBException</B>(java.lang.Throwable&nbsp;cause)</PRE>
 
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../com/yahoo/ycsb/UniformIntegerGenerator.html" title="class in com.yahoo.ycsb"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../com/yahoo/ycsb/DBWrapper.html" title="class in com.yahoo.ycsb"><B>PREV CLASS</B></A>&nbsp;
 &nbsp;<A HREF="../../../com/yahoo/ycsb/Utils.html" title="class in com.yahoo.ycsb"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/yahoo/ycsb/UnknownDBException.html" target="_top"><B>FRAMES</B></A>  &nbsp;
diff --git a/doc/javadoc/com/yahoo/ycsb/Utils.html b/doc/javadoc/com/yahoo/ycsb/Utils.html
index 09ce7c7e78d08996425adadbf0da2216626d0753..42d5689864da6d9c27fcee15ac45ba0202543777 100644
--- a/doc/javadoc/com/yahoo/ycsb/Utils.html
+++ b/doc/javadoc/com/yahoo/ycsb/Utils.html
@@ -2,19 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:52 PDT 2010 -->
 <TITLE>
 Utils
 </TITLE>
 
-<META NAME="keywords" CONTENT="com.yahoo.ycsb.Utils class">
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="Utils";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Utils";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -23,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
diff --git a/doc/javadoc/com/yahoo/ycsb/Workload.html b/doc/javadoc/com/yahoo/ycsb/Workload.html
index 826114c394a849cd049cd206055cfd1fdbaa9f60..86547bc4351085dedb934be0d813ee5dd7f7ca8f 100644
--- a/doc/javadoc/com/yahoo/ycsb/Workload.html
+++ b/doc/javadoc/com/yahoo/ycsb/Workload.html
@@ -2,19 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:52 PDT 2010 -->
 <TITLE>
 Workload
 </TITLE>
 
-<META NAME="keywords" CONTENT="com.yahoo.ycsb.Workload class">
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="Workload";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Workload";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -23,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
diff --git a/doc/javadoc/com/yahoo/ycsb/WorkloadException.html b/doc/javadoc/com/yahoo/ycsb/WorkloadException.html
index 6f087e98dd349d6449ed6f8e6ffe50048c9a93db..95b75dc5f80c4e2dda0adb01b636ce401de52123 100644
--- a/doc/javadoc/com/yahoo/ycsb/WorkloadException.html
+++ b/doc/javadoc/com/yahoo/ycsb/WorkloadException.html
@@ -2,19 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:52 PDT 2010 -->
 <TITLE>
 WorkloadException
 </TITLE>
 
-<META NAME="keywords" CONTENT="com.yahoo.ycsb.WorkloadException class">
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="WorkloadException";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="WorkloadException";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -23,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
@@ -52,7 +55,7 @@ function windowTitle()
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../com/yahoo/ycsb/Workload.html" title="class in com.yahoo.ycsb"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/yahoo/ycsb/ZipfianGenerator.html" title="class in com.yahoo.ycsb"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;NEXT CLASS</FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/yahoo/ycsb/WorkloadException.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="WorkloadException.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
@@ -249,7 +252,7 @@ public <B>WorkloadException</B>(java.lang.Throwable&nbsp;cause)</PRE>
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../com/yahoo/ycsb/Workload.html" title="class in com.yahoo.ycsb"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;<A HREF="../../../com/yahoo/ycsb/ZipfianGenerator.html" title="class in com.yahoo.ycsb"><B>NEXT CLASS</B></A></FONT></TD>
+&nbsp;NEXT CLASS</FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/yahoo/ycsb/WorkloadException.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="WorkloadException.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
diff --git a/doc/javadoc/com/yahoo/ycsb/db/HBaseClient.html b/doc/javadoc/com/yahoo/ycsb/db/HBaseClient.html
index 7d04af3f1828cf0ecd0f85ed5cdd7ae59cb5e982..3b20459188c843245b42683fe6e9ffc76249c549 100644
--- a/doc/javadoc/com/yahoo/ycsb/db/HBaseClient.html
+++ b/doc/javadoc/com/yahoo/ycsb/db/HBaseClient.html
@@ -2,19 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:46:54 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
 HBaseClient
 </TITLE>
 
-<META NAME="keywords" CONTENT="com.yahoo.ycsb.db.HBaseClient class">
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="HBaseClient";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="HBaseClient";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -23,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
@@ -51,8 +54,8 @@ function windowTitle()
 
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/yahoo/ycsb/db/CassandraClient.html" title="class in com.yahoo.ycsb.db"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
+&nbsp;<A HREF="../../../../com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../../com/yahoo/ycsb/db/MongoDbClient.html" title="class in com.yahoo.ycsb.db"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../../index.html?com/yahoo/ycsb/db/HBaseClient.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="HBaseClient.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
@@ -97,6 +100,10 @@ java.lang.Object
 <DT><PRE>public class <B>HBaseClient</B><DT>extends <A HREF="../../../../com/yahoo/ycsb/DB.html" title="class in com.yahoo.ycsb">DB</A></DL>
 </PRE>
 
+<P>
+HBase client for YCSB framework
+<P>
+
 <P>
 <HR>
 
@@ -114,6 +121,14 @@ java.lang.Object
 <CODE>&nbsp;java.lang.String</CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../../com/yahoo/ycsb/db/HBaseClient.html#_columnFamily">_columnFamily</A></B></CODE>
 
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;byte[]</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../com/yahoo/ycsb/db/HBaseClient.html#_columnFamilyBytes">_columnFamilyBytes</A></B></CODE>
+
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
 </TR>
@@ -363,6 +378,16 @@ public java.lang.String <B>_columnFamily</B></PRE>
 </DL>
 <HR>
 
+<A NAME="_columnFamilyBytes"><!-- --></A><H3>
+_columnFamilyBytes</H3>
+<PRE>
+public byte[] <B>_columnFamilyBytes</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
+<HR>
+
 <A NAME="Ok"><!-- --></A><H3>
 Ok</H3>
 <PRE>
@@ -631,8 +656,8 @@ public static void <B>main</B>(java.lang.String[]&nbsp;args)</PRE>
 
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/yahoo/ycsb/db/CassandraClient.html" title="class in com.yahoo.ycsb.db"><B>PREV CLASS</B></A>&nbsp;
-&nbsp;NEXT CLASS</FONT></TD>
+&nbsp;<A HREF="../../../../com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db"><B>PREV CLASS</B></A>&nbsp;
+&nbsp;<A HREF="../../../../com/yahoo/ycsb/db/MongoDbClient.html" title="class in com.yahoo.ycsb.db"><B>NEXT CLASS</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../../index.html?com/yahoo/ycsb/db/HBaseClient.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="HBaseClient.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
diff --git a/doc/javadoc/com/yahoo/ycsb/db/package-frame.html b/doc/javadoc/com/yahoo/ycsb/db/package-frame.html
index 6e58a48ff169e74b580e9ebd89eeaf2b95d004b0..d6d9b3e3557828338669fad1646b6a6075c253f4 100644
--- a/doc/javadoc/com/yahoo/ycsb/db/package-frame.html
+++ b/doc/javadoc/com/yahoo/ycsb/db/package-frame.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:46:55 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
 com.yahoo.ycsb.db
 </TITLE>
 
-<META NAME="keywords" CONTENT="com.yahoo.ycsb.db package">
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
 
@@ -23,9 +23,15 @@ com.yahoo.ycsb.db
 Classes</FONT>&nbsp;
 <FONT CLASS="FrameItemFont">
 <BR>
-<A HREF="CassandraClient.html" title="class in com.yahoo.ycsb.db" target="classFrame">CassandraClient</A>
+<A HREF="CassandraClient5.html" title="class in com.yahoo.ycsb.db" target="classFrame">CassandraClient5</A>
 <BR>
-<A HREF="HBaseClient.html" title="class in com.yahoo.ycsb.db" target="classFrame">HBaseClient</A></FONT></TD>
+<A HREF="CassandraClient6.html" title="class in com.yahoo.ycsb.db" target="classFrame">CassandraClient6</A>
+<BR>
+<A HREF="CassandraClient7.html" title="class in com.yahoo.ycsb.db" target="classFrame">CassandraClient7</A>
+<BR>
+<A HREF="HBaseClient.html" title="class in com.yahoo.ycsb.db" target="classFrame">HBaseClient</A>
+<BR>
+<A HREF="MongoDbClient.html" title="class in com.yahoo.ycsb.db" target="classFrame">MongoDbClient</A></FONT></TD>
 </TR>
 </TABLE>
 
diff --git a/doc/javadoc/com/yahoo/ycsb/db/package-summary.html b/doc/javadoc/com/yahoo/ycsb/db/package-summary.html
index 5d768598a0eeb5632ba2fea55862669068e07bca..5138c2f9b5fc0a93d825ba64ffad3fb6617a1ce4 100644
--- a/doc/javadoc/com/yahoo/ycsb/db/package-summary.html
+++ b/doc/javadoc/com/yahoo/ycsb/db/package-summary.html
@@ -2,19 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:46:55 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
 com.yahoo.ycsb.db
 </TITLE>
 
-<META NAME="keywords" CONTENT="com.yahoo.ycsb.db package">
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="com.yahoo.ycsb.db";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="com.yahoo.ycsb.db";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -23,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
@@ -52,7 +55,7 @@ function windowTitle()
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../../com/yahoo/ycsb/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/yahoo/ycsb/workloads/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
+&nbsp;<A HREF="../../../../com/yahoo/ycsb/generator/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../../index.html?com/yahoo/ycsb/db/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
@@ -85,12 +88,24 @@ Package com.yahoo.ycsb.db
 <B>Class Summary</B></FONT></TH>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../../com/yahoo/ycsb/db/CassandraClient.html" title="class in com.yahoo.ycsb.db">CassandraClient</A></B></TD>
-<TD>XXXX if we do replication, fix the consistency levels</TD>
+<TD WIDTH="15%"><B><A HREF="../../../../com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A></B></TD>
+<TD>Cassandra 0.5 client for YCSB framework</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../../com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A></B></TD>
+<TD>Cassandra 0.6 client for YCSB framework</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../../com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A></B></TD>
+<TD>Cassandra 0.7 client for YCSB framework</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD WIDTH="15%"><B><A HREF="../../../../com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>HBase client for YCSB framework</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="15%"><B><A HREF="../../../../com/yahoo/ycsb/db/MongoDbClient.html" title="class in com.yahoo.ycsb.db">MongoDbClient</A></B></TD>
+<TD>MongoDB client for YCSB framework.</TD>
 </TR>
 </TABLE>
 &nbsp;
@@ -128,7 +143,7 @@ Package com.yahoo.ycsb.db
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../../com/yahoo/ycsb/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/yahoo/ycsb/workloads/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
+&nbsp;<A HREF="../../../../com/yahoo/ycsb/generator/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../../index.html?com/yahoo/ycsb/db/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
diff --git a/doc/javadoc/com/yahoo/ycsb/db/package-tree.html b/doc/javadoc/com/yahoo/ycsb/db/package-tree.html
index baa74a7ec6b3eab13a6042a6f0090240709e737c..a20a816aa2b54532aef03ba22f727cf38df79b3e 100644
--- a/doc/javadoc/com/yahoo/ycsb/db/package-tree.html
+++ b/doc/javadoc/com/yahoo/ycsb/db/package-tree.html
@@ -2,18 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Mon Apr 19 13:46:55 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
 com.yahoo.ycsb.db Class Hierarchy
 </TITLE>
 
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="com.yahoo.ycsb.db Class Hierarchy";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="com.yahoo.ycsb.db Class Hierarchy";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -22,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
@@ -51,7 +55,7 @@ function windowTitle()
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../../com/yahoo/ycsb/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/yahoo/ycsb/workloads/package-tree.html"><B>NEXT</B></A></FONT></TD>
+&nbsp;<A HREF="../../../../com/yahoo/ycsb/generator/package-tree.html"><B>NEXT</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../../index.html?com/yahoo/ycsb/db/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
@@ -88,7 +92,7 @@ Class Hierarchy
 <UL>
 <LI TYPE="circle">java.lang.Object<UL>
 <LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../../com/yahoo/ycsb/DB.html" title="class in com.yahoo.ycsb"><B>DB</B></A><UL>
-<LI TYPE="circle">com.yahoo.ycsb.db.<A HREF="../../../../com/yahoo/ycsb/db/CassandraClient.html" title="class in com.yahoo.ycsb.db"><B>CassandraClient</B></A><LI TYPE="circle">com.yahoo.ycsb.db.<A HREF="../../../../com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db"><B>HBaseClient</B></A></UL>
+<LI TYPE="circle">com.yahoo.ycsb.db.<A HREF="../../../../com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db"><B>CassandraClient5</B></A><LI TYPE="circle">com.yahoo.ycsb.db.<A HREF="../../../../com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db"><B>CassandraClient6</B></A><LI TYPE="circle">com.yahoo.ycsb.db.<A HREF="../../../../com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db"><B>CassandraClient7</B></A><LI TYPE="circle">com.yahoo.ycsb.db.<A HREF="../../../../com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db"><B>HBaseClient</B></A><LI TYPE="circle">com.yahoo.ycsb.db.<A HREF="../../../../com/yahoo/ycsb/db/MongoDbClient.html" title="class in com.yahoo.ycsb.db"><B>MongoDbClient</B></A></UL>
 </UL>
 </UL>
 <HR>
@@ -121,7 +125,7 @@ Class Hierarchy
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;<A HREF="../../../../com/yahoo/ycsb/package-tree.html"><B>PREV</B></A>&nbsp;
-&nbsp;<A HREF="../../../../com/yahoo/ycsb/workloads/package-tree.html"><B>NEXT</B></A></FONT></TD>
+&nbsp;<A HREF="../../../../com/yahoo/ycsb/generator/package-tree.html"><B>NEXT</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../../index.html?com/yahoo/ycsb/db/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
diff --git a/doc/javadoc/com/yahoo/ycsb/package-frame.html b/doc/javadoc/com/yahoo/ycsb/package-frame.html
index a45074cd2b29fa08513cb700ab7f3c62f306705a..9281ed9b5b73f164158d2b5f44b3ce076abdf378 100644
--- a/doc/javadoc/com/yahoo/ycsb/package-frame.html
+++ b/doc/javadoc/com/yahoo/ycsb/package-frame.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
 com.yahoo.ycsb
 </TITLE>
 
-<META NAME="keywords" CONTENT="com.yahoo.ycsb package">
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
@@ -27,7 +27,7 @@ Classes</FONT>&nbsp;
 <BR>
 <A HREF="Client.html" title="class in com.yahoo.ycsb" target="classFrame">Client</A>
 <BR>
-<A HREF="CounterGenerator.html" title="class in com.yahoo.ycsb" target="classFrame">CounterGenerator</A>
+<A HREF="CommandLine.html" title="class in com.yahoo.ycsb" target="classFrame">CommandLine</A>
 <BR>
 <A HREF="DB.html" title="class in com.yahoo.ycsb" target="classFrame">DB</A>
 <BR>
@@ -35,33 +35,9 @@ Classes</FONT>&nbsp;
 <BR>
 <A HREF="DBWrapper.html" title="class in com.yahoo.ycsb" target="classFrame">DBWrapper</A>
 <BR>
-<A HREF="DiscreteGenerator.html" title="class in com.yahoo.ycsb" target="classFrame">DiscreteGenerator</A>
-<BR>
-<A HREF="Generator.html" title="class in com.yahoo.ycsb" target="classFrame">Generator</A>
-<BR>
-<A HREF="IntegerGenerator.html" title="class in com.yahoo.ycsb" target="classFrame">IntegerGenerator</A>
-<BR>
-<A HREF="Measurements.html" title="class in com.yahoo.ycsb" target="classFrame">Measurements</A>
-<BR>
-<A HREF="OneMeasurement.html" title="class in com.yahoo.ycsb" target="classFrame">OneMeasurement</A>
-<BR>
-<A HREF="OneMeasurementHistogram.html" title="class in com.yahoo.ycsb" target="classFrame">OneMeasurementHistogram</A>
-<BR>
-<A HREF="OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb" target="classFrame">OneMeasurementTimeSeries</A>
-<BR>
-<A HREF="ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb" target="classFrame">ScrambledZipfianGenerator</A>
-<BR>
-<A HREF="SkewedLatestGenerator.html" title="class in com.yahoo.ycsb" target="classFrame">SkewedLatestGenerator</A>
-<BR>
-<A HREF="UniformGenerator.html" title="class in com.yahoo.ycsb" target="classFrame">UniformGenerator</A>
-<BR>
-<A HREF="UniformIntegerGenerator.html" title="class in com.yahoo.ycsb" target="classFrame">UniformIntegerGenerator</A>
-<BR>
 <A HREF="Utils.html" title="class in com.yahoo.ycsb" target="classFrame">Utils</A>
 <BR>
-<A HREF="Workload.html" title="class in com.yahoo.ycsb" target="classFrame">Workload</A>
-<BR>
-<A HREF="ZipfianGenerator.html" title="class in com.yahoo.ycsb" target="classFrame">ZipfianGenerator</A></FONT></TD>
+<A HREF="Workload.html" title="class in com.yahoo.ycsb" target="classFrame">Workload</A></FONT></TD>
 </TR>
 </TABLE>
 
diff --git a/doc/javadoc/com/yahoo/ycsb/package-summary.html b/doc/javadoc/com/yahoo/ycsb/package-summary.html
index 8bda454cc1100cc99a55bc6ae9147d24f24a56d9..82439c75b558e6a319b4d2b2d72f921d2afd1136 100644
--- a/doc/javadoc/com/yahoo/ycsb/package-summary.html
+++ b/doc/javadoc/com/yahoo/ycsb/package-summary.html
@@ -2,19 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
 com.yahoo.ycsb
 </TITLE>
 
-<META NAME="keywords" CONTENT="com.yahoo.ycsb package">
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="com.yahoo.ycsb";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="com.yahoo.ycsb";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -23,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
@@ -52,7 +55,7 @@ function windowTitle()
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;PREV PACKAGE&nbsp;
-&nbsp;<A HREF="../../../com/yahoo/ycsb/workloads/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
+&nbsp;<A HREF="../../../com/yahoo/ycsb/db/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/yahoo/ycsb/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
@@ -93,8 +96,8 @@ Package com.yahoo.ycsb
 <TD>Main class for executing YCSB.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/yahoo/ycsb/CounterGenerator.html" title="class in com.yahoo.ycsb">CounterGenerator</A></B></TD>
-<TD>Generates a sequence of integers 0, 1, ...</TD>
+<TD WIDTH="15%"><B><A HREF="../../../com/yahoo/ycsb/CommandLine.html" title="class in com.yahoo.ycsb">CommandLine</A></B></TD>
+<TD>A simple command line client to a database, using the appropriate com.yahoo.ycsb.DB implementation.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD WIDTH="15%"><B><A HREF="../../../com/yahoo/ycsb/DB.html" title="class in com.yahoo.ycsb">DB</A></B></TD>
@@ -109,50 +112,6 @@ Package com.yahoo.ycsb
 <TD>Wrapper around a "real" DB that measures latencies and counts return codes.</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/yahoo/ycsb/DiscreteGenerator.html" title="class in com.yahoo.ycsb">DiscreteGenerator</A></B></TD>
-<TD>Generates a distribution by choosing from a discrete set of values.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/yahoo/ycsb/Generator.html" title="class in com.yahoo.ycsb">Generator</A></B></TD>
-<TD>An expression that generates a sequence of string values, following some distribution (Uniform, Zipfian, Sequential, etc.)</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/yahoo/ycsb/IntegerGenerator.html" title="class in com.yahoo.ycsb">IntegerGenerator</A></B></TD>
-<TD>A generator that is capable of generating ints as well as strings</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/yahoo/ycsb/Measurements.html" title="class in com.yahoo.ycsb">Measurements</A></B></TD>
-<TD>Collects latency measurements, and reports them when requested.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/yahoo/ycsb/OneMeasurement.html" title="class in com.yahoo.ycsb">OneMeasurement</A></B></TD>
-<TD>A single measured metric (e.g.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/yahoo/ycsb/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb">OneMeasurementHistogram</A></B></TD>
-<TD>Take measurements and maintain a histogram of a given metric, such as READ LATENCY.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/yahoo/ycsb/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb">OneMeasurementTimeSeries</A></B></TD>
-<TD>A time series measurement of a metric, such as READ LATENCY.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/yahoo/ycsb/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb">ScrambledZipfianGenerator</A></B></TD>
-<TD>A generator of a zipfian distribution.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/yahoo/ycsb/SkewedLatestGenerator.html" title="class in com.yahoo.ycsb">SkewedLatestGenerator</A></B></TD>
-<TD>Generate a popularity distribution of items, skewed to favor recent items significantly more than older items.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/yahoo/ycsb/UniformGenerator.html" title="class in com.yahoo.ycsb">UniformGenerator</A></B></TD>
-<TD>An expression that generates a random integer in the specified range</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/yahoo/ycsb/UniformIntegerGenerator.html" title="class in com.yahoo.ycsb">UniformIntegerGenerator</A></B></TD>
-<TD>Generates integers randomly uniform from an interval.</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
 <TD WIDTH="15%"><B><A HREF="../../../com/yahoo/ycsb/Utils.html" title="class in com.yahoo.ycsb">Utils</A></B></TD>
 <TD>Utility functions.</TD>
 </TR>
@@ -160,10 +119,6 @@ Package com.yahoo.ycsb
 <TD WIDTH="15%"><B><A HREF="../../../com/yahoo/ycsb/Workload.html" title="class in com.yahoo.ycsb">Workload</A></B></TD>
 <TD>One experiment scenario.</TD>
 </TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD WIDTH="15%"><B><A HREF="../../../com/yahoo/ycsb/ZipfianGenerator.html" title="class in com.yahoo.ycsb">ZipfianGenerator</A></B></TD>
-<TD>A generator of a zipfian distribution.</TD>
-</TR>
 </TABLE>
 &nbsp;
 
@@ -222,7 +177,7 @@ Package com.yahoo.ycsb
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;PREV PACKAGE&nbsp;
-&nbsp;<A HREF="../../../com/yahoo/ycsb/workloads/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
+&nbsp;<A HREF="../../../com/yahoo/ycsb/db/package-summary.html"><B>NEXT PACKAGE</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/yahoo/ycsb/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="package-summary.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
diff --git a/doc/javadoc/com/yahoo/ycsb/package-tree.html b/doc/javadoc/com/yahoo/ycsb/package-tree.html
index b35e8c64915d60846c7bcabe3f797c49cde98385..d62eac88c33bdc719b9011638d5a9aa8f380f42c 100644
--- a/doc/javadoc/com/yahoo/ycsb/package-tree.html
+++ b/doc/javadoc/com/yahoo/ycsb/package-tree.html
@@ -2,18 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
 com.yahoo.ycsb Class Hierarchy
 </TITLE>
 
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="com.yahoo.ycsb Class Hierarchy";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="com.yahoo.ycsb Class Hierarchy";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -22,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
@@ -51,7 +55,7 @@ function windowTitle()
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;PREV&nbsp;
-&nbsp;<A HREF="../../../com/yahoo/ycsb/workloads/package-tree.html"><B>NEXT</B></A></FONT></TD>
+&nbsp;<A HREF="../../../com/yahoo/ycsb/db/package-tree.html"><B>NEXT</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/yahoo/ycsb/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
@@ -87,15 +91,9 @@ Class Hierarchy
 </H2>
 <UL>
 <LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/Client.html" title="class in com.yahoo.ycsb"><B>Client</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/DB.html" title="class in com.yahoo.ycsb"><B>DB</B></A><UL>
+<LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/Client.html" title="class in com.yahoo.ycsb"><B>Client</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/CommandLine.html" title="class in com.yahoo.ycsb"><B>CommandLine</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/DB.html" title="class in com.yahoo.ycsb"><B>DB</B></A><UL>
 <LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/BasicDB.html" title="class in com.yahoo.ycsb"><B>BasicDB</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/DBWrapper.html" title="class in com.yahoo.ycsb"><B>DBWrapper</B></A></UL>
-<LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/DBFactory.html" title="class in com.yahoo.ycsb"><B>DBFactory</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/Generator.html" title="class in com.yahoo.ycsb"><B>Generator</B></A><UL>
-<LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/DiscreteGenerator.html" title="class in com.yahoo.ycsb"><B>DiscreteGenerator</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/IntegerGenerator.html" title="class in com.yahoo.ycsb"><B>IntegerGenerator</B></A><UL>
-<LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/CounterGenerator.html" title="class in com.yahoo.ycsb"><B>CounterGenerator</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb"><B>ScrambledZipfianGenerator</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/SkewedLatestGenerator.html" title="class in com.yahoo.ycsb"><B>SkewedLatestGenerator</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/UniformIntegerGenerator.html" title="class in com.yahoo.ycsb"><B>UniformIntegerGenerator</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/ZipfianGenerator.html" title="class in com.yahoo.ycsb"><B>ZipfianGenerator</B></A></UL>
-<LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/UniformGenerator.html" title="class in com.yahoo.ycsb"><B>UniformGenerator</B></A></UL>
-<LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/Measurements.html" title="class in com.yahoo.ycsb"><B>Measurements</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/OneMeasurement.html" title="class in com.yahoo.ycsb"><B>OneMeasurement</B></A><UL>
-<LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb"><B>OneMeasurementHistogram</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb"><B>OneMeasurementTimeSeries</B></A></UL>
-<LI TYPE="circle">java.lang.Throwable (implements java.io.Serializable)
+<LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/DBFactory.html" title="class in com.yahoo.ycsb"><B>DBFactory</B></A><LI TYPE="circle">java.lang.Throwable (implements java.io.Serializable)
 <UL>
 <LI TYPE="circle">java.lang.Exception<UL>
 <LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/DBException.html" title="class in com.yahoo.ycsb"><B>DBException</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/UnknownDBException.html" title="class in com.yahoo.ycsb"><B>UnknownDBException</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="../../../com/yahoo/ycsb/WorkloadException.html" title="class in com.yahoo.ycsb"><B>WorkloadException</B></A></UL>
@@ -132,7 +130,7 @@ Class Hierarchy
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
 &nbsp;PREV&nbsp;
-&nbsp;<A HREF="../../../com/yahoo/ycsb/workloads/package-tree.html"><B>NEXT</B></A></FONT></TD>
+&nbsp;<A HREF="../../../com/yahoo/ycsb/db/package-tree.html"><B>NEXT</B></A></FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../index.html?com/yahoo/ycsb/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
 &nbsp;<A HREF="package-tree.html" target="_top"><B>NO FRAMES</B></A>  &nbsp;
diff --git a/doc/javadoc/com/yahoo/ycsb/workloads/CoreWorkload.html b/doc/javadoc/com/yahoo/ycsb/workloads/CoreWorkload.html
index 5ea1c558e9aaa4055faf64028e9d51fb1449d8af..8c1f332fde5cce7b0f6089ad3deddb8e1a2cfd95 100644
--- a/doc/javadoc/com/yahoo/ycsb/workloads/CoreWorkload.html
+++ b/doc/javadoc/com/yahoo/ycsb/workloads/CoreWorkload.html
@@ -2,19 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
 CoreWorkload
 </TITLE>
 
-<META NAME="keywords" CONTENT="com.yahoo.ycsb.workloads.CoreWorkload class">
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="CoreWorkload";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="CoreWorkload";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -23,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
diff --git a/doc/javadoc/com/yahoo/ycsb/workloads/package-frame.html b/doc/javadoc/com/yahoo/ycsb/workloads/package-frame.html
index 070ade80b5df457a96920f91108d3f3648fdb2f1..8194082faddfd5613f2138c774f3fd875ba7f339 100644
--- a/doc/javadoc/com/yahoo/ycsb/workloads/package-frame.html
+++ b/doc/javadoc/com/yahoo/ycsb/workloads/package-frame.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
 com.yahoo.ycsb.workloads
 </TITLE>
 
-<META NAME="keywords" CONTENT="com.yahoo.ycsb.workloads package">
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
 
diff --git a/doc/javadoc/com/yahoo/ycsb/workloads/package-summary.html b/doc/javadoc/com/yahoo/ycsb/workloads/package-summary.html
index b792122b200c259ea49e8725ef7c6e2a5f4c03ee..798dd239ec6e5aa12528d703b5c6da5e7f290ebf 100644
--- a/doc/javadoc/com/yahoo/ycsb/workloads/package-summary.html
+++ b/doc/javadoc/com/yahoo/ycsb/workloads/package-summary.html
@@ -2,19 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
 com.yahoo.ycsb.workloads
 </TITLE>
 
-<META NAME="keywords" CONTENT="com.yahoo.ycsb.workloads package">
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="com.yahoo.ycsb.workloads";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="com.yahoo.ycsb.workloads";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -23,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
@@ -51,7 +54,7 @@ function windowTitle()
 
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/yahoo/ycsb/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
+&nbsp;<A HREF="../../../../com/yahoo/ycsb/measurements/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
 &nbsp;NEXT PACKAGE</FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../../index.html?com/yahoo/ycsb/workloads/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
@@ -123,7 +126,7 @@ Package com.yahoo.ycsb.workloads
 
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/yahoo/ycsb/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
+&nbsp;<A HREF="../../../../com/yahoo/ycsb/measurements/package-summary.html"><B>PREV PACKAGE</B></A>&nbsp;
 &nbsp;NEXT PACKAGE</FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../../index.html?com/yahoo/ycsb/workloads/package-summary.html" target="_top"><B>FRAMES</B></A>  &nbsp;
diff --git a/doc/javadoc/com/yahoo/ycsb/workloads/package-tree.html b/doc/javadoc/com/yahoo/ycsb/workloads/package-tree.html
index c3c0674093d9ff5b1c683145e9fa91a5b0a00f8f..d3abb3e6e59b4c2833cb43b72e5d9613cba0b367 100644
--- a/doc/javadoc/com/yahoo/ycsb/workloads/package-tree.html
+++ b/doc/javadoc/com/yahoo/ycsb/workloads/package-tree.html
@@ -2,18 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
 com.yahoo.ycsb.workloads Class Hierarchy
 </TITLE>
 
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="../../../../stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="com.yahoo.ycsb.workloads Class Hierarchy";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="com.yahoo.ycsb.workloads Class Hierarchy";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -22,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
@@ -50,7 +54,7 @@ function windowTitle()
 
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/yahoo/ycsb/package-tree.html"><B>PREV</B></A>&nbsp;
+&nbsp;<A HREF="../../../../com/yahoo/ycsb/measurements/package-tree.html"><B>PREV</B></A>&nbsp;
 &nbsp;NEXT</FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../../index.html?com/yahoo/ycsb/workloads/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
@@ -120,7 +124,7 @@ Class Hierarchy
 
 <TR>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
-&nbsp;<A HREF="../../../../com/yahoo/ycsb/package-tree.html"><B>PREV</B></A>&nbsp;
+&nbsp;<A HREF="../../../../com/yahoo/ycsb/measurements/package-tree.html"><B>PREV</B></A>&nbsp;
 &nbsp;NEXT</FONT></TD>
 <TD BGCOLOR="white" CLASS="NavBarCell2"><FONT SIZE="-2">
   <A HREF="../../../../index.html?com/yahoo/ycsb/workloads/package-tree.html" target="_top"><B>FRAMES</B></A>  &nbsp;
diff --git a/doc/javadoc/constant-values.html b/doc/javadoc/constant-values.html
index a6d861ef5abbd37f99a21b4f19cb87203bb692ec..b0ae776a778905b947e134a22b22a52a8863d84f 100644
--- a/doc/javadoc/constant-values.html
+++ b/doc/javadoc/constant-values.html
@@ -2,18 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
 Constant Field Values
 </TITLE>
 
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="Constant Field Values";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Constant Field Values";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -22,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
@@ -167,19 +171,73 @@ com.yahoo.*</FONT></TH>
 
 <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
 <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="3">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb">OneMeasurementHistogram</A></TH>
+<TH ALIGN="left" COLSPAN="3">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/CommandLine.html" title="class in com.yahoo.ycsb">CommandLine</A></TH>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.yahoo.ycsb.OneMeasurementHistogram.BUCKETS"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<A NAME="com.yahoo.ycsb.CommandLine.DEFAULT_DB"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
 <CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/OneMeasurementHistogram.html#BUCKETS">BUCKETS</A></CODE></TD>
-<TD ALIGN="right"><CODE>"histogram.buckets"</CODE></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/CommandLine.html#DEFAULT_DB">DEFAULT_DB</A></CODE></TD>
+<TD ALIGN="right"><CODE>"com.yahoo.ycsb.BasicDB"</CODE></TD>
+</TR>
+</FONT></TD>
+</TR>
+</TABLE>
+
+<P>
+
+<P>
+
+<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="3">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/Utils.html" title="class in com.yahoo.ycsb">Utils</A></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.Utils.FNV_offset_basis_32"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/Utils.html#FNV_offset_basis_32">FNV_offset_basis_32</A></CODE></TD>
+<TD ALIGN="right"><CODE>-2128831035</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.Utils.FNV_offset_basis_64"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;long</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/Utils.html#FNV_offset_basis_64">FNV_offset_basis_64</A></CODE></TD>
+<TD ALIGN="right"><CODE>-3750763034362895579L</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.Utils.FNV_prime_32"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/Utils.html#FNV_prime_32">FNV_prime_32</A></CODE></TD>
+<TD ALIGN="right"><CODE>16777619</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.Utils.FNV_prime_64"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;long</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/Utils.html#FNV_prime_64">FNV_prime_64</A></CODE></TD>
+<TD ALIGN="right"><CODE>1099511628211L</CODE></TD>
+</TR>
+</FONT></TD>
+</TR>
+</TABLE>
+
+<P>
+
+<P>
+
+<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="3">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/Workload.html" title="class in com.yahoo.ycsb">Workload</A></TH>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.yahoo.ycsb.OneMeasurementHistogram.BUCKETS_DEFAULT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<A NAME="com.yahoo.ycsb.Workload.INSERT_START_PROPERTY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
 <CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/OneMeasurementHistogram.html#BUCKETS_DEFAULT">BUCKETS_DEFAULT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"1000"</CODE></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/Workload.html#INSERT_START_PROPERTY">INSERT_START_PROPERTY</A></CODE></TD>
+<TD ALIGN="right"><CODE>"insertstart"</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.Workload.INSERT_START_PROPERTY_DEFAULT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/Workload.html#INSERT_START_PROPERTY_DEFAULT">INSERT_START_PROPERTY_DEFAULT</A></CODE></TD>
+<TD ALIGN="right"><CODE>"0"</CODE></TD>
 </TR>
 </FONT></TD>
 </TR>
@@ -191,19 +249,43 @@ com.yahoo.*</FONT></TH>
 
 <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
 <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="3">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb">OneMeasurementTimeSeries</A></TH>
+<TH ALIGN="left" COLSPAN="3">com.yahoo.ycsb.db.<A HREF="com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A></TH>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.yahoo.ycsb.OneMeasurementTimeSeries.GRANULARITY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<A NAME="com.yahoo.ycsb.db.CassandraClient5.CONNECTION_RETRY_PROPERTY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
 <CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/OneMeasurementTimeSeries.html#GRANULARITY">GRANULARITY</A></CODE></TD>
-<TD ALIGN="right"><CODE>"timeseries.granularity"</CODE></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/CassandraClient5.html#CONNECTION_RETRY_PROPERTY">CONNECTION_RETRY_PROPERTY</A></CODE></TD>
+<TD ALIGN="right"><CODE>"cassandra.connectionretries"</CODE></TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.yahoo.ycsb.OneMeasurementTimeSeries.GRANULARITY_DEFAULT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<A NAME="com.yahoo.ycsb.db.CassandraClient5.CONNECTION_RETRY_PROPERTY_DEFAULT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
 <CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/OneMeasurementTimeSeries.html#GRANULARITY_DEFAULT">GRANULARITY_DEFAULT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"1000"</CODE></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/CassandraClient5.html#CONNECTION_RETRY_PROPERTY_DEFAULT">CONNECTION_RETRY_PROPERTY_DEFAULT</A></CODE></TD>
+<TD ALIGN="right"><CODE>"300"</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.db.CassandraClient5.Error"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/CassandraClient5.html#Error">Error</A></CODE></TD>
+<TD ALIGN="right"><CODE>-1</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.db.CassandraClient5.Ok"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/CassandraClient5.html#Ok">Ok</A></CODE></TD>
+<TD ALIGN="right"><CODE>0</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.db.CassandraClient5.OPERATION_RETRY_PROPERTY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/CassandraClient5.html#OPERATION_RETRY_PROPERTY">OPERATION_RETRY_PROPERTY</A></CODE></TD>
+<TD ALIGN="right"><CODE>"cassandra.operationretries"</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.db.CassandraClient5.OPERATION_RETRY_PROPERTY_DEFAULT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/CassandraClient5.html#OPERATION_RETRY_PROPERTY_DEFAULT">OPERATION_RETRY_PROPERTY_DEFAULT</A></CODE></TD>
+<TD ALIGN="right"><CODE>"300"</CODE></TD>
 </TR>
 </FONT></TD>
 </TR>
@@ -215,19 +297,43 @@ com.yahoo.*</FONT></TH>
 
 <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
 <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="3">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb">ScrambledZipfianGenerator</A></TH>
+<TH ALIGN="left" COLSPAN="3">com.yahoo.ycsb.db.<A HREF="com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A></TH>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.yahoo.ycsb.ScrambledZipfianGenerator.ITEM_COUNT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;long</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/ScrambledZipfianGenerator.html#ITEM_COUNT">ITEM_COUNT</A></CODE></TD>
-<TD ALIGN="right"><CODE>10000000000L</CODE></TD>
+<A NAME="com.yahoo.ycsb.db.CassandraClient6.CONNECTION_RETRY_PROPERTY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/CassandraClient6.html#CONNECTION_RETRY_PROPERTY">CONNECTION_RETRY_PROPERTY</A></CODE></TD>
+<TD ALIGN="right"><CODE>"cassandra.connectionretries"</CODE></TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.yahoo.ycsb.ScrambledZipfianGenerator.ZETAN"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;double</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/ScrambledZipfianGenerator.html#ZETAN">ZETAN</A></CODE></TD>
-<TD ALIGN="right"><CODE>52.93805640344461</CODE></TD>
+<A NAME="com.yahoo.ycsb.db.CassandraClient6.CONNECTION_RETRY_PROPERTY_DEFAULT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/CassandraClient6.html#CONNECTION_RETRY_PROPERTY_DEFAULT">CONNECTION_RETRY_PROPERTY_DEFAULT</A></CODE></TD>
+<TD ALIGN="right"><CODE>"300"</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.db.CassandraClient6.Error"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/CassandraClient6.html#Error">Error</A></CODE></TD>
+<TD ALIGN="right"><CODE>-1</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.db.CassandraClient6.Ok"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/CassandraClient6.html#Ok">Ok</A></CODE></TD>
+<TD ALIGN="right"><CODE>0</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.db.CassandraClient6.OPERATION_RETRY_PROPERTY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/CassandraClient6.html#OPERATION_RETRY_PROPERTY">OPERATION_RETRY_PROPERTY</A></CODE></TD>
+<TD ALIGN="right"><CODE>"cassandra.operationretries"</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.db.CassandraClient6.OPERATION_RETRY_PROPERTY_DEFAULT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/CassandraClient6.html#OPERATION_RETRY_PROPERTY_DEFAULT">OPERATION_RETRY_PROPERTY_DEFAULT</A></CODE></TD>
+<TD ALIGN="right"><CODE>"300"</CODE></TD>
 </TR>
 </FONT></TD>
 </TR>
@@ -239,31 +345,103 @@ com.yahoo.*</FONT></TH>
 
 <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
 <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="3">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/Utils.html" title="class in com.yahoo.ycsb">Utils</A></TH>
+<TH ALIGN="left" COLSPAN="3">com.yahoo.ycsb.db.<A HREF="com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A></TH>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.yahoo.ycsb.Utils.FNV_offset_basis_32"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<A NAME="com.yahoo.ycsb.db.CassandraClient7.CONNECTION_RETRY_PROPERTY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/CassandraClient7.html#CONNECTION_RETRY_PROPERTY">CONNECTION_RETRY_PROPERTY</A></CODE></TD>
+<TD ALIGN="right"><CODE>"cassandra.connectionretries"</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.db.CassandraClient7.CONNECTION_RETRY_PROPERTY_DEFAULT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/CassandraClient7.html#CONNECTION_RETRY_PROPERTY_DEFAULT">CONNECTION_RETRY_PROPERTY_DEFAULT</A></CODE></TD>
+<TD ALIGN="right"><CODE>"300"</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.db.CassandraClient7.Error"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
 <CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/Utils.html#FNV_offset_basis_32">FNV_offset_basis_32</A></CODE></TD>
-<TD ALIGN="right"><CODE>-2128831035</CODE></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/CassandraClient7.html#Error">Error</A></CODE></TD>
+<TD ALIGN="right"><CODE>-1</CODE></TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.yahoo.ycsb.Utils.FNV_offset_basis_64"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;long</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/Utils.html#FNV_offset_basis_64">FNV_offset_basis_64</A></CODE></TD>
-<TD ALIGN="right"><CODE>-3750763034362895579L</CODE></TD>
+<A NAME="com.yahoo.ycsb.db.CassandraClient7.Ok"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/CassandraClient7.html#Ok">Ok</A></CODE></TD>
+<TD ALIGN="right"><CODE>0</CODE></TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.yahoo.ycsb.Utils.FNV_prime_32"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<A NAME="com.yahoo.ycsb.db.CassandraClient7.OPERATION_RETRY_PROPERTY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/CassandraClient7.html#OPERATION_RETRY_PROPERTY">OPERATION_RETRY_PROPERTY</A></CODE></TD>
+<TD ALIGN="right"><CODE>"cassandra.operationretries"</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.db.CassandraClient7.OPERATION_RETRY_PROPERTY_DEFAULT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/CassandraClient7.html#OPERATION_RETRY_PROPERTY_DEFAULT">OPERATION_RETRY_PROPERTY_DEFAULT</A></CODE></TD>
+<TD ALIGN="right"><CODE>"300"</CODE></TD>
+</TR>
+</FONT></TD>
+</TR>
+</TABLE>
+
+<P>
+
+<P>
+
+<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="3">com.yahoo.ycsb.db.<A HREF="com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.db.HBaseClient.HttpError"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
 <CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/Utils.html#FNV_prime_32">FNV_prime_32</A></CODE></TD>
-<TD ALIGN="right"><CODE>16777619</CODE></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/HBaseClient.html#HttpError">HttpError</A></CODE></TD>
+<TD ALIGN="right"><CODE>-2</CODE></TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.yahoo.ycsb.Utils.FNV_prime_64"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<A NAME="com.yahoo.ycsb.db.HBaseClient.NoMatchingRecord"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/HBaseClient.html#NoMatchingRecord">NoMatchingRecord</A></CODE></TD>
+<TD ALIGN="right"><CODE>-3</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.db.HBaseClient.Ok"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/HBaseClient.html#Ok">Ok</A></CODE></TD>
+<TD ALIGN="right"><CODE>0</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.db.HBaseClient.ServerError"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;int</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/db/HBaseClient.html#ServerError">ServerError</A></CODE></TD>
+<TD ALIGN="right"><CODE>-1</CODE></TD>
+</TR>
+</FONT></TD>
+</TR>
+</TABLE>
+
+<P>
+
+<P>
+
+<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="3">com.yahoo.ycsb.generator.<A HREF="com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ScrambledZipfianGenerator</A></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.generator.ScrambledZipfianGenerator.ITEM_COUNT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
 <CODE>public&nbsp;static&nbsp;final&nbsp;long</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/Utils.html#FNV_prime_64">FNV_prime_64</A></CODE></TD>
-<TD ALIGN="right"><CODE>1099511628211L</CODE></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html#ITEM_COUNT">ITEM_COUNT</A></CODE></TD>
+<TD ALIGN="right"><CODE>10000000000L</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.generator.ScrambledZipfianGenerator.ZETAN"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;double</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html#ZETAN">ZETAN</A></CODE></TD>
+<TD ALIGN="right"><CODE>52.93805640344461</CODE></TD>
 </TR>
 </FONT></TD>
 </TR>
@@ -275,19 +453,37 @@ com.yahoo.*</FONT></TH>
 
 <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
 <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="3">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/Workload.html" title="class in com.yahoo.ycsb">Workload</A></TH>
+<TH ALIGN="left" COLSPAN="3">com.yahoo.ycsb.generator.<A HREF="com/yahoo/ycsb/generator/ZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ZipfianGenerator</A></TH>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.yahoo.ycsb.Workload.INSERT_START_PROPERTY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<A NAME="com.yahoo.ycsb.generator.ZipfianGenerator.ZIPFIAN_CONSTANT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;double</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/generator/ZipfianGenerator.html#ZIPFIAN_CONSTANT">ZIPFIAN_CONSTANT</A></CODE></TD>
+<TD ALIGN="right"><CODE>0.99</CODE></TD>
+</TR>
+</FONT></TD>
+</TR>
+</TABLE>
+
+<P>
+
+<P>
+
+<TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
+<TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
+<TH ALIGN="left" COLSPAN="3">com.yahoo.ycsb.measurements.<A HREF="com/yahoo/ycsb/measurements/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb.measurements">OneMeasurementHistogram</A></TH>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.measurements.OneMeasurementHistogram.BUCKETS"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
 <CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/Workload.html#INSERT_START_PROPERTY">INSERT_START_PROPERTY</A></CODE></TD>
-<TD ALIGN="right"><CODE>"insertstart"</CODE></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/measurements/OneMeasurementHistogram.html#BUCKETS">BUCKETS</A></CODE></TD>
+<TD ALIGN="right"><CODE>"histogram.buckets"</CODE></TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.yahoo.ycsb.Workload.INSERT_START_PROPERTY_DEFAULT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<A NAME="com.yahoo.ycsb.measurements.OneMeasurementHistogram.BUCKETS_DEFAULT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
 <CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/Workload.html#INSERT_START_PROPERTY_DEFAULT">INSERT_START_PROPERTY_DEFAULT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"0"</CODE></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/measurements/OneMeasurementHistogram.html#BUCKETS_DEFAULT">BUCKETS_DEFAULT</A></CODE></TD>
+<TD ALIGN="right"><CODE>"1000"</CODE></TD>
 </TR>
 </FONT></TD>
 </TR>
@@ -299,13 +495,19 @@ com.yahoo.*</FONT></TH>
 
 <TABLE BORDER="1" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
 <TR BGCOLOR="#EEEEFF" CLASS="TableSubHeadingColor">
-<TH ALIGN="left" COLSPAN="3">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/ZipfianGenerator.html" title="class in com.yahoo.ycsb">ZipfianGenerator</A></TH>
+<TH ALIGN="left" COLSPAN="3">com.yahoo.ycsb.measurements.<A HREF="com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb.measurements">OneMeasurementTimeSeries</A></TH>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="com.yahoo.ycsb.ZipfianGenerator.ZIPFIAN_CONSTANT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;double</CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/ZipfianGenerator.html#ZIPFIAN_CONSTANT">ZIPFIAN_CONSTANT</A></CODE></TD>
-<TD ALIGN="right"><CODE>0.99</CODE></TD>
+<A NAME="com.yahoo.ycsb.measurements.OneMeasurementTimeSeries.GRANULARITY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html#GRANULARITY">GRANULARITY</A></CODE></TD>
+<TD ALIGN="right"><CODE>"timeseries.granularity"</CODE></TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<A NAME="com.yahoo.ycsb.measurements.OneMeasurementTimeSeries.GRANULARITY_DEFAULT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
+<CODE>public&nbsp;static&nbsp;final&nbsp;java.lang.String</CODE></FONT></TD>
+<TD ALIGN="left"><CODE><A HREF="com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html#GRANULARITY_DEFAULT">GRANULARITY_DEFAULT</A></CODE></TD>
+<TD ALIGN="right"><CODE>"1000"</CODE></TD>
 </TR>
 </FONT></TD>
 </TR>
diff --git a/doc/javadoc/deprecated-list.html b/doc/javadoc/deprecated-list.html
index ba042aaa230bc92f3a14ac1289693d666ff77310..4a9740047521fc68dd0368cd88627c75b78e9acb 100644
--- a/doc/javadoc/deprecated-list.html
+++ b/doc/javadoc/deprecated-list.html
@@ -2,18 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
 Deprecated List
 </TITLE>
 
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="Deprecated List";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Deprecated List";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -22,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
diff --git a/doc/javadoc/help-doc.html b/doc/javadoc/help-doc.html
index 10267e56668bacbe9f0e543e025e67909ea70286..7bdabfd901f49d3722d5ad5c9ce35c9121b99a6e 100644
--- a/doc/javadoc/help-doc.html
+++ b/doc/javadoc/help-doc.html
@@ -2,18 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:26 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
 API Help
 </TITLE>
 
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="API Help";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="API Help";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -22,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
diff --git a/doc/javadoc/index-all.html b/doc/javadoc/index-all.html
index 4821b9486a924fc137641336e7135a6b37bb49ca..f922cd04d5b779171b4caf06a316ee5aa64777e7 100644
--- a/doc/javadoc/index-all.html
+++ b/doc/javadoc/index-all.html
@@ -2,18 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
 Index
 </TITLE>
 
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="./stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="Index";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Index";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -22,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
@@ -73,12 +77,12 @@ function windowTitle()
 <A NAME="skip-navbar_top"></A>
 <!-- ========= END OF TOP NAVBAR ========= -->
 
-<A HREF="#_A_">A</A> <A HREF="#_B_">B</A> <A HREF="#_C_">C</A> <A HREF="#_D_">D</A> <A HREF="#_F_">F</A> <A HREF="#_G_">G</A> <A HREF="#_H_">H</A> <A HREF="#_I_">I</A> <A HREF="#_L_">L</A> <A HREF="#_M_">M</A> <A HREF="#_N_">N</A> <A HREF="#_O_">O</A> <A HREF="#_P_">P</A> <A HREF="#_R_">R</A> <A HREF="#_S_">S</A> <A HREF="#_T_">T</A> <A HREF="#_U_">U</A> <A HREF="#_V_">V</A> <A HREF="#_W_">W</A> <A HREF="#_Z_">Z</A> <HR>
+<A HREF="#_A_">A</A> <A HREF="#_B_">B</A> <A HREF="#_C_">C</A> <A HREF="#_D_">D</A> <A HREF="#_E_">E</A> <A HREF="#_F_">F</A> <A HREF="#_G_">G</A> <A HREF="#_H_">H</A> <A HREF="#_I_">I</A> <A HREF="#_L_">L</A> <A HREF="#_M_">M</A> <A HREF="#_N_">N</A> <A HREF="#_O_">O</A> <A HREF="#_P_">P</A> <A HREF="#_R_">R</A> <A HREF="#_S_">S</A> <A HREF="#_T_">T</A> <A HREF="#_U_">U</A> <A HREF="#_V_">V</A> <A HREF="#_W_">W</A> <A HREF="#_Z_">Z</A> <A HREF="#___">_</A> <HR>
 <A NAME="_A_"><!-- --></A><H2>
 <B>A</B></H2>
 <DL>
-<DT><A HREF="./com/yahoo/ycsb/DiscreteGenerator.html#addValue(double, java.lang.String)"><B>addValue(double, String)</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DiscreteGenerator.html" title="class in com.yahoo.ycsb">DiscreteGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/DiscreteGenerator.html#addValue(double, java.lang.String)"><B>addValue(double, String)</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/DiscreteGenerator.html" title="class in com.yahoo.ycsb.generator">DiscreteGenerator</A>
 <DD>&nbsp;
 <DT><A HREF="./com/yahoo/ycsb/Utils.html#ASCIIString(int)"><B>ASCIIString(int)</B></A> - 
 Static method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Utils.html" title="class in com.yahoo.ycsb">Utils</A>
@@ -91,23 +95,44 @@ Static method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Utils.html" titl
 <DT><A HREF="./com/yahoo/ycsb/BasicDB.html" title="class in com.yahoo.ycsb"><B>BasicDB</B></A> - Class in <A HREF="./com/yahoo/ycsb/package-summary.html">com.yahoo.ycsb</A><DD>Basic DB that just prints out the requested operations, instead of doing them against a database.<DT><A HREF="./com/yahoo/ycsb/BasicDB.html#BasicDB()"><B>BasicDB()</B></A> - 
 Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/BasicDB.html" title="class in com.yahoo.ycsb">BasicDB</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/OneMeasurementHistogram.html#BUCKETS"><B>BUCKETS</B></A> - 
-Static variable in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb">OneMeasurementHistogram</A>
+<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurementHistogram.html#BUCKETS"><B>BUCKETS</B></A> - 
+Static variable in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb.measurements">OneMeasurementHistogram</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/OneMeasurementHistogram.html#BUCKETS_DEFAULT"><B>BUCKETS_DEFAULT</B></A> - 
-Static variable in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb">OneMeasurementHistogram</A>
+<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurementHistogram.html#BUCKETS_DEFAULT"><B>BUCKETS_DEFAULT</B></A> - 
+Static variable in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb.measurements">OneMeasurementHistogram</A>
 <DD>&nbsp;
 </DL>
 <HR>
 <A NAME="_C_"><!-- --></A><H2>
 <B>C</B></H2>
 <DL>
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db"><B>CassandraClient5</B></A> - Class in <A HREF="./com/yahoo/ycsb/db/package-summary.html">com.yahoo.ycsb.db</A><DD>Cassandra 0.5 client for YCSB framework<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient5.html#CassandraClient5()"><B>CassandraClient5()</B></A> - 
+Constructor for class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db"><B>CassandraClient6</B></A> - Class in <A HREF="./com/yahoo/ycsb/db/package-summary.html">com.yahoo.ycsb.db</A><DD>Cassandra 0.6 client for YCSB framework<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient6.html#CassandraClient6()"><B>CassandraClient6()</B></A> - 
+Constructor for class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db"><B>CassandraClient7</B></A> - Class in <A HREF="./com/yahoo/ycsb/db/package-summary.html">com.yahoo.ycsb.db</A><DD>Cassandra 0.7 client for YCSB framework<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient7.html#CassandraClient7()"><B>CassandraClient7()</B></A> - 
+Constructor for class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A>
+<DD>&nbsp;
 <DT><A HREF="./com/yahoo/ycsb/Client.html#checkRequiredProperties(java.util.Properties)"><B>checkRequiredProperties(Properties)</B></A> - 
 Static method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Client.html" title="class in com.yahoo.ycsb">Client</A>
 <DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient5.html#cleanup()"><B>cleanup()</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A>
+<DD>Cleanup any state for this DB.
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient6.html#cleanup()"><B>cleanup()</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A>
+<DD>Cleanup any state for this DB.
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient7.html#cleanup()"><B>cleanup()</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A>
+<DD>Cleanup any state for this DB.
 <DT><A HREF="./com/yahoo/ycsb/DB.html#cleanup()"><B>cleanup()</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DB.html" title="class in com.yahoo.ycsb">DB</A>
 <DD>Cleanup any state for this DB.
+<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html#cleanup()"><B>cleanup()</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
+<DD>Cleanup any state for this DB.
 <DT><A HREF="./com/yahoo/ycsb/DBWrapper.html#cleanup()"><B>cleanup()</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DBWrapper.html" title="class in com.yahoo.ycsb">DBWrapper</A>
 <DD>Cleanup any state for this DB.
@@ -117,11 +142,41 @@ Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Workload.html" title="c
 <DT><A HREF="./com/yahoo/ycsb/Client.html" title="class in com.yahoo.ycsb"><B>Client</B></A> - Class in <A HREF="./com/yahoo/ycsb/package-summary.html">com.yahoo.ycsb</A><DD>Main class for executing YCSB.<DT><A HREF="./com/yahoo/ycsb/Client.html#Client()"><B>Client()</B></A> - 
 Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Client.html" title="class in com.yahoo.ycsb">Client</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/package-summary.html"><B>com.yahoo.ycsb</B></A> - package com.yahoo.ycsb<DD>&nbsp;<DT><A HREF="./com/yahoo/ycsb/workloads/package-summary.html"><B>com.yahoo.ycsb.workloads</B></A> - package com.yahoo.ycsb.workloads<DD>&nbsp;<DT><A HREF="./com/yahoo/ycsb/workloads/CoreWorkload.html" title="class in com.yahoo.ycsb.workloads"><B>CoreWorkload</B></A> - Class in <A HREF="./com/yahoo/ycsb/workloads/package-summary.html">com.yahoo.ycsb.workloads</A><DD>The core benchmark scenario.<DT><A HREF="./com/yahoo/ycsb/workloads/CoreWorkload.html#CoreWorkload()"><B>CoreWorkload()</B></A> - 
+<DT><A HREF="./com/yahoo/ycsb/package-summary.html"><B>com.yahoo.ycsb</B></A> - package com.yahoo.ycsb<DD>&nbsp;<DT><A HREF="./com/yahoo/ycsb/db/package-summary.html"><B>com.yahoo.ycsb.db</B></A> - package com.yahoo.ycsb.db<DD>&nbsp;<DT><A HREF="./com/yahoo/ycsb/generator/package-summary.html"><B>com.yahoo.ycsb.generator</B></A> - package com.yahoo.ycsb.generator<DD>&nbsp;<DT><A HREF="./com/yahoo/ycsb/measurements/package-summary.html"><B>com.yahoo.ycsb.measurements</B></A> - package com.yahoo.ycsb.measurements<DD>&nbsp;<DT><A HREF="./com/yahoo/ycsb/workloads/package-summary.html"><B>com.yahoo.ycsb.workloads</B></A> - package com.yahoo.ycsb.workloads<DD>&nbsp;<DT><A HREF="./com/yahoo/ycsb/CommandLine.html" title="class in com.yahoo.ycsb"><B>CommandLine</B></A> - Class in <A HREF="./com/yahoo/ycsb/package-summary.html">com.yahoo.ycsb</A><DD>A simple command line client to a database, using the appropriate com.yahoo.ycsb.DB implementation.<DT><A HREF="./com/yahoo/ycsb/CommandLine.html#CommandLine()"><B>CommandLine()</B></A> - 
+Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/CommandLine.html" title="class in com.yahoo.ycsb">CommandLine</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient5.html#CONNECTION_RETRY_PROPERTY"><B>CONNECTION_RETRY_PROPERTY</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient6.html#CONNECTION_RETRY_PROPERTY"><B>CONNECTION_RETRY_PROPERTY</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient7.html#CONNECTION_RETRY_PROPERTY"><B>CONNECTION_RETRY_PROPERTY</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient5.html#CONNECTION_RETRY_PROPERTY_DEFAULT"><B>CONNECTION_RETRY_PROPERTY_DEFAULT</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient6.html#CONNECTION_RETRY_PROPERTY_DEFAULT"><B>CONNECTION_RETRY_PROPERTY_DEFAULT</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient7.html#CONNECTION_RETRY_PROPERTY_DEFAULT"><B>CONNECTION_RETRY_PROPERTY_DEFAULT</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient5.html#ConnectionRetries"><B>ConnectionRetries</B></A> - 
+Variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient6.html#ConnectionRetries"><B>ConnectionRetries</B></A> - 
+Variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient7.html#ConnectionRetries"><B>ConnectionRetries</B></A> - 
+Variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/workloads/CoreWorkload.html" title="class in com.yahoo.ycsb.workloads"><B>CoreWorkload</B></A> - Class in <A HREF="./com/yahoo/ycsb/workloads/package-summary.html">com.yahoo.ycsb.workloads</A><DD>The core benchmark scenario.<DT><A HREF="./com/yahoo/ycsb/workloads/CoreWorkload.html#CoreWorkload()"><B>CoreWorkload()</B></A> - 
 Constructor for class com.yahoo.ycsb.workloads.<A HREF="./com/yahoo/ycsb/workloads/CoreWorkload.html" title="class in com.yahoo.ycsb.workloads">CoreWorkload</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/CounterGenerator.html" title="class in com.yahoo.ycsb"><B>CounterGenerator</B></A> - Class in <A HREF="./com/yahoo/ycsb/package-summary.html">com.yahoo.ycsb</A><DD>Generates a sequence of integers 0, 1, ...<DT><A HREF="./com/yahoo/ycsb/CounterGenerator.html#CounterGenerator(int)"><B>CounterGenerator(int)</B></A> - 
-Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/CounterGenerator.html" title="class in com.yahoo.ycsb">CounterGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/CounterGenerator.html" title="class in com.yahoo.ycsb.generator"><B>CounterGenerator</B></A> - Class in <A HREF="./com/yahoo/ycsb/generator/package-summary.html">com.yahoo.ycsb.generator</A><DD>Generates a sequence of integers 0, 1, ...<DT><A HREF="./com/yahoo/ycsb/generator/CounterGenerator.html#CounterGenerator(int)"><B>CounterGenerator(int)</B></A> - 
+Constructor for class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/CounterGenerator.html" title="class in com.yahoo.ycsb.generator">CounterGenerator</A>
 <DD>Create a counter that starts at countstart
 </DL>
 <HR>
@@ -149,17 +204,35 @@ Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DBFactory.html" t
 <DT><A HREF="./com/yahoo/ycsb/DBWrapper.html" title="class in com.yahoo.ycsb"><B>DBWrapper</B></A> - Class in <A HREF="./com/yahoo/ycsb/package-summary.html">com.yahoo.ycsb</A><DD>Wrapper around a "real" DB that measures latencies and counts return codes.<DT><A HREF="./com/yahoo/ycsb/DBWrapper.html#DBWrapper(com.yahoo.ycsb.DB)"><B>DBWrapper(DB)</B></A> - 
 Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DBWrapper.html" title="class in com.yahoo.ycsb">DBWrapper</A>
 <DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/CommandLine.html#DEFAULT_DB"><B>DEFAULT_DB</B></A> - 
+Static variable in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/CommandLine.html" title="class in com.yahoo.ycsb">CommandLine</A>
+<DD>&nbsp;
 <DT><A HREF="./com/yahoo/ycsb/BasicDB.html#delete(java.lang.String, java.lang.String)"><B>delete(String, String)</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/BasicDB.html" title="class in com.yahoo.ycsb">BasicDB</A>
 <DD>Delete a record from the database.
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient5.html#delete(java.lang.String, java.lang.String)"><B>delete(String, String)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A>
+<DD>Delete a record from the database.
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient6.html#delete(java.lang.String, java.lang.String)"><B>delete(String, String)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A>
+<DD>Delete a record from the database.
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient7.html#delete(java.lang.String, java.lang.String)"><B>delete(String, String)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A>
+<DD>Delete a record from the database.
 <DT><A HREF="./com/yahoo/ycsb/DB.html#delete(java.lang.String, java.lang.String)"><B>delete(String, String)</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DB.html" title="class in com.yahoo.ycsb">DB</A>
 <DD>Delete a record from the database.
+<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html#delete(java.lang.String, java.lang.String)"><B>delete(String, String)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
+<DD>Delete a record from the database.
+<DT><A HREF="./com/yahoo/ycsb/db/MongoDbClient.html#delete(java.lang.String, java.lang.String)"><B>delete(String, String)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/MongoDbClient.html" title="class in com.yahoo.ycsb.db">MongoDbClient</A>
+<DD>&nbsp;
 <DT><A HREF="./com/yahoo/ycsb/DBWrapper.html#delete(java.lang.String, java.lang.String)"><B>delete(String, String)</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DBWrapper.html" title="class in com.yahoo.ycsb">DBWrapper</A>
 <DD>Delete a record from the database.
-<DT><A HREF="./com/yahoo/ycsb/DiscreteGenerator.html" title="class in com.yahoo.ycsb"><B>DiscreteGenerator</B></A> - Class in <A HREF="./com/yahoo/ycsb/package-summary.html">com.yahoo.ycsb</A><DD>Generates a distribution by choosing from a discrete set of values.<DT><A HREF="./com/yahoo/ycsb/DiscreteGenerator.html#DiscreteGenerator()"><B>DiscreteGenerator()</B></A> - 
-Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DiscreteGenerator.html" title="class in com.yahoo.ycsb">DiscreteGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/DiscreteGenerator.html" title="class in com.yahoo.ycsb.generator"><B>DiscreteGenerator</B></A> - Class in <A HREF="./com/yahoo/ycsb/generator/package-summary.html">com.yahoo.ycsb.generator</A><DD>Generates a distribution by choosing from a discrete set of values.<DT><A HREF="./com/yahoo/ycsb/generator/DiscreteGenerator.html#DiscreteGenerator()"><B>DiscreteGenerator()</B></A> - 
+Constructor for class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/DiscreteGenerator.html" title="class in com.yahoo.ycsb.generator">DiscreteGenerator</A>
 <DD>&nbsp;
 <DT><A HREF="./com/yahoo/ycsb/Workload.html#doInsert(com.yahoo.ycsb.DB, java.lang.Object)"><B>doInsert(DB, Object)</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Workload.html" title="class in com.yahoo.ycsb">Workload</A>
@@ -190,6 +263,20 @@ Method in class com.yahoo.ycsb.workloads.<A HREF="./com/yahoo/ycsb/workloads/Cor
 <DD>&nbsp;
 </DL>
 <HR>
+<A NAME="_E_"><!-- --></A><H2>
+<B>E</B></H2>
+<DL>
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient5.html#Error"><B>Error</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient6.html#Error"><B>Error</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient7.html#Error"><B>Error</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A>
+<DD>&nbsp;
+</DL>
+<HR>
 <A NAME="_F_"><!-- --></A><H2>
 <B>F</B></H2>
 <DL>
@@ -228,14 +315,17 @@ Static method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Utils.html" titl
 <A NAME="_G_"><!-- --></A><H2>
 <B>G</B></H2>
 <DL>
-<DT><A HREF="./com/yahoo/ycsb/Generator.html" title="class in com.yahoo.ycsb"><B>Generator</B></A> - Class in <A HREF="./com/yahoo/ycsb/package-summary.html">com.yahoo.ycsb</A><DD>An expression that generates a sequence of string values, following some distribution (Uniform, Zipfian, Sequential, etc.)<DT><A HREF="./com/yahoo/ycsb/Generator.html#Generator()"><B>Generator()</B></A> - 
-Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Generator.html" title="class in com.yahoo.ycsb">Generator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/Generator.html" title="class in com.yahoo.ycsb.generator"><B>Generator</B></A> - Class in <A HREF="./com/yahoo/ycsb/generator/package-summary.html">com.yahoo.ycsb.generator</A><DD>An expression that generates a sequence of string values, following some distribution (Uniform, Zipfian, Sequential, etc.)<DT><A HREF="./com/yahoo/ycsb/generator/Generator.html#Generator()"><B>Generator()</B></A> - 
+Constructor for class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/Generator.html" title="class in com.yahoo.ycsb.generator">Generator</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/Measurements.html#getMeasurements()"><B>getMeasurements()</B></A> - 
-Static method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Measurements.html" title="class in com.yahoo.ycsb">Measurements</A>
+<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html#getHTable(java.lang.String)"><B>getHTable(String)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/OneMeasurement.html#getName()"><B>getName()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurement.html" title="class in com.yahoo.ycsb">OneMeasurement</A>
+<DT><A HREF="./com/yahoo/ycsb/measurements/Measurements.html#getMeasurements()"><B>getMeasurements()</B></A> - 
+Static method in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/Measurements.html" title="class in com.yahoo.ycsb.measurements">Measurements</A>
+<DD>Return the singleton Measurements object.
+<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurement.html#getName()"><B>getName()</B></A> - 
+Method in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/OneMeasurement.html" title="class in com.yahoo.ycsb.measurements">OneMeasurement</A>
 <DD>&nbsp;
 <DT><A HREF="./com/yahoo/ycsb/DB.html#getProperties()"><B>getProperties()</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DB.html" title="class in com.yahoo.ycsb">DB</A>
@@ -243,23 +333,23 @@ Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DB.html" title="class i
 <DT><A HREF="./com/yahoo/ycsb/DBWrapper.html#getProperties()"><B>getProperties()</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DBWrapper.html" title="class in com.yahoo.ycsb">DBWrapper</A>
 <DD>Get the set of properties for this DB.
-<DT><A HREF="./com/yahoo/ycsb/Measurements.html#getSummary()"><B>getSummary()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Measurements.html" title="class in com.yahoo.ycsb">Measurements</A>
-<DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/OneMeasurement.html#getSummary()"><B>getSummary()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurement.html" title="class in com.yahoo.ycsb">OneMeasurement</A>
+<DT><A HREF="./com/yahoo/ycsb/measurements/Measurements.html#getSummary()"><B>getSummary()</B></A> - 
+Method in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/Measurements.html" title="class in com.yahoo.ycsb.measurements">Measurements</A>
+<DD>Return a one line summary of the measurements.
+<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurement.html#getSummary()"><B>getSummary()</B></A> - 
+Method in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/OneMeasurement.html" title="class in com.yahoo.ycsb.measurements">OneMeasurement</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/OneMeasurementHistogram.html#getSummary()"><B>getSummary()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb">OneMeasurementHistogram</A>
+<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurementHistogram.html#getSummary()"><B>getSummary()</B></A> - 
+Method in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb.measurements">OneMeasurementHistogram</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/OneMeasurementTimeSeries.html#getSummary()"><B>getSummary()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb">OneMeasurementTimeSeries</A>
+<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html#getSummary()"><B>getSummary()</B></A> - 
+Method in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb.measurements">OneMeasurementTimeSeries</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/OneMeasurementTimeSeries.html#GRANULARITY"><B>GRANULARITY</B></A> - 
-Static variable in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb">OneMeasurementTimeSeries</A>
+<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html#GRANULARITY"><B>GRANULARITY</B></A> - 
+Static variable in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb.measurements">OneMeasurementTimeSeries</A>
 <DD>Granularity for time series; measurements will be averaged in chunks of this granularity.
-<DT><A HREF="./com/yahoo/ycsb/OneMeasurementTimeSeries.html#GRANULARITY_DEFAULT"><B>GRANULARITY_DEFAULT</B></A> - 
-Static variable in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb">OneMeasurementTimeSeries</A>
+<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html#GRANULARITY_DEFAULT"><B>GRANULARITY_DEFAULT</B></A> - 
+Static variable in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb.measurements">OneMeasurementTimeSeries</A>
 <DD>&nbsp;
 </DL>
 <HR>
@@ -269,6 +359,15 @@ Static variable in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurement
 <DT><A HREF="./com/yahoo/ycsb/Utils.html#hash(int)"><B>hash(int)</B></A> - 
 Static method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Utils.html" title="class in com.yahoo.ycsb">Utils</A>
 <DD>Hash an integer value.
+<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db"><B>HBaseClient</B></A> - Class in <A HREF="./com/yahoo/ycsb/db/package-summary.html">com.yahoo.ycsb.db</A><DD>HBase client for YCSB framework<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html#HBaseClient()"><B>HBaseClient()</B></A> - 
+Constructor for class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/CommandLine.html#help()"><B>help()</B></A> - 
+Static method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/CommandLine.html" title="class in com.yahoo.ycsb">CommandLine</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html#HttpError"><B>HttpError</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
+<DD>&nbsp;
 </DL>
 <HR>
 <A NAME="_I_"><!-- --></A><H2>
@@ -277,9 +376,24 @@ Static method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Utils.html" titl
 <DT><A HREF="./com/yahoo/ycsb/BasicDB.html#init()"><B>init()</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/BasicDB.html" title="class in com.yahoo.ycsb">BasicDB</A>
 <DD>Initialize any state for this DB.
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient5.html#init()"><B>init()</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A>
+<DD>Initialize any state for this DB.
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient6.html#init()"><B>init()</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A>
+<DD>Initialize any state for this DB.
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient7.html#init()"><B>init()</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A>
+<DD>Initialize any state for this DB.
+<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html#init()"><B>init()</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
+<DD>Initialize any state for this DB.
 <DT><A HREF="./com/yahoo/ycsb/DB.html#init()"><B>init()</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DB.html" title="class in com.yahoo.ycsb">DB</A>
 <DD>Initialize any state for this DB.
+<DT><A HREF="./com/yahoo/ycsb/db/MongoDbClient.html#init()"><B>init()</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/MongoDbClient.html" title="class in com.yahoo.ycsb.db">MongoDbClient</A>
+<DD>Initialize any state for this DB.
 <DT><A HREF="./com/yahoo/ycsb/DBWrapper.html#init()"><B>init()</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DBWrapper.html" title="class in com.yahoo.ycsb">DBWrapper</A>
 <DD>Initialize any state for this DB.
@@ -295,9 +409,24 @@ Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Workload.html" title="c
 <DT><A HREF="./com/yahoo/ycsb/BasicDB.html#insert(java.lang.String, java.lang.String, java.util.HashMap)"><B>insert(String, String, HashMap&lt;String, String&gt;)</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/BasicDB.html" title="class in com.yahoo.ycsb">BasicDB</A>
 <DD>Insert a record in the database.
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient5.html#insert(java.lang.String, java.lang.String, java.util.HashMap)"><B>insert(String, String, HashMap&lt;String, String&gt;)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A>
+<DD>Insert a record in the database.
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient6.html#insert(java.lang.String, java.lang.String, java.util.HashMap)"><B>insert(String, String, HashMap&lt;String, String&gt;)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A>
+<DD>Insert a record in the database.
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient7.html#insert(java.lang.String, java.lang.String, java.util.HashMap)"><B>insert(String, String, HashMap&lt;String, String&gt;)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A>
+<DD>Insert a record in the database.
+<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html#insert(java.lang.String, java.lang.String, java.util.HashMap)"><B>insert(String, String, HashMap&lt;String, String&gt;)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
+<DD>Insert a record in the database.
 <DT><A HREF="./com/yahoo/ycsb/DB.html#insert(java.lang.String, java.lang.String, java.util.HashMap)"><B>insert(String, String, HashMap&lt;String, String&gt;)</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DB.html" title="class in com.yahoo.ycsb">DB</A>
 <DD>Insert a record in the database.
+<DT><A HREF="./com/yahoo/ycsb/db/MongoDbClient.html#insert(java.lang.String, java.lang.String, java.util.HashMap)"><B>insert(String, String, HashMap&lt;String, String&gt;)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/MongoDbClient.html" title="class in com.yahoo.ycsb.db">MongoDbClient</A>
+<DD>&nbsp;
 <DT><A HREF="./com/yahoo/ycsb/DBWrapper.html#insert(java.lang.String, java.lang.String, java.util.HashMap)"><B>insert(String, String, HashMap&lt;String, String&gt;)</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DBWrapper.html" title="class in com.yahoo.ycsb">DBWrapper</A>
 <DD>Insert a record in the database.
@@ -322,31 +451,31 @@ Static variable in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Workload.html"
 <DT><A HREF="./com/yahoo/ycsb/Workload.html#INSERT_START_PROPERTY_DEFAULT"><B>INSERT_START_PROPERTY_DEFAULT</B></A> - 
 Static variable in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Workload.html" title="class in com.yahoo.ycsb">Workload</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/IntegerGenerator.html" title="class in com.yahoo.ycsb"><B>IntegerGenerator</B></A> - Class in <A HREF="./com/yahoo/ycsb/package-summary.html">com.yahoo.ycsb</A><DD>A generator that is capable of generating ints as well as strings<DT><A HREF="./com/yahoo/ycsb/IntegerGenerator.html#IntegerGenerator()"><B>IntegerGenerator()</B></A> - 
-Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/IntegerGenerator.html" title="class in com.yahoo.ycsb">IntegerGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/IntegerGenerator.html" title="class in com.yahoo.ycsb.generator"><B>IntegerGenerator</B></A> - Class in <A HREF="./com/yahoo/ycsb/generator/package-summary.html">com.yahoo.ycsb.generator</A><DD>A generator that is capable of generating ints as well as strings<DT><A HREF="./com/yahoo/ycsb/generator/IntegerGenerator.html#IntegerGenerator()"><B>IntegerGenerator()</B></A> - 
+Constructor for class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/IntegerGenerator.html" title="class in com.yahoo.ycsb.generator">IntegerGenerator</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/ScrambledZipfianGenerator.html#ITEM_COUNT"><B>ITEM_COUNT</B></A> - 
-Static variable in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb">ScrambledZipfianGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html#ITEM_COUNT"><B>ITEM_COUNT</B></A> - 
+Static variable in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ScrambledZipfianGenerator</A>
 <DD>&nbsp;
 </DL>
 <HR>
 <A NAME="_L_"><!-- --></A><H2>
 <B>L</B></H2>
 <DL>
-<DT><A HREF="./com/yahoo/ycsb/IntegerGenerator.html#lastInt()"><B>lastInt()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/IntegerGenerator.html" title="class in com.yahoo.ycsb">IntegerGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/IntegerGenerator.html#lastInt()"><B>lastInt()</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/IntegerGenerator.html" title="class in com.yahoo.ycsb.generator">IntegerGenerator</A>
 <DD>Return the previous int generated by the distribution.
-<DT><A HREF="./com/yahoo/ycsb/DiscreteGenerator.html#lastString()"><B>lastString()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DiscreteGenerator.html" title="class in com.yahoo.ycsb">DiscreteGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/DiscreteGenerator.html#lastString()"><B>lastString()</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/DiscreteGenerator.html" title="class in com.yahoo.ycsb.generator">DiscreteGenerator</A>
 <DD>Return the previous string generated by the distribution; e.g., returned from the last nextString() call.
-<DT><A HREF="./com/yahoo/ycsb/Generator.html#lastString()"><B>lastString()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Generator.html" title="class in com.yahoo.ycsb">Generator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/Generator.html#lastString()"><B>lastString()</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/Generator.html" title="class in com.yahoo.ycsb.generator">Generator</A>
 <DD>Return the previous string generated by the distribution; e.g., returned from the last nextString() call.
-<DT><A HREF="./com/yahoo/ycsb/IntegerGenerator.html#lastString()"><B>lastString()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/IntegerGenerator.html" title="class in com.yahoo.ycsb">IntegerGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/IntegerGenerator.html#lastString()"><B>lastString()</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/IntegerGenerator.html" title="class in com.yahoo.ycsb.generator">IntegerGenerator</A>
 <DD>Return the previous string generated by the distribution; e.g., returned from the last nextString() call.
-<DT><A HREF="./com/yahoo/ycsb/UniformGenerator.html#lastString()"><B>lastString()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/UniformGenerator.html" title="class in com.yahoo.ycsb">UniformGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/UniformGenerator.html#lastString()"><B>lastString()</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/UniformGenerator.html" title="class in com.yahoo.ycsb.generator">UniformGenerator</A>
 <DD>Return the previous string generated by the distribution; e.g., returned from the last nextString() call.
 </DL>
 <HR>
@@ -356,14 +485,29 @@ Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/UniformGenerator.html"
 <DT><A HREF="./com/yahoo/ycsb/Client.html#main(java.lang.String[])"><B>main(String[])</B></A> - 
 Static method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Client.html" title="class in com.yahoo.ycsb">Client</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/ScrambledZipfianGenerator.html#main(java.lang.String[])"><B>main(String[])</B></A> - 
-Static method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb">ScrambledZipfianGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/CommandLine.html#main(java.lang.String[])"><B>main(String[])</B></A> - 
+Static method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/CommandLine.html" title="class in com.yahoo.ycsb">CommandLine</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient5.html#main(java.lang.String[])"><B>main(String[])</B></A> - 
+Static method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient6.html#main(java.lang.String[])"><B>main(String[])</B></A> - 
+Static method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/SkewedLatestGenerator.html#main(java.lang.String[])"><B>main(String[])</B></A> - 
-Static method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/SkewedLatestGenerator.html" title="class in com.yahoo.ycsb">SkewedLatestGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient7.html#main(java.lang.String[])"><B>main(String[])</B></A> - 
+Static method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/ZipfianGenerator.html#main(java.lang.String[])"><B>main(String[])</B></A> - 
-Static method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/ZipfianGenerator.html" title="class in com.yahoo.ycsb">ZipfianGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html#main(java.lang.String[])"><B>main(String[])</B></A> - 
+Static method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html#main(java.lang.String[])"><B>main(String[])</B></A> - 
+Static method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ScrambledZipfianGenerator</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/generator/SkewedLatestGenerator.html#main(java.lang.String[])"><B>main(String[])</B></A> - 
+Static method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/SkewedLatestGenerator.html" title="class in com.yahoo.ycsb.generator">SkewedLatestGenerator</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html#main(java.lang.String[])"><B>main(String[])</B></A> - 
+Static method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ZipfianGenerator</A>
 <DD>&nbsp;
 <DT><A HREF="./com/yahoo/ycsb/workloads/CoreWorkload.html#MAX_SCAN_LENGTH_PROPERTY"><B>MAX_SCAN_LENGTH_PROPERTY</B></A> - 
 Static variable in class com.yahoo.ycsb.workloads.<A HREF="./com/yahoo/ycsb/workloads/CoreWorkload.html" title="class in com.yahoo.ycsb.workloads">CoreWorkload</A>
@@ -371,20 +515,23 @@ Static variable in class com.yahoo.ycsb.workloads.<A HREF="./com/yahoo/ycsb/work
 <DT><A HREF="./com/yahoo/ycsb/workloads/CoreWorkload.html#MAX_SCAN_LENGTH_PROPERTY_DEFAULT"><B>MAX_SCAN_LENGTH_PROPERTY_DEFAULT</B></A> - 
 Static variable in class com.yahoo.ycsb.workloads.<A HREF="./com/yahoo/ycsb/workloads/CoreWorkload.html" title="class in com.yahoo.ycsb.workloads">CoreWorkload</A>
 <DD>The default max scan length.
-<DT><A HREF="./com/yahoo/ycsb/Measurements.html#measure(java.lang.String, int)"><B>measure(String, int)</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Measurements.html" title="class in com.yahoo.ycsb">Measurements</A>
+<DT><A HREF="./com/yahoo/ycsb/measurements/Measurements.html#measure(java.lang.String, int)"><B>measure(String, int)</B></A> - 
+Method in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/Measurements.html" title="class in com.yahoo.ycsb.measurements">Measurements</A>
+<DD>Report a single value of a single metric.
+<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurement.html#measure(int)"><B>measure(int)</B></A> - 
+Method in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/OneMeasurement.html" title="class in com.yahoo.ycsb.measurements">OneMeasurement</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/OneMeasurement.html#measure(int)"><B>measure(int)</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurement.html" title="class in com.yahoo.ycsb">OneMeasurement</A>
+<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurementHistogram.html#measure(int)"><B>measure(int)</B></A> - 
+Method in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb.measurements">OneMeasurementHistogram</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/OneMeasurementHistogram.html#measure(int)"><B>measure(int)</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb">OneMeasurementHistogram</A>
+<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html#measure(int)"><B>measure(int)</B></A> - 
+Method in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb.measurements">OneMeasurementTimeSeries</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/OneMeasurementTimeSeries.html#measure(int)"><B>measure(int)</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb">OneMeasurementTimeSeries</A>
-<DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/Measurements.html" title="class in com.yahoo.ycsb"><B>Measurements</B></A> - Class in <A HREF="./com/yahoo/ycsb/package-summary.html">com.yahoo.ycsb</A><DD>Collects latency measurements, and reports them when requested.<DT><A HREF="./com/yahoo/ycsb/Measurements.html#Measurements(java.util.Properties)"><B>Measurements(Properties)</B></A> - 
-Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Measurements.html" title="class in com.yahoo.ycsb">Measurements</A>
+<DT><A HREF="./com/yahoo/ycsb/measurements/Measurements.html" title="class in com.yahoo.ycsb.measurements"><B>Measurements</B></A> - Class in <A HREF="./com/yahoo/ycsb/measurements/package-summary.html">com.yahoo.ycsb.measurements</A><DD>Collects latency measurements, and reports them when requested.<DT><A HREF="./com/yahoo/ycsb/measurements/Measurements.html#Measurements(java.util.Properties)"><B>Measurements(Properties)</B></A> - 
+Constructor for class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/Measurements.html" title="class in com.yahoo.ycsb.measurements">Measurements</A>
+<DD>Create a new object with the specified properties.
+<DT><A HREF="./com/yahoo/ycsb/db/MongoDbClient.html" title="class in com.yahoo.ycsb.db"><B>MongoDbClient</B></A> - Class in <A HREF="./com/yahoo/ycsb/db/package-summary.html">com.yahoo.ycsb.db</A><DD>MongoDB client for YCSB framework.<DT><A HREF="./com/yahoo/ycsb/db/MongoDbClient.html#MongoDbClient()"><B>MongoDbClient()</B></A> - 
+Constructor for class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/MongoDbClient.html" title="class in com.yahoo.ycsb.db">MongoDbClient</A>
 <DD>&nbsp;
 </DL>
 <HR>
@@ -394,84 +541,126 @@ Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Measurements.html
 <DT><A HREF="./com/yahoo/ycsb/DBFactory.html#newDB(java.lang.String, java.util.Properties)"><B>newDB(String, Properties)</B></A> - 
 Static method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DBFactory.html" title="class in com.yahoo.ycsb">DBFactory</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/CounterGenerator.html#nextInt()"><B>nextInt()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/CounterGenerator.html" title="class in com.yahoo.ycsb">CounterGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/CounterGenerator.html#nextInt()"><B>nextInt()</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/CounterGenerator.html" title="class in com.yahoo.ycsb.generator">CounterGenerator</A>
 <DD>If the generator returns numeric (integer) values, return the next value as an int.
-<DT><A HREF="./com/yahoo/ycsb/DiscreteGenerator.html#nextInt()"><B>nextInt()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DiscreteGenerator.html" title="class in com.yahoo.ycsb">DiscreteGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/DiscreteGenerator.html#nextInt()"><B>nextInt()</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/DiscreteGenerator.html" title="class in com.yahoo.ycsb.generator">DiscreteGenerator</A>
 <DD>If the generator returns numeric (integer) values, return the next value as an int.
-<DT><A HREF="./com/yahoo/ycsb/IntegerGenerator.html#nextInt()"><B>nextInt()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/IntegerGenerator.html" title="class in com.yahoo.ycsb">IntegerGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/IntegerGenerator.html#nextInt()"><B>nextInt()</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/IntegerGenerator.html" title="class in com.yahoo.ycsb.generator">IntegerGenerator</A>
 <DD>Return the next value as an int.
-<DT><A HREF="./com/yahoo/ycsb/ScrambledZipfianGenerator.html#nextInt()"><B>nextInt()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb">ScrambledZipfianGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html#nextInt()"><B>nextInt()</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ScrambledZipfianGenerator</A>
 <DD>Return the next int in the sequence.
-<DT><A HREF="./com/yahoo/ycsb/SkewedLatestGenerator.html#nextInt()"><B>nextInt()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/SkewedLatestGenerator.html" title="class in com.yahoo.ycsb">SkewedLatestGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/SkewedLatestGenerator.html#nextInt()"><B>nextInt()</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/SkewedLatestGenerator.html" title="class in com.yahoo.ycsb.generator">SkewedLatestGenerator</A>
 <DD>Generate the next string in the distribution, skewed Zipfian favoring the items most recently returned by the basis generator.
-<DT><A HREF="./com/yahoo/ycsb/UniformIntegerGenerator.html#nextInt()"><B>nextInt()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/UniformIntegerGenerator.html" title="class in com.yahoo.ycsb">UniformIntegerGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/UniformIntegerGenerator.html#nextInt()"><B>nextInt()</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/UniformIntegerGenerator.html" title="class in com.yahoo.ycsb.generator">UniformIntegerGenerator</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/ZipfianGenerator.html#nextInt(int)"><B>nextInt(int)</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/ZipfianGenerator.html" title="class in com.yahoo.ycsb">ZipfianGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html#nextInt(int)"><B>nextInt(int)</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ZipfianGenerator</A>
 <DD>Generate the next item.
-<DT><A HREF="./com/yahoo/ycsb/ZipfianGenerator.html#nextInt()"><B>nextInt()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/ZipfianGenerator.html" title="class in com.yahoo.ycsb">ZipfianGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html#nextInt()"><B>nextInt()</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ZipfianGenerator</A>
 <DD>Return the next value, skewed by the Zipfian distribution.
-<DT><A HREF="./com/yahoo/ycsb/ScrambledZipfianGenerator.html#nextLong()"><B>nextLong()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb">ScrambledZipfianGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html#nextLong()"><B>nextLong()</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ScrambledZipfianGenerator</A>
 <DD>Return the next long in the sequence.
-<DT><A HREF="./com/yahoo/ycsb/ZipfianGenerator.html#nextLong(long)"><B>nextLong(long)</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/ZipfianGenerator.html" title="class in com.yahoo.ycsb">ZipfianGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html#nextLong(long)"><B>nextLong(long)</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ZipfianGenerator</A>
 <DD>Generate the next item as a long.
-<DT><A HREF="./com/yahoo/ycsb/ZipfianGenerator.html#nextLong()"><B>nextLong()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/ZipfianGenerator.html" title="class in com.yahoo.ycsb">ZipfianGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html#nextLong()"><B>nextLong()</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ZipfianGenerator</A>
 <DD>Return the next value, skewed by the Zipfian distribution.
-<DT><A HREF="./com/yahoo/ycsb/DiscreteGenerator.html#nextString()"><B>nextString()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DiscreteGenerator.html" title="class in com.yahoo.ycsb">DiscreteGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/DiscreteGenerator.html#nextString()"><B>nextString()</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/DiscreteGenerator.html" title="class in com.yahoo.ycsb.generator">DiscreteGenerator</A>
 <DD>Generate the next string in the distribution.
-<DT><A HREF="./com/yahoo/ycsb/Generator.html#nextString()"><B>nextString()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Generator.html" title="class in com.yahoo.ycsb">Generator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/Generator.html#nextString()"><B>nextString()</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/Generator.html" title="class in com.yahoo.ycsb.generator">Generator</A>
 <DD>Generate the next string in the distribution.
-<DT><A HREF="./com/yahoo/ycsb/IntegerGenerator.html#nextString()"><B>nextString()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/IntegerGenerator.html" title="class in com.yahoo.ycsb">IntegerGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/IntegerGenerator.html#nextString()"><B>nextString()</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/IntegerGenerator.html" title="class in com.yahoo.ycsb.generator">IntegerGenerator</A>
 <DD>Generate the next string in the distribution.
-<DT><A HREF="./com/yahoo/ycsb/UniformGenerator.html#nextString()"><B>nextString()</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/UniformGenerator.html" title="class in com.yahoo.ycsb">UniformGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/UniformGenerator.html#nextString()"><B>nextString()</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/UniformGenerator.html" title="class in com.yahoo.ycsb.generator">UniformGenerator</A>
 <DD>Generate the next string in the distribution.
+<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html#NoMatchingRecord"><B>NoMatchingRecord</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
+<DD>&nbsp;
 </DL>
 <HR>
 <A NAME="_O_"><!-- --></A><H2>
 <B>O</B></H2>
 <DL>
-<DT><A HREF="./com/yahoo/ycsb/OneMeasurement.html" title="class in com.yahoo.ycsb"><B>OneMeasurement</B></A> - Class in <A HREF="./com/yahoo/ycsb/package-summary.html">com.yahoo.ycsb</A><DD>A single measured metric (e.g.<DT><A HREF="./com/yahoo/ycsb/OneMeasurement.html#OneMeasurement(java.lang.String)"><B>OneMeasurement(String)</B></A> - 
-Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurement.html" title="class in com.yahoo.ycsb">OneMeasurement</A>
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient5.html#Ok"><B>Ok</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient6.html#Ok"><B>Ok</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb"><B>OneMeasurementHistogram</B></A> - Class in <A HREF="./com/yahoo/ycsb/package-summary.html">com.yahoo.ycsb</A><DD>Take measurements and maintain a histogram of a given metric, such as READ LATENCY.<DT><A HREF="./com/yahoo/ycsb/OneMeasurementHistogram.html#OneMeasurementHistogram(java.lang.String, java.util.Properties)"><B>OneMeasurementHistogram(String, Properties)</B></A> - 
-Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb">OneMeasurementHistogram</A>
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient7.html#Ok"><B>Ok</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb"><B>OneMeasurementTimeSeries</B></A> - Class in <A HREF="./com/yahoo/ycsb/package-summary.html">com.yahoo.ycsb</A><DD>A time series measurement of a metric, such as READ LATENCY.<DT><A HREF="./com/yahoo/ycsb/OneMeasurementTimeSeries.html#OneMeasurementTimeSeries(java.lang.String, java.util.Properties)"><B>OneMeasurementTimeSeries(String, Properties)</B></A> - 
-Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb">OneMeasurementTimeSeries</A>
+<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html#Ok"><B>Ok</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurement.html" title="class in com.yahoo.ycsb.measurements"><B>OneMeasurement</B></A> - Class in <A HREF="./com/yahoo/ycsb/measurements/package-summary.html">com.yahoo.ycsb.measurements</A><DD>A single measured metric (such as READ LATENCY)<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurement.html#OneMeasurement(java.lang.String)"><B>OneMeasurement(String)</B></A> - 
+Constructor for class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/OneMeasurement.html" title="class in com.yahoo.ycsb.measurements">OneMeasurement</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb.measurements"><B>OneMeasurementHistogram</B></A> - Class in <A HREF="./com/yahoo/ycsb/measurements/package-summary.html">com.yahoo.ycsb.measurements</A><DD>Take measurements and maintain a histogram of a given metric, such as READ LATENCY.<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurementHistogram.html#OneMeasurementHistogram(java.lang.String, java.util.Properties)"><B>OneMeasurementHistogram(String, Properties)</B></A> - 
+Constructor for class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb.measurements">OneMeasurementHistogram</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb.measurements"><B>OneMeasurementTimeSeries</B></A> - Class in <A HREF="./com/yahoo/ycsb/measurements/package-summary.html">com.yahoo.ycsb.measurements</A><DD>A time series measurement of a metric, such as READ LATENCY.<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html#OneMeasurementTimeSeries(java.lang.String, java.util.Properties)"><B>OneMeasurementTimeSeries(String, Properties)</B></A> - 
+Constructor for class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb.measurements">OneMeasurementTimeSeries</A>
 <DD>&nbsp;
 <DT><A HREF="./com/yahoo/ycsb/Client.html#OPERATION_COUNT_PROPERTY"><B>OPERATION_COUNT_PROPERTY</B></A> - 
 Static variable in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Client.html" title="class in com.yahoo.ycsb">Client</A>
 <DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient5.html#OPERATION_RETRY_PROPERTY"><B>OPERATION_RETRY_PROPERTY</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient6.html#OPERATION_RETRY_PROPERTY"><B>OPERATION_RETRY_PROPERTY</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient7.html#OPERATION_RETRY_PROPERTY"><B>OPERATION_RETRY_PROPERTY</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient5.html#OPERATION_RETRY_PROPERTY_DEFAULT"><B>OPERATION_RETRY_PROPERTY_DEFAULT</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient6.html#OPERATION_RETRY_PROPERTY_DEFAULT"><B>OPERATION_RETRY_PROPERTY_DEFAULT</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient7.html#OPERATION_RETRY_PROPERTY_DEFAULT"><B>OPERATION_RETRY_PROPERTY_DEFAULT</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient5.html#OperationRetries"><B>OperationRetries</B></A> - 
+Variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient6.html#OperationRetries"><B>OperationRetries</B></A> - 
+Variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient7.html#OperationRetries"><B>OperationRetries</B></A> - 
+Variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A>
+<DD>&nbsp;
 </DL>
 <HR>
 <A NAME="_P_"><!-- --></A><H2>
 <B>P</B></H2>
 <DL>
-<DT><A HREF="./com/yahoo/ycsb/Measurements.html#printReport(java.io.PrintStream)"><B>printReport(PrintStream)</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Measurements.html" title="class in com.yahoo.ycsb">Measurements</A>
+<DT><A HREF="./com/yahoo/ycsb/measurements/Measurements.html#printReport(java.io.PrintStream)"><B>printReport(PrintStream)</B></A> - 
+Method in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/Measurements.html" title="class in com.yahoo.ycsb.measurements">Measurements</A>
+<DD>Print the full report to the listed PrintStream.
+<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurement.html#printReport(java.io.PrintStream)"><B>printReport(PrintStream)</B></A> - 
+Method in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/OneMeasurement.html" title="class in com.yahoo.ycsb.measurements">OneMeasurement</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/OneMeasurement.html#printReport(java.io.PrintStream)"><B>printReport(PrintStream)</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurement.html" title="class in com.yahoo.ycsb">OneMeasurement</A>
+<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurementHistogram.html#printReport(java.io.PrintStream)"><B>printReport(PrintStream)</B></A> - 
+Method in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb.measurements">OneMeasurementHistogram</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/OneMeasurementHistogram.html#printReport(java.io.PrintStream)"><B>printReport(PrintStream)</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb">OneMeasurementHistogram</A>
-<DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/OneMeasurementTimeSeries.html#printReport(java.io.PrintStream)"><B>printReport(PrintStream)</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb">OneMeasurementTimeSeries</A>
+<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html#printReport(java.io.PrintStream)"><B>printReport(PrintStream)</B></A> - 
+Method in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb.measurements">OneMeasurementTimeSeries</A>
 <DD>&nbsp;
 </DL>
 <HR>
@@ -481,6 +670,21 @@ Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurementTimeSerie
 <DT><A HREF="./com/yahoo/ycsb/BasicDB.html#read(java.lang.String, java.lang.String, java.util.Set, java.util.HashMap)"><B>read(String, String, Set&lt;String&gt;, HashMap&lt;String, String&gt;)</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/BasicDB.html" title="class in com.yahoo.ycsb">BasicDB</A>
 <DD>Read a record from the database.
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient5.html#read(java.lang.String, java.lang.String, java.util.Set, java.util.HashMap)"><B>read(String, String, Set&lt;String&gt;, HashMap&lt;String, String&gt;)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A>
+<DD>Read a record from the database.
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient6.html#read(java.lang.String, java.lang.String, java.util.Set, java.util.HashMap)"><B>read(String, String, Set&lt;String&gt;, HashMap&lt;String, String&gt;)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A>
+<DD>Read a record from the database.
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient7.html#read(java.lang.String, java.lang.String, java.util.Set, java.util.HashMap)"><B>read(String, String, Set&lt;String&gt;, HashMap&lt;String, String&gt;)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A>
+<DD>Read a record from the database.
+<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html#read(java.lang.String, java.lang.String, java.util.Set, java.util.HashMap)"><B>read(String, String, Set&lt;String&gt;, HashMap&lt;String, String&gt;)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
+<DD>Read a record from the database.
+<DT><A HREF="./com/yahoo/ycsb/db/MongoDbClient.html#read(java.lang.String, java.lang.String, java.util.Set, java.util.HashMap)"><B>read(String, String, Set&lt;String&gt;, HashMap&lt;String, String&gt;)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/MongoDbClient.html" title="class in com.yahoo.ycsb.db">MongoDbClient</A>
+<DD>&nbsp;
 <DT><A HREF="./com/yahoo/ycsb/DB.html#read(java.lang.String, java.lang.String, java.util.Set, java.util.HashMap)"><B>read(String, String, Set&lt;String&gt;, HashMap&lt;String, String&gt;)</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DB.html" title="class in com.yahoo.ycsb">DB</A>
 <DD>Read a record from the database.
@@ -508,17 +712,17 @@ Static variable in class com.yahoo.ycsb.workloads.<A HREF="./com/yahoo/ycsb/work
 <DT><A HREF="./com/yahoo/ycsb/Client.html#RECORD_COUNT_PROPERTY"><B>RECORD_COUNT_PROPERTY</B></A> - 
 Static variable in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Client.html" title="class in com.yahoo.ycsb">Client</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/Measurements.html#reportReturnCode(java.lang.String, int)"><B>reportReturnCode(String, int)</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Measurements.html" title="class in com.yahoo.ycsb">Measurements</A>
-<DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/OneMeasurement.html#reportReturnCode(int)"><B>reportReturnCode(int)</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurement.html" title="class in com.yahoo.ycsb">OneMeasurement</A>
+<DT><A HREF="./com/yahoo/ycsb/measurements/Measurements.html#reportReturnCode(java.lang.String, int)"><B>reportReturnCode(String, int)</B></A> - 
+Method in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/Measurements.html" title="class in com.yahoo.ycsb.measurements">Measurements</A>
+<DD>Report a return code for a single DB operaiton.
+<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurement.html#reportReturnCode(int)"><B>reportReturnCode(int)</B></A> - 
+Method in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/OneMeasurement.html" title="class in com.yahoo.ycsb.measurements">OneMeasurement</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/OneMeasurementHistogram.html#reportReturnCode(int)"><B>reportReturnCode(int)</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb">OneMeasurementHistogram</A>
+<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurementHistogram.html#reportReturnCode(int)"><B>reportReturnCode(int)</B></A> - 
+Method in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb.measurements">OneMeasurementHistogram</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/OneMeasurementTimeSeries.html#reportReturnCode(int)"><B>reportReturnCode(int)</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb">OneMeasurementTimeSeries</A>
+<DT><A HREF="./com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html#reportReturnCode(int)"><B>reportReturnCode(int)</B></A> - 
+Method in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb.measurements">OneMeasurementTimeSeries</A>
 <DD>&nbsp;
 <DT><A HREF="./com/yahoo/ycsb/workloads/CoreWorkload.html#REQUEST_DISTRIBUTION_PROPERTY"><B>REQUEST_DISTRIBUTION_PROPERTY</B></A> - 
 Static variable in class com.yahoo.ycsb.workloads.<A HREF="./com/yahoo/ycsb/workloads/CoreWorkload.html" title="class in com.yahoo.ycsb.workloads">CoreWorkload</A>
@@ -534,6 +738,21 @@ Static variable in class com.yahoo.ycsb.workloads.<A HREF="./com/yahoo/ycsb/work
 <DT><A HREF="./com/yahoo/ycsb/BasicDB.html#scan(java.lang.String, java.lang.String, int, java.util.Set, java.util.Vector)"><B>scan(String, String, int, Set&lt;String&gt;, Vector&lt;HashMap&lt;String, String&gt;&gt;)</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/BasicDB.html" title="class in com.yahoo.ycsb">BasicDB</A>
 <DD>Perform a range scan for a set of records in the database.
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient5.html#scan(java.lang.String, java.lang.String, int, java.util.Set, java.util.Vector)"><B>scan(String, String, int, Set&lt;String&gt;, Vector&lt;HashMap&lt;String, String&gt;&gt;)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A>
+<DD>Perform a range scan for a set of records in the database.
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient6.html#scan(java.lang.String, java.lang.String, int, java.util.Set, java.util.Vector)"><B>scan(String, String, int, Set&lt;String&gt;, Vector&lt;HashMap&lt;String, String&gt;&gt;)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A>
+<DD>Perform a range scan for a set of records in the database.
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient7.html#scan(java.lang.String, java.lang.String, int, java.util.Set, java.util.Vector)"><B>scan(String, String, int, Set&lt;String&gt;, Vector&lt;HashMap&lt;String, String&gt;&gt;)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A>
+<DD>Perform a range scan for a set of records in the database.
+<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html#scan(java.lang.String, java.lang.String, int, java.util.Set, java.util.Vector)"><B>scan(String, String, int, Set&lt;String&gt;, Vector&lt;HashMap&lt;String, String&gt;&gt;)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
+<DD>Perform a range scan for a set of records in the database.
+<DT><A HREF="./com/yahoo/ycsb/db/MongoDbClient.html#scan(java.lang.String, java.lang.String, int, java.util.Set, java.util.Vector)"><B>scan(String, String, int, Set&lt;String&gt;, Vector&lt;HashMap&lt;String, String&gt;&gt;)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/MongoDbClient.html" title="class in com.yahoo.ycsb.db">MongoDbClient</A>
+<DD>&nbsp;
 <DT><A HREF="./com/yahoo/ycsb/DB.html#scan(java.lang.String, java.lang.String, int, java.util.Set, java.util.Vector)"><B>scan(String, String, int, Set&lt;String&gt;, Vector&lt;HashMap&lt;String, String&gt;&gt;)</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DB.html" title="class in com.yahoo.ycsb">DB</A>
 <DD>Perform a range scan for a set of records in the database.
@@ -552,14 +771,17 @@ Static variable in class com.yahoo.ycsb.workloads.<A HREF="./com/yahoo/ycsb/work
 <DT><A HREF="./com/yahoo/ycsb/workloads/CoreWorkload.html#SCAN_PROPORTION_PROPERTY_DEFAULT"><B>SCAN_PROPORTION_PROPERTY_DEFAULT</B></A> - 
 Static variable in class com.yahoo.ycsb.workloads.<A HREF="./com/yahoo/ycsb/workloads/CoreWorkload.html" title="class in com.yahoo.ycsb.workloads">CoreWorkload</A>
 <DD>The default proportion of transactions that are scans.
-<DT><A HREF="./com/yahoo/ycsb/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb"><B>ScrambledZipfianGenerator</B></A> - Class in <A HREF="./com/yahoo/ycsb/package-summary.html">com.yahoo.ycsb</A><DD>A generator of a zipfian distribution.<DT><A HREF="./com/yahoo/ycsb/ScrambledZipfianGenerator.html#ScrambledZipfianGenerator(long)"><B>ScrambledZipfianGenerator(long)</B></A> - 
-Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb">ScrambledZipfianGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb.generator"><B>ScrambledZipfianGenerator</B></A> - Class in <A HREF="./com/yahoo/ycsb/generator/package-summary.html">com.yahoo.ycsb.generator</A><DD>A generator of a zipfian distribution.<DT><A HREF="./com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html#ScrambledZipfianGenerator(long)"><B>ScrambledZipfianGenerator(long)</B></A> - 
+Constructor for class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ScrambledZipfianGenerator</A>
 <DD>Create a zipfian generator for the specified number of items.
-<DT><A HREF="./com/yahoo/ycsb/ScrambledZipfianGenerator.html#ScrambledZipfianGenerator(long, long)"><B>ScrambledZipfianGenerator(long, long)</B></A> - 
-Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb">ScrambledZipfianGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html#ScrambledZipfianGenerator(long, long)"><B>ScrambledZipfianGenerator(long, long)</B></A> - 
+Constructor for class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ScrambledZipfianGenerator</A>
 <DD>Create a zipfian generator for items between min and max.
-<DT><A HREF="./com/yahoo/ycsb/IntegerGenerator.html#setLastInt(int)"><B>setLastInt(int)</B></A> - 
-Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/IntegerGenerator.html" title="class in com.yahoo.ycsb">IntegerGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html#ServerError"><B>ServerError</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/generator/IntegerGenerator.html#setLastInt(int)"><B>setLastInt(int)</B></A> - 
+Method in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/IntegerGenerator.html" title="class in com.yahoo.ycsb.generator">IntegerGenerator</A>
 <DD>Set the last value generated.
 <DT><A HREF="./com/yahoo/ycsb/DB.html#setProperties(java.util.Properties)"><B>setProperties(Properties)</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DB.html" title="class in com.yahoo.ycsb">DB</A>
@@ -567,8 +789,8 @@ Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DB.html" title="class i
 <DT><A HREF="./com/yahoo/ycsb/DBWrapper.html#setProperties(java.util.Properties)"><B>setProperties(Properties)</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DBWrapper.html" title="class in com.yahoo.ycsb">DBWrapper</A>
 <DD>Set the properties for this DB.
-<DT><A HREF="./com/yahoo/ycsb/Measurements.html#setProperties(java.util.Properties)"><B>setProperties(Properties)</B></A> - 
-Static method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Measurements.html" title="class in com.yahoo.ycsb">Measurements</A>
+<DT><A HREF="./com/yahoo/ycsb/measurements/Measurements.html#setProperties(java.util.Properties)"><B>setProperties(Properties)</B></A> - 
+Static method in class com.yahoo.ycsb.measurements.<A HREF="./com/yahoo/ycsb/measurements/Measurements.html" title="class in com.yahoo.ycsb.measurements">Measurements</A>
 <DD>&nbsp;
 <DT><A HREF="./com/yahoo/ycsb/BasicDB.html#SIMULATE_DELAY"><B>SIMULATE_DELAY</B></A> - 
 Static variable in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/BasicDB.html" title="class in com.yahoo.ycsb">BasicDB</A>
@@ -576,14 +798,17 @@ Static variable in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/BasicDB.html"
 <DT><A HREF="./com/yahoo/ycsb/BasicDB.html#SIMULATE_DELAY_DEFAULT"><B>SIMULATE_DELAY_DEFAULT</B></A> - 
 Static variable in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/BasicDB.html" title="class in com.yahoo.ycsb">BasicDB</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/SkewedLatestGenerator.html" title="class in com.yahoo.ycsb"><B>SkewedLatestGenerator</B></A> - Class in <A HREF="./com/yahoo/ycsb/package-summary.html">com.yahoo.ycsb</A><DD>Generate a popularity distribution of items, skewed to favor recent items significantly more than older items.<DT><A HREF="./com/yahoo/ycsb/SkewedLatestGenerator.html#SkewedLatestGenerator(com.yahoo.ycsb.CounterGenerator)"><B>SkewedLatestGenerator(CounterGenerator)</B></A> - 
-Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/SkewedLatestGenerator.html" title="class in com.yahoo.ycsb">SkewedLatestGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/SkewedLatestGenerator.html" title="class in com.yahoo.ycsb.generator"><B>SkewedLatestGenerator</B></A> - Class in <A HREF="./com/yahoo/ycsb/generator/package-summary.html">com.yahoo.ycsb.generator</A><DD>Generate a popularity distribution of items, skewed to favor recent items significantly more than older items.<DT><A HREF="./com/yahoo/ycsb/generator/SkewedLatestGenerator.html#SkewedLatestGenerator(com.yahoo.ycsb.generator.CounterGenerator)"><B>SkewedLatestGenerator(CounterGenerator)</B></A> - 
+Constructor for class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/SkewedLatestGenerator.html" title="class in com.yahoo.ycsb.generator">SkewedLatestGenerator</A>
 <DD>&nbsp;
 </DL>
 <HR>
 <A NAME="_T_"><!-- --></A><H2>
 <B>T</B></H2>
 <DL>
+<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html#tableLock"><B>tableLock</B></A> - 
+Static variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
+<DD>&nbsp;
 <DT><A HREF="./com/yahoo/ycsb/workloads/CoreWorkload.html#TABLENAME"><B>TABLENAME</B></A> - 
 Static variable in class com.yahoo.ycsb.workloads.<A HREF="./com/yahoo/ycsb/workloads/CoreWorkload.html" title="class in com.yahoo.ycsb.workloads">CoreWorkload</A>
 <DD>The name of the database table to run queries against.
@@ -592,11 +817,11 @@ Static variable in class com.yahoo.ycsb.workloads.<A HREF="./com/yahoo/ycsb/work
 <A NAME="_U_"><!-- --></A><H2>
 <B>U</B></H2>
 <DL>
-<DT><A HREF="./com/yahoo/ycsb/UniformGenerator.html" title="class in com.yahoo.ycsb"><B>UniformGenerator</B></A> - Class in <A HREF="./com/yahoo/ycsb/package-summary.html">com.yahoo.ycsb</A><DD>An expression that generates a random integer in the specified range<DT><A HREF="./com/yahoo/ycsb/UniformGenerator.html#UniformGenerator(java.util.Vector)"><B>UniformGenerator(Vector&lt;String&gt;)</B></A> - 
-Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/UniformGenerator.html" title="class in com.yahoo.ycsb">UniformGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/UniformGenerator.html" title="class in com.yahoo.ycsb.generator"><B>UniformGenerator</B></A> - Class in <A HREF="./com/yahoo/ycsb/generator/package-summary.html">com.yahoo.ycsb.generator</A><DD>An expression that generates a random integer in the specified range<DT><A HREF="./com/yahoo/ycsb/generator/UniformGenerator.html#UniformGenerator(java.util.Vector)"><B>UniformGenerator(Vector&lt;String&gt;)</B></A> - 
+Constructor for class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/UniformGenerator.html" title="class in com.yahoo.ycsb.generator">UniformGenerator</A>
 <DD>Creates a generator that will return strings from the specified set uniformly randomly
-<DT><A HREF="./com/yahoo/ycsb/UniformIntegerGenerator.html" title="class in com.yahoo.ycsb"><B>UniformIntegerGenerator</B></A> - Class in <A HREF="./com/yahoo/ycsb/package-summary.html">com.yahoo.ycsb</A><DD>Generates integers randomly uniform from an interval.<DT><A HREF="./com/yahoo/ycsb/UniformIntegerGenerator.html#UniformIntegerGenerator(int, int)"><B>UniformIntegerGenerator(int, int)</B></A> - 
-Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/UniformIntegerGenerator.html" title="class in com.yahoo.ycsb">UniformIntegerGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/UniformIntegerGenerator.html" title="class in com.yahoo.ycsb.generator"><B>UniformIntegerGenerator</B></A> - Class in <A HREF="./com/yahoo/ycsb/generator/package-summary.html">com.yahoo.ycsb.generator</A><DD>Generates integers randomly uniform from an interval.<DT><A HREF="./com/yahoo/ycsb/generator/UniformIntegerGenerator.html#UniformIntegerGenerator(int, int)"><B>UniformIntegerGenerator(int, int)</B></A> - 
+Constructor for class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/UniformIntegerGenerator.html" title="class in com.yahoo.ycsb.generator">UniformIntegerGenerator</A>
 <DD>Creates a generator that will return integers uniformly randomly from the interval [lb,ub] inclusive (that is, lb and ub are possible values)
 <DT><A HREF="./com/yahoo/ycsb/UnknownDBException.html" title="class in com.yahoo.ycsb"><B>UnknownDBException</B></A> - Exception in <A HREF="./com/yahoo/ycsb/package-summary.html">com.yahoo.ycsb</A><DD>Could not create the specified DB.<DT><A HREF="./com/yahoo/ycsb/UnknownDBException.html#UnknownDBException(java.lang.String)"><B>UnknownDBException(String)</B></A> - 
 Constructor for exception com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/UnknownDBException.html" title="class in com.yahoo.ycsb">UnknownDBException</A>
@@ -613,6 +838,21 @@ Constructor for exception com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/UnknownDBExce
 <DT><A HREF="./com/yahoo/ycsb/BasicDB.html#update(java.lang.String, java.lang.String, java.util.HashMap)"><B>update(String, String, HashMap&lt;String, String&gt;)</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/BasicDB.html" title="class in com.yahoo.ycsb">BasicDB</A>
 <DD>Update a record in the database.
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient5.html#update(java.lang.String, java.lang.String, java.util.HashMap)"><B>update(String, String, HashMap&lt;String, String&gt;)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db">CassandraClient5</A>
+<DD>Update a record in the database.
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient6.html#update(java.lang.String, java.lang.String, java.util.HashMap)"><B>update(String, String, HashMap&lt;String, String&gt;)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db">CassandraClient6</A>
+<DD>Update a record in the database.
+<DT><A HREF="./com/yahoo/ycsb/db/CassandraClient7.html#update(java.lang.String, java.lang.String, java.util.HashMap)"><B>update(String, String, HashMap&lt;String, String&gt;)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db">CassandraClient7</A>
+<DD>Update a record in the database.
+<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html#update(java.lang.String, java.lang.String, java.util.HashMap)"><B>update(String, String, HashMap&lt;String, String&gt;)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
+<DD>Update a record in the database.
+<DT><A HREF="./com/yahoo/ycsb/db/MongoDbClient.html#update(java.lang.String, java.lang.String, java.util.HashMap)"><B>update(String, String, HashMap&lt;String, String&gt;)</B></A> - 
+Method in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/MongoDbClient.html" title="class in com.yahoo.ycsb.db">MongoDbClient</A>
+<DD>&nbsp;
 <DT><A HREF="./com/yahoo/ycsb/DB.html#update(java.lang.String, java.lang.String, java.util.HashMap)"><B>update(String, String, HashMap&lt;String, String&gt;)</B></A> - 
 Method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/DB.html" title="class in com.yahoo.ycsb">DB</A>
 <DD>Update a record in the database.
@@ -628,6 +868,9 @@ Static variable in class com.yahoo.ycsb.workloads.<A HREF="./com/yahoo/ycsb/work
 <DT><A HREF="./com/yahoo/ycsb/Client.html#usageMessage()"><B>usageMessage()</B></A> - 
 Static method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Client.html" title="class in com.yahoo.ycsb">Client</A>
 <DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/CommandLine.html#usageMessage()"><B>usageMessage()</B></A> - 
+Static method in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/CommandLine.html" title="class in com.yahoo.ycsb">CommandLine</A>
+<DD>&nbsp;
 <DT><A HREF="./com/yahoo/ycsb/Utils.html" title="class in com.yahoo.ycsb"><B>Utils</B></A> - Class in <A HREF="./com/yahoo/ycsb/package-summary.html">com.yahoo.ycsb</A><DD>Utility functions.<DT><A HREF="./com/yahoo/ycsb/Utils.html#Utils()"><B>Utils()</B></A> - 
 Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/Utils.html" title="class in com.yahoo.ycsb">Utils</A>
 <DD>&nbsp;
@@ -670,30 +913,50 @@ Constructor for exception com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/WorkloadExcep
 <A NAME="_Z_"><!-- --></A><H2>
 <B>Z</B></H2>
 <DL>
-<DT><A HREF="./com/yahoo/ycsb/ScrambledZipfianGenerator.html#ZETAN"><B>ZETAN</B></A> - 
-Static variable in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb">ScrambledZipfianGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html#ZETAN"><B>ZETAN</B></A> - 
+Static variable in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ScrambledZipfianGenerator</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/ZipfianGenerator.html#ZIPFIAN_CONSTANT"><B>ZIPFIAN_CONSTANT</B></A> - 
-Static variable in class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/ZipfianGenerator.html" title="class in com.yahoo.ycsb">ZipfianGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html#ZIPFIAN_CONSTANT"><B>ZIPFIAN_CONSTANT</B></A> - 
+Static variable in class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ZipfianGenerator</A>
 <DD>&nbsp;
-<DT><A HREF="./com/yahoo/ycsb/ZipfianGenerator.html" title="class in com.yahoo.ycsb"><B>ZipfianGenerator</B></A> - Class in <A HREF="./com/yahoo/ycsb/package-summary.html">com.yahoo.ycsb</A><DD>A generator of a zipfian distribution.<DT><A HREF="./com/yahoo/ycsb/ZipfianGenerator.html#ZipfianGenerator(long)"><B>ZipfianGenerator(long)</B></A> - 
-Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/ZipfianGenerator.html" title="class in com.yahoo.ycsb">ZipfianGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html" title="class in com.yahoo.ycsb.generator"><B>ZipfianGenerator</B></A> - Class in <A HREF="./com/yahoo/ycsb/generator/package-summary.html">com.yahoo.ycsb.generator</A><DD>A generator of a zipfian distribution.<DT><A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html#ZipfianGenerator(long)"><B>ZipfianGenerator(long)</B></A> - 
+Constructor for class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ZipfianGenerator</A>
 <DD>Create a zipfian generator for the specified number of items.
-<DT><A HREF="./com/yahoo/ycsb/ZipfianGenerator.html#ZipfianGenerator(long, long)"><B>ZipfianGenerator(long, long)</B></A> - 
-Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/ZipfianGenerator.html" title="class in com.yahoo.ycsb">ZipfianGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html#ZipfianGenerator(long, long)"><B>ZipfianGenerator(long, long)</B></A> - 
+Constructor for class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ZipfianGenerator</A>
 <DD>Create a zipfian generator for items between min and max.
-<DT><A HREF="./com/yahoo/ycsb/ZipfianGenerator.html#ZipfianGenerator(long, double)"><B>ZipfianGenerator(long, double)</B></A> - 
-Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/ZipfianGenerator.html" title="class in com.yahoo.ycsb">ZipfianGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html#ZipfianGenerator(long, double)"><B>ZipfianGenerator(long, double)</B></A> - 
+Constructor for class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ZipfianGenerator</A>
 <DD>Create a zipfian generator for the specified number of items using the specified zipfian constant.
-<DT><A HREF="./com/yahoo/ycsb/ZipfianGenerator.html#ZipfianGenerator(long, long, double)"><B>ZipfianGenerator(long, long, double)</B></A> - 
-Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/ZipfianGenerator.html" title="class in com.yahoo.ycsb">ZipfianGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html#ZipfianGenerator(long, long, double)"><B>ZipfianGenerator(long, long, double)</B></A> - 
+Constructor for class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ZipfianGenerator</A>
 <DD>Create a zipfian generator for items between min and max (inclusive) for the specified zipfian constant.
-<DT><A HREF="./com/yahoo/ycsb/ZipfianGenerator.html#ZipfianGenerator(long, long, double, double)"><B>ZipfianGenerator(long, long, double, double)</B></A> - 
-Constructor for class com.yahoo.ycsb.<A HREF="./com/yahoo/ycsb/ZipfianGenerator.html" title="class in com.yahoo.ycsb">ZipfianGenerator</A>
+<DT><A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html#ZipfianGenerator(long, long, double, double)"><B>ZipfianGenerator(long, long, double, double)</B></A> - 
+Constructor for class com.yahoo.ycsb.generator.<A HREF="./com/yahoo/ycsb/generator/ZipfianGenerator.html" title="class in com.yahoo.ycsb.generator">ZipfianGenerator</A>
 <DD>Create a zipfian generator for items between min and max (inclusive) for the specified zipfian constant, using the precomputed value of zeta.
 </DL>
 <HR>
-<A HREF="#_A_">A</A> <A HREF="#_B_">B</A> <A HREF="#_C_">C</A> <A HREF="#_D_">D</A> <A HREF="#_F_">F</A> <A HREF="#_G_">G</A> <A HREF="#_H_">H</A> <A HREF="#_I_">I</A> <A HREF="#_L_">L</A> <A HREF="#_M_">M</A> <A HREF="#_N_">N</A> <A HREF="#_O_">O</A> <A HREF="#_P_">P</A> <A HREF="#_R_">R</A> <A HREF="#_S_">S</A> <A HREF="#_T_">T</A> <A HREF="#_U_">U</A> <A HREF="#_V_">V</A> <A HREF="#_W_">W</A> <A HREF="#_Z_">Z</A> 
+<A NAME="___"><!-- --></A><H2>
+<B>_</B></H2>
+<DL>
+<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html#_columnFamily"><B>_columnFamily</B></A> - 
+Variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html#_columnFamilyBytes"><B>_columnFamilyBytes</B></A> - 
+Variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html#_debug"><B>_debug</B></A> - 
+Variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html#_hTable"><B>_hTable</B></A> - 
+Variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
+<DD>&nbsp;
+<DT><A HREF="./com/yahoo/ycsb/db/HBaseClient.html#_table"><B>_table</B></A> - 
+Variable in class com.yahoo.ycsb.db.<A HREF="./com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db">HBaseClient</A>
+<DD>&nbsp;
+</DL>
+<HR>
+<A HREF="#_A_">A</A> <A HREF="#_B_">B</A> <A HREF="#_C_">C</A> <A HREF="#_D_">D</A> <A HREF="#_E_">E</A> <A HREF="#_F_">F</A> <A HREF="#_G_">G</A> <A HREF="#_H_">H</A> <A HREF="#_I_">I</A> <A HREF="#_L_">L</A> <A HREF="#_M_">M</A> <A HREF="#_N_">N</A> <A HREF="#_O_">O</A> <A HREF="#_P_">P</A> <A HREF="#_R_">R</A> <A HREF="#_S_">S</A> <A HREF="#_T_">T</A> <A HREF="#_U_">U</A> <A HREF="#_V_">V</A> <A HREF="#_W_">W</A> <A HREF="#_Z_">Z</A> <A HREF="#___">_</A> 
 
 <!-- ======= START OF BOTTOM NAVBAR ====== -->
 <A NAME="navbar_bottom"><!-- --></A>
diff --git a/doc/javadoc/index.html b/doc/javadoc/index.html
index f0d2fa68a278e1bd805affdcced6e06775f16777..4d37a41ff3cd576020c519172f3b337f60c4b4d4 100644
--- a/doc/javadoc/index.html
+++ b/doc/javadoc/index.html
@@ -2,7 +2,7 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc on Fri Apr 23 10:24:26 PDT 2010-->
+<!-- Generated by javadoc on Wed May 12 14:51:53 PDT 2010-->
 <TITLE>
 Generated Documentation (Untitled)
 </TITLE>
diff --git a/doc/javadoc/overview-frame.html b/doc/javadoc/overview-frame.html
index 53bef5b5b03a00ef40115d4a9868ae0e2d177b29..4fb6a8e96220f86bb62584473f8f08b77a1fd6d4 100644
--- a/doc/javadoc/overview-frame.html
+++ b/doc/javadoc/overview-frame.html
@@ -2,12 +2,12 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
-Overview
+Overview List
 </TITLE>
 
-<META NAME="keywords" CONTENT="Overview">
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
@@ -32,6 +32,12 @@ Packages</FONT>
 <BR>
 <FONT CLASS="FrameItemFont"><A HREF="com/yahoo/ycsb/package-frame.html" target="packageFrame">com.yahoo.ycsb</A></FONT>
 <BR>
+<FONT CLASS="FrameItemFont"><A HREF="com/yahoo/ycsb/db/package-frame.html" target="packageFrame">com.yahoo.ycsb.db</A></FONT>
+<BR>
+<FONT CLASS="FrameItemFont"><A HREF="com/yahoo/ycsb/generator/package-frame.html" target="packageFrame">com.yahoo.ycsb.generator</A></FONT>
+<BR>
+<FONT CLASS="FrameItemFont"><A HREF="com/yahoo/ycsb/measurements/package-frame.html" target="packageFrame">com.yahoo.ycsb.measurements</A></FONT>
+<BR>
 <FONT CLASS="FrameItemFont"><A HREF="com/yahoo/ycsb/workloads/package-frame.html" target="packageFrame">com.yahoo.ycsb.workloads</A></FONT>
 <BR>
 </TD>
diff --git a/doc/javadoc/overview-summary.html b/doc/javadoc/overview-summary.html
index 020204afbcfa51de29328c5b7af42413f8960b06..b73bd3b31eb24d0bb13ec1e369175d5241abfab2 100644
--- a/doc/javadoc/overview-summary.html
+++ b/doc/javadoc/overview-summary.html
@@ -2,19 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:26 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
 Overview
 </TITLE>
 
-<META NAME="keywords" CONTENT="Overview">
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="Overview";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Overview";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -23,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
@@ -86,6 +89,18 @@ function windowTitle()
 <TD>&nbsp;</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="20%"><B><A HREF="com/yahoo/ycsb/db/package-summary.html">com.yahoo.ycsb.db</A></B></TD>
+<TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="20%"><B><A HREF="com/yahoo/ycsb/generator/package-summary.html">com.yahoo.ycsb.generator</A></B></TD>
+<TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD WIDTH="20%"><B><A HREF="com/yahoo/ycsb/measurements/package-summary.html">com.yahoo.ycsb.measurements</A></B></TD>
+<TD>&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
 <TD WIDTH="20%"><B><A HREF="com/yahoo/ycsb/workloads/package-summary.html">com.yahoo.ycsb.workloads</A></B></TD>
 <TD>&nbsp;</TD>
 </TR>
diff --git a/doc/javadoc/overview-tree.html b/doc/javadoc/overview-tree.html
index 71d5a37eef2092e195dda62c6b71389a6f4651a2..2012c90fc5f53fc8ff5c5eeac46aeaf636e406af 100644
--- a/doc/javadoc/overview-tree.html
+++ b/doc/javadoc/overview-tree.html
@@ -2,18 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
 Class Hierarchy
 </TITLE>
 
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="Class Hierarchy";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Class Hierarchy";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -22,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
@@ -79,21 +83,21 @@ function windowTitle()
 Hierarchy For All Packages</H2>
 </CENTER>
 <DL>
-<DT><B>Package Hierarchies:</B><DD><A HREF="com/yahoo/ycsb/package-tree.html">com.yahoo.ycsb</A>, <A HREF="com/yahoo/ycsb/workloads/package-tree.html">com.yahoo.ycsb.workloads</A></DL>
+<DT><B>Package Hierarchies:</B><DD><A HREF="com/yahoo/ycsb/package-tree.html">com.yahoo.ycsb</A>, <A HREF="com/yahoo/ycsb/db/package-tree.html">com.yahoo.ycsb.db</A>, <A HREF="com/yahoo/ycsb/generator/package-tree.html">com.yahoo.ycsb.generator</A>, <A HREF="com/yahoo/ycsb/measurements/package-tree.html">com.yahoo.ycsb.measurements</A>, <A HREF="com/yahoo/ycsb/workloads/package-tree.html">com.yahoo.ycsb.workloads</A></DL>
 <HR>
 <H2>
 Class Hierarchy
 </H2>
 <UL>
 <LI TYPE="circle">java.lang.Object<UL>
-<LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/Client.html" title="class in com.yahoo.ycsb"><B>Client</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/DB.html" title="class in com.yahoo.ycsb"><B>DB</B></A><UL>
-<LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/BasicDB.html" title="class in com.yahoo.ycsb"><B>BasicDB</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/DBWrapper.html" title="class in com.yahoo.ycsb"><B>DBWrapper</B></A></UL>
-<LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/DBFactory.html" title="class in com.yahoo.ycsb"><B>DBFactory</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/Generator.html" title="class in com.yahoo.ycsb"><B>Generator</B></A><UL>
-<LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/DiscreteGenerator.html" title="class in com.yahoo.ycsb"><B>DiscreteGenerator</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/IntegerGenerator.html" title="class in com.yahoo.ycsb"><B>IntegerGenerator</B></A><UL>
-<LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/CounterGenerator.html" title="class in com.yahoo.ycsb"><B>CounterGenerator</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb"><B>ScrambledZipfianGenerator</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/SkewedLatestGenerator.html" title="class in com.yahoo.ycsb"><B>SkewedLatestGenerator</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/UniformIntegerGenerator.html" title="class in com.yahoo.ycsb"><B>UniformIntegerGenerator</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/ZipfianGenerator.html" title="class in com.yahoo.ycsb"><B>ZipfianGenerator</B></A></UL>
-<LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/UniformGenerator.html" title="class in com.yahoo.ycsb"><B>UniformGenerator</B></A></UL>
-<LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/Measurements.html" title="class in com.yahoo.ycsb"><B>Measurements</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/OneMeasurement.html" title="class in com.yahoo.ycsb"><B>OneMeasurement</B></A><UL>
-<LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb"><B>OneMeasurementHistogram</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb"><B>OneMeasurementTimeSeries</B></A></UL>
+<LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/Client.html" title="class in com.yahoo.ycsb"><B>Client</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/CommandLine.html" title="class in com.yahoo.ycsb"><B>CommandLine</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/DB.html" title="class in com.yahoo.ycsb"><B>DB</B></A><UL>
+<LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/BasicDB.html" title="class in com.yahoo.ycsb"><B>BasicDB</B></A><LI TYPE="circle">com.yahoo.ycsb.db.<A HREF="com/yahoo/ycsb/db/CassandraClient5.html" title="class in com.yahoo.ycsb.db"><B>CassandraClient5</B></A><LI TYPE="circle">com.yahoo.ycsb.db.<A HREF="com/yahoo/ycsb/db/CassandraClient6.html" title="class in com.yahoo.ycsb.db"><B>CassandraClient6</B></A><LI TYPE="circle">com.yahoo.ycsb.db.<A HREF="com/yahoo/ycsb/db/CassandraClient7.html" title="class in com.yahoo.ycsb.db"><B>CassandraClient7</B></A><LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/DBWrapper.html" title="class in com.yahoo.ycsb"><B>DBWrapper</B></A><LI TYPE="circle">com.yahoo.ycsb.db.<A HREF="com/yahoo/ycsb/db/HBaseClient.html" title="class in com.yahoo.ycsb.db"><B>HBaseClient</B></A><LI TYPE="circle">com.yahoo.ycsb.db.<A HREF="com/yahoo/ycsb/db/MongoDbClient.html" title="class in com.yahoo.ycsb.db"><B>MongoDbClient</B></A></UL>
+<LI TYPE="circle">com.yahoo.ycsb.<A HREF="com/yahoo/ycsb/DBFactory.html" title="class in com.yahoo.ycsb"><B>DBFactory</B></A><LI TYPE="circle">com.yahoo.ycsb.generator.<A HREF="com/yahoo/ycsb/generator/Generator.html" title="class in com.yahoo.ycsb.generator"><B>Generator</B></A><UL>
+<LI TYPE="circle">com.yahoo.ycsb.generator.<A HREF="com/yahoo/ycsb/generator/DiscreteGenerator.html" title="class in com.yahoo.ycsb.generator"><B>DiscreteGenerator</B></A><LI TYPE="circle">com.yahoo.ycsb.generator.<A HREF="com/yahoo/ycsb/generator/IntegerGenerator.html" title="class in com.yahoo.ycsb.generator"><B>IntegerGenerator</B></A><UL>
+<LI TYPE="circle">com.yahoo.ycsb.generator.<A HREF="com/yahoo/ycsb/generator/CounterGenerator.html" title="class in com.yahoo.ycsb.generator"><B>CounterGenerator</B></A><LI TYPE="circle">com.yahoo.ycsb.generator.<A HREF="com/yahoo/ycsb/generator/ScrambledZipfianGenerator.html" title="class in com.yahoo.ycsb.generator"><B>ScrambledZipfianGenerator</B></A><LI TYPE="circle">com.yahoo.ycsb.generator.<A HREF="com/yahoo/ycsb/generator/SkewedLatestGenerator.html" title="class in com.yahoo.ycsb.generator"><B>SkewedLatestGenerator</B></A><LI TYPE="circle">com.yahoo.ycsb.generator.<A HREF="com/yahoo/ycsb/generator/UniformIntegerGenerator.html" title="class in com.yahoo.ycsb.generator"><B>UniformIntegerGenerator</B></A><LI TYPE="circle">com.yahoo.ycsb.generator.<A HREF="com/yahoo/ycsb/generator/ZipfianGenerator.html" title="class in com.yahoo.ycsb.generator"><B>ZipfianGenerator</B></A></UL>
+<LI TYPE="circle">com.yahoo.ycsb.generator.<A HREF="com/yahoo/ycsb/generator/UniformGenerator.html" title="class in com.yahoo.ycsb.generator"><B>UniformGenerator</B></A></UL>
+<LI TYPE="circle">com.yahoo.ycsb.measurements.<A HREF="com/yahoo/ycsb/measurements/Measurements.html" title="class in com.yahoo.ycsb.measurements"><B>Measurements</B></A><LI TYPE="circle">com.yahoo.ycsb.measurements.<A HREF="com/yahoo/ycsb/measurements/OneMeasurement.html" title="class in com.yahoo.ycsb.measurements"><B>OneMeasurement</B></A><UL>
+<LI TYPE="circle">com.yahoo.ycsb.measurements.<A HREF="com/yahoo/ycsb/measurements/OneMeasurementHistogram.html" title="class in com.yahoo.ycsb.measurements"><B>OneMeasurementHistogram</B></A><LI TYPE="circle">com.yahoo.ycsb.measurements.<A HREF="com/yahoo/ycsb/measurements/OneMeasurementTimeSeries.html" title="class in com.yahoo.ycsb.measurements"><B>OneMeasurementTimeSeries</B></A></UL>
 <LI TYPE="circle">java.lang.Throwable (implements java.io.Serializable)
 <UL>
 <LI TYPE="circle">java.lang.Exception<UL>
diff --git a/doc/javadoc/package-list b/doc/javadoc/package-list
index 323af743eb4f7a9a72a6b02cd8c20f89113c2886..13443e193bc6a707ba38f222a7fe03cb8b0e608c 100644
--- a/doc/javadoc/package-list
+++ b/doc/javadoc/package-list
@@ -1,2 +1,5 @@
 com.yahoo.ycsb
+com.yahoo.ycsb.db
+com.yahoo.ycsb.generator
+com.yahoo.ycsb.measurements
 com.yahoo.ycsb.workloads
diff --git a/doc/javadoc/serialized-form.html b/doc/javadoc/serialized-form.html
index 337c1f42379290b741ed5f9f5a2340bdd7c1d4b7..3cff57be04d9176e044c773021b087804b4525d7 100644
--- a/doc/javadoc/serialized-form.html
+++ b/doc/javadoc/serialized-form.html
@@ -2,18 +2,21 @@
 <!--NewPage-->
 <HTML>
 <HEAD>
-<!-- Generated by javadoc (build 1.5.0_22) on Fri Apr 23 10:24:25 PDT 2010 -->
+<!-- Generated by javadoc (build 1.6.0_03) on Wed May 12 14:51:53 PDT 2010 -->
 <TITLE>
 Serialized Form
 </TITLE>
 
+<META NAME="date" CONTENT="2010-05-12">
 
 <LINK REL ="stylesheet" TYPE="text/css" HREF="stylesheet.css" TITLE="Style">
 
 <SCRIPT type="text/javascript">
 function windowTitle()
 {
-    parent.document.title="Serialized Form";
+    if (location.href.indexOf('is-external=true') == -1) {
+        parent.document.title="Serialized Form";
+    }
 }
 </SCRIPT>
 <NOSCRIPT>
@@ -22,6 +25,7 @@ function windowTitle()
 </HEAD>
 
 <BODY BGCOLOR="white" onload="windowTitle();">
+<HR>
 
 
 <!-- ========= START OF TOP NAVBAR ======= -->
diff --git a/doc/javadoc/stylesheet.css b/doc/javadoc/stylesheet.css
index 6d31fdbc7f01bfea6d765f2aa968fbd6ec8b1203..6ea9e5161615fcf6cdb0d194d913139c26fa417a 100644
--- a/doc/javadoc/stylesheet.css
+++ b/doc/javadoc/stylesheet.css
@@ -3,27 +3,27 @@
 /* Define colors, fonts and other style attributes here to override the defaults */
 
 /* Page background color */
-body { background-color: #FFFFFF }
+body { background-color: #FFFFFF; color:#000000 }
 
 /* Headings */
 h1 { font-size: 145% }
 
 /* Table colors */
-.TableHeadingColor     { background: #CCCCFF } /* Dark mauve */
-.TableSubHeadingColor  { background: #EEEEFF } /* Light mauve */
-.TableRowColor         { background: #FFFFFF } /* White */
+.TableHeadingColor     { background: #CCCCFF; color:#000000 } /* Dark mauve */
+.TableSubHeadingColor  { background: #EEEEFF; color:#000000 } /* Light mauve */
+.TableRowColor         { background: #FFFFFF; color:#000000 } /* White */
 
 /* Font used in left-hand frame lists */
-.FrameTitleFont   { font-size: 100%; font-family: Helvetica, Arial, sans-serif }
-.FrameHeadingFont { font-size:  90%; font-family: Helvetica, Arial, sans-serif }
-.FrameItemFont    { font-size:  90%; font-family: Helvetica, Arial, sans-serif }
+.FrameTitleFont   { font-size: 100%; font-family: Helvetica, Arial, sans-serif; color:#000000 }
+.FrameHeadingFont { font-size:  90%; font-family: Helvetica, Arial, sans-serif; color:#000000 }
+.FrameItemFont    { font-size:  90%; font-family: Helvetica, Arial, sans-serif; color:#000000 }
 
 /* Navigation bar fonts and colors */
-.NavBarCell1    { background-color:#EEEEFF;} /* Light mauve */
-.NavBarCell1Rev { background-color:#00008B;} /* Dark Blue */
-.NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;}
-.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;}
+.NavBarCell1    { background-color:#EEEEFF; color:#000000} /* Light mauve */
+.NavBarCell1Rev { background-color:#00008B; color:#FFFFFF} /* Dark Blue */
+.NavBarFont1    { font-family: Arial, Helvetica, sans-serif; color:#000000;color:#000000;}
+.NavBarFont1Rev { font-family: Arial, Helvetica, sans-serif; color:#FFFFFF;color:#FFFFFF;}
 
-.NavBarCell2    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
-.NavBarCell3    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF;}
+.NavBarCell2    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000}
+.NavBarCell3    { font-family: Arial, Helvetica, sans-serif; background-color:#FFFFFF; color:#000000}
 
diff --git a/doc/parallelclients.html b/doc/parallelclients.html
index 7d8ca0fe5920f5e96595cd547d93d36def71a3a3..4735bb5ba399d993e9afd2a2b3be2d4df1ca362e 100644
--- a/doc/parallelclients.html
+++ b/doc/parallelclients.html
@@ -3,8 +3,8 @@
 <TITLE>YCSB - Parallel clients</TITLE>
 </HEAD>
 <BODY>
-<H1><img src="images/ycsblogo-small.png"> Yahoo! Cloud Serving Benchmark</H1>
-<H3>Version 0.1</H3>
+<H1><img src="images/ycsb.jpg" width=150> Yahoo! Cloud Serving Benchmark</H1>
+<H3>Version 0.1.2</H3>
 <HR>
 <A HREF="index.html">Home</A> - <A href="coreworkloads.html">Core workloads</A> - <a href="tipsfaq.html">Tips and FAQ</A>
 <HR>
@@ -43,4 +43,4 @@ insertcount=25000000
 <HR>
 YCSB - Yahoo! Research - Contact cooperb@yahoo-inc.com.
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/doc/tipsfaq.html b/doc/tipsfaq.html
index 9bf2562f319bfdad3a63f2d236d28cc5bc2315d7..27f4a5e9ea5f330e8349cf40349cdbeb1e56fbbd 100644
--- a/doc/tipsfaq.html
+++ b/doc/tipsfaq.html
@@ -3,8 +3,8 @@
 <TITLE>YCSB - Tips and FAQ</TITLE>
 </HEAD>
 <BODY>
-<H1><img src="images/ycsblogo-small.png"> Yahoo! Cloud Serving Benchmark</H1>
-<H3>Version 0.1</H3>
+<H1><img src="images/ycsb.jpg" width=150> Yahoo! Cloud Serving Benchmark</H1>
+<H3>Version 0.1.2</H3>
 <HR>
 <A HREF="index.html">Home</A> - <A href="coreworkloads.html">Core workloads</A> - <a href="tipsfaq.html">Tips and FAQ</A>
 <HR>
@@ -28,4 +28,4 @@ enough threads to ensure it is the database, not the client, that is the bottlen
 <HR>
 YCSB - Yahoo! Research - Contact cooperb@yahoo-inc.com.
 </BODY>
-</HTML>
\ No newline at end of file
+</HTML>
diff --git a/doc/workload.html b/doc/workload.html
index e564b2108e455ca508ac943c63d5a763991f213b..305d0204fcfa960f5020e4beddbf89476f7f0e78 100644
--- a/doc/workload.html
+++ b/doc/workload.html
@@ -3,8 +3,8 @@
 <TITLE>YCSB - Implementing new workloads</TITLE>
 </HEAD>
 <BODY>
-<H1><img src="images/ycsblogo-small.png"> Yahoo! Cloud Serving Benchmark</H1>
-<H3>Version 0.1</H3>
+<H1><img src="images/ycsb.jpg" width=150> Yahoo! Cloud Serving Benchmark</H1>
+<H3>Version 0.1.2</H3>
 <HR>
 <A HREF="index.html">Home</A> - <A href="coreworkloads.html">Core workloads</A> - <a href="tipsfaq.html">Tips and FAQ</A>
 <HR>
@@ -126,4 +126,4 @@ workload=com.foo.YourWorkloadClass
 <HR>
 YCSB - Yahoo! Research - Contact cooperb@yahoo-inc.com.
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/com/yahoo/ycsb/measurements/OneMeasurement.java b/src/com/yahoo/ycsb/measurements/OneMeasurement.java
index bcd84b63f58df8c75337fe62b322115fd2e8c865..8ac56f3c4dc5c5bd2f1335c7bb12f01f79fe0dbf 100644
--- a/src/com/yahoo/ycsb/measurements/OneMeasurement.java
+++ b/src/com/yahoo/ycsb/measurements/OneMeasurement.java
@@ -20,7 +20,7 @@ package com.yahoo.ycsb.measurements;
 import java.io.PrintStream;
 
 /**
- * A single measured metric (e.g. READ LATENCY)
+ * A single measured metric (such as READ LATENCY)
  */
 public abstract class OneMeasurement {