diff --git a/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraClient10.java b/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraClient10.java index 9eaf2eeb5ef35867a170358af536d3bc8469d721..b3d8e4a7d18824f13ed28a5dff051c69eb5e8ac4 100644 --- a/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraClient10.java +++ b/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraClient10.java @@ -453,6 +453,10 @@ public class CassandraClient10 extends DB { } for (int i = 0; i < operationRetries; i++) { + mutations.clear(); + mutationMap.clear(); + record.clear(); + if (debug) { System.out.println("Inserting key: " + key); } @@ -479,10 +483,6 @@ public class CassandraClient10 extends DB { client.batch_mutate(record, writeConsistencyLevel); - mutations.clear(); - mutationMap.clear(); - record.clear(); - if (debug) { System.out .println("ConsistencyLevel=" + writeConsistencyLevel.toString()); diff --git a/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraClient7.java b/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraClient7.java index 8f63554953f0574d5f7f8f9c467e0dd847155994..f2075e7f77780a8a609d03af84aa127ad7d5419b 100644 --- a/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraClient7.java +++ b/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraClient7.java @@ -418,6 +418,10 @@ public class CassandraClient7 extends DB { } for (int i = 0; i < operationRetries; i++) { + mutations.clear(); + mutationMap.clear(); + record.clear(); + if (debug) { System.out.println("Inserting key: " + key); } @@ -444,10 +448,6 @@ public class CassandraClient7 extends DB { client.batch_mutate(record, ConsistencyLevel.ONE); - mutations.clear(); - mutationMap.clear(); - record.clear(); - return Status.OK; } catch (Exception e) { errorexception = e; diff --git a/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraClient8.java b/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraClient8.java index ca6b0cf79bfce1a21771780c9435740b1295e924..ca72c339da797073df4da5e0e9d1af42c612a360 100644 --- a/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraClient8.java +++ b/cassandra/src/main/java/com/yahoo/ycsb/db/CassandraClient8.java @@ -397,6 +397,10 @@ public class CassandraClient8 extends DB { } for (int i = 0; i < operationRetries; i++) { + mutations.clear(); + mutationMap.clear(); + record.clear(); + if (debug) { System.out.println("Inserting key: " + key); } @@ -423,10 +427,6 @@ public class CassandraClient8 extends DB { client.batch_mutate(record, ConsistencyLevel.ONE); - mutations.clear(); - mutationMap.clear(); - record.clear(); - return Status.OK; } catch (Exception e) { errorexception = e;