Replacing incrAndGet() -> getAndIncr()

This ensures there is a consistency between the index we maintain
and the doc_index we see on the cluster.
This is also required to fix the keyIndex error for targetVB doc_gen
scenarios where we create one key with index=0 but the index we try
to fetch is 1 due to incrAndGet()

Author: ashwin2002

src/main/java/utils/docgen/DocumentGenerator.java

@@ -351,7 +351,7 @@ public WorkLoadSettings get_work_load_settings() {
     }
 
     public Tuple2<String, Object> next() {
-        long temp = this.ws.dr.createItr.incrementAndGet();
+        long temp = this.ws.dr.createItr.getAndIncrement();
         String k = null;
         Object v = null;
             try {
@@ -368,7 +368,7 @@ public Tuple2<String, Object> next() {
     }
 
     public Tuple2<String, Object> nextRead() {
-        long temp = this.ws.dr.readItr.incrementAndGet();
+        long temp = this.ws.dr.readItr.getAndIncrement();
         String k = null;
         Object v = null;
             try {
@@ -385,7 +385,7 @@ public Tuple2<String, Object> nextRead() {
     }
 
     public Tuple2<String, Object> nextUpdate() {
-        long temp = this.ws.dr.updateItr.incrementAndGet();
+        long temp = this.ws.dr.updateItr.getAndIncrement();
         String k = null;
         Object v = null;
             try {
@@ -402,7 +402,7 @@ public Tuple2<String, Object> nextUpdate() {
     }
 
     public Tuple2<String, Object> nextExpiry() {
-        long temp = this.ws.dr.expiryItr.incrementAndGet();
+        long temp = this.ws.dr.expiryItr.getAndIncrement();
         String k = null;
         Object v = null;
             try {
@@ -425,16 +425,16 @@ public Tuple2<String, Object> nextExpiry() {
 
         switch(op_type) {
             case "insert":
-                temp = this.ws.dr.subdocInsertItr.incrementAndGet();
+                temp = this.ws.dr.subdocInsertItr.getAndIncrement();
                 break;
             case "upsert":
-                temp = this.ws.dr.subdocUpsertItr.incrementAndGet();
+                temp = this.ws.dr.subdocUpsertItr.getAndIncrement();
                 break;
             case "remove":
-                temp = this.ws.dr.subdocRemoveItr.incrementAndGet();
+                temp = this.ws.dr.subdocRemoveItr.getAndIncrement();
                 break;
             case "lookup":
-                temp = this.ws.dr.subdocReadItr.incrementAndGet();
+                temp = this.ws.dr.subdocReadItr.getAndIncrement();
                 break;
             default:
                 return null;
@@ -451,7 +451,7 @@ public Tuple2<String, Object> nextExpiry() {
     public Tuple2<String, List<LookupInSpec>>nextSubDocLookup() {
         String key = null;
         List<LookupInSpec> specs = null;
-        long temp = this.ws.dr.subdocReadItr.incrementAndGet();
+        long temp = this.ws.dr.subdocReadItr.getAndIncrement();
         try {
             key = (String) this.keyMethod.invoke(this.keys, temp);
             specs = (List<LookupInSpec>) this.subdocLookupMethod.invoke(this.vals, key);
@@ -507,7 +507,7 @@ public List<String> nextDeleteBatch() {
         List<String> docs = new ArrayList<String>();
         while (this.has_next_delete() && count<ws.batchSize*ws.deletes/100) {
             try {
-                temp = this.ws.dr.deleteItr.incrementAndGet();
+                temp = this.ws.dr.deleteItr.getAndIncrement();
                 if (this.target_vbuckets != null && this.target_vbuckets.length > 0) {
                     docs.add(this.generated_delete_keys.get(temp));
                 } else {

src/main/java/utils/docgen/mongo/MongoDocumentGenerator.java

@@ -136,7 +136,7 @@ public WorkLoadSettings get_work_load_settings() {
     }
 
     public Tuple2<String, Object> next() {
-        long temp = this.ws.dr.createItr.incrementAndGet();
+        long temp = this.ws.dr.createItr.getAndIncrement();
         String k = null;
         Object v = null;
             try {
@@ -149,7 +149,7 @@ public Tuple2<String, Object> next() {
     }
 
     public Tuple2<String, Object> nextRead() {
-        long temp = this.ws.dr.readItr.incrementAndGet();
+        long temp = this.ws.dr.readItr.getAndIncrement();
         String k = null;
         Object v = null;
             try {
@@ -162,7 +162,7 @@ public Tuple2<String, Object> nextRead() {
     }
 
     public Tuple2<String, Object> nextUpdate() {
-        long temp = this.ws.dr.updateItr.incrementAndGet();
+        long temp = this.ws.dr.updateItr.getAndIncrement();
         String k = null;
         Object v = null;
             try {
@@ -175,7 +175,7 @@ public Tuple2<String, Object> nextUpdate() {
     }
 
     public Tuple2<String, Object> nextExpiry() {
-        long temp = this.ws.dr.expiryItr.incrementAndGet();
+        long temp = this.ws.dr.expiryItr.getAndIncrement();
         String k = null;
         Object v = null;
             try {
@@ -237,7 +237,7 @@ public List<String> nextDeleteBatch() {
         List<String> docs = new ArrayList<String>();
         while (this.has_next_delete() && count<ws.batchSize*ws.deletes/100) {
             try {
-                temp = this.ws.dr.deleteItr.incrementAndGet();
+                temp = this.ws.dr.deleteItr.getAndIncrement();
                 docs.add((String) this.keyMethod.invoke(this.keys, temp));
             } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
                 e.printStackTrace();