diff --git a/mongodb/src/main/java/com/yahoo/ycsb/db/AsyncMongoDbClient.java b/mongodb/src/main/java/com/yahoo/ycsb/db/AsyncMongoDbClient.java index d8fe38843a34b176a0ea5b0d9bfa0adfc8f8d915..89eb7d250080530b309d3ed7861ab975b70162fa 100644 --- a/mongodb/src/main/java/com/yahoo/ycsb/db/AsyncMongoDbClient.java +++ b/mongodb/src/main/java/com/yahoo/ycsb/db/AsyncMongoDbClient.java @@ -286,7 +286,7 @@ public class AsyncMongoDbClient extends DB { batchedWriteCount += 1; if (batchedWriteCount < batchSize) { - return Status.OK; + return OptionsSupport.BATCHED_OK; } long count = collection.write(batchedWrite); diff --git a/mongodb/src/main/java/com/yahoo/ycsb/db/MongoDbClient.java b/mongodb/src/main/java/com/yahoo/ycsb/db/MongoDbClient.java index e0654aa2fa8029f9a9da4ec86dfdedf7d96b95a7..1db8f0e1cfcd0e7d28fa52b6c73b34ddf77803a8 100644 --- a/mongodb/src/main/java/com/yahoo/ycsb/db/MongoDbClient.java +++ b/mongodb/src/main/java/com/yahoo/ycsb/db/MongoDbClient.java @@ -56,7 +56,7 @@ import java.util.Vector; import java.util.concurrent.atomic.AtomicInteger; /** - * MongoDB asynchronous client for YCSB framework using the MongoDB Inc. <a + * MongoDB binding for YCSB framework using the MongoDB Inc. <a * href="http://docs.mongodb.org/ecosystem/drivers/java/">driver</a> * <p> * See the <code>README.md</code> for configuration information. @@ -285,6 +285,8 @@ public class MongoDbClient extends DB { collection.insertMany(bulkInserts, INSERT_UNORDERED); } bulkInserts.clear(); + } else { + return OptionsSupport.BATCHED_OK; } } return Status.OK; diff --git a/mongodb/src/main/java/com/yahoo/ycsb/db/OptionsSupport.java b/mongodb/src/main/java/com/yahoo/ycsb/db/OptionsSupport.java index 62092a0d10a51e4384156235f4a59504585ea853..c8aacd464f76946fa670f377ff0c0f853232b3ea 100644 --- a/mongodb/src/main/java/com/yahoo/ycsb/db/OptionsSupport.java +++ b/mongodb/src/main/java/com/yahoo/ycsb/db/OptionsSupport.java @@ -18,6 +18,8 @@ package com.yahoo.ycsb.db; import java.util.Properties; +import com.yahoo.ycsb.Status; + /** * OptionsSupport provides methods for handling legacy options. * @@ -25,6 +27,13 @@ import java.util.Properties; */ public final class OptionsSupport { + /** + * Status used for operations that have not been send to the server and have + * only been batched by the client. + */ + public static final Status BATCHED_OK = new Status("BATCHED_OK", + "The operation has been batched by the binding."); + /** Value for an unavailable property. */ private static final String UNAVAILABLE = "n/a";