CDM-92: Fixed naming & SIT tests

Author: pravinbhat

SIT/smoke/04_counters/cdm.fixData.assert

@@ -1,7 +1,7 @@
-Read Record Count: 6
+Read Record Count: 7
 Mismatch Record Count: 2
 Corrected Mismatch Record Count: 2
 Missing Record Count: 1
 Corrected Missing Record Count: 0
-Valid Record Count: 3
+Valid Record Count: 4
 Skipped Record Count: 0

SIT/smoke/04_counters/cdm.fixForce.assert

@@ -1,7 +1,7 @@
-Read Record Count: 6
+Read Record Count: 7
 Mismatch Record Count: 0
 Corrected Mismatch Record Count: 0
 Missing Record Count: 1
 Corrected Missing Record Count: 1
-Valid Record Count: 5
+Valid Record Count: 6
 Skipped Record Count: 0

SIT/smoke/04_counters/cdm.migrateData.assert

@@ -1,4 +1,4 @@
-Read Record Count: 6
+Read Record Count: 7
 Skipped Record Count: 0
-Write Record Count: 6
+Write Record Count: 7
 Error Record Count: 0

SIT/smoke/04_counters/cdm.validateData.assert

@@ -1,7 +1,7 @@
-Read Record Count: 6
+Read Record Count: 7
 Mismatch Record Count: 0
 Corrected Mismatch Record Count: 0
 Missing Record Count: 0
 Corrected Missing Record Count: 0
-Valid Record Count: 6
+Valid Record Count: 7
 Skipped Record Count: 0

SIT/smoke/04_counters/expected.out

@@ -6,6 +6,7 @@
  record2 |    11 |    20
  record6 |   500 |  null
  record1 |     1 |     2
+ record7 |     1 |     2
  record4 | 10000 | 20001
 
-(6 rows)
+(7 rows)

src/main/java/com/datastax/cdm/cql/statement/TargetUpdateStatement.java

@@ -42,20 +42,20 @@ protected BoundStatement bind(Row originRow, Row targetRow, Integer ttl, Long wr
             boundStatement = boundStatement.set(currentBindIndex++, writeTime, Long.class);
         }
 
-        Object bindValueOrigin = null;
+        Object originValue, targetValue;
         Object bindValueTarget = null;
         for (int targetIndex : columnIndexesToBind) {
             int originIndex = cqlTable.getCorrespondingIndex(targetIndex);
 
             try {
                 if (usingCounter && counterIndexes.contains(targetIndex)) {
-                    bindValueOrigin = cqlTable.getOtherCqlTable().getData(originIndex, originRow);
-                    if (null == bindValueOrigin) {
+                    originValue = cqlTable.getOtherCqlTable().getData(originIndex, originRow);
+                    if (null == originValue) {
                         currentBindIndex++;
                         continue;
                     }
-                    bindValueTarget = (null == targetRow ? 0L : cqlTable.getData(targetIndex, targetRow));
-                    bindValueTarget = ((Long) bindValueOrigin - (null == bindValueTarget ? 0L : (Long) bindValueTarget));
+                    targetValue = (null == targetRow ? 0L : cqlTable.getData(targetIndex, targetRow));
+                    bindValueTarget = ((Long) originValue - (null == targetValue ? 0L : (Long) targetValue));
                 }
                 else if (targetIndex== explodeMapKeyIndex) {
                     bindValueTarget = explodeMapKey;
@@ -70,8 +70,7 @@ else if (targetIndex== explodeMapValueIndex) {
                 }
 
                 boundStatement = boundStatement.set(currentBindIndex++, bindValueTarget, cqlTable.getBindClass(targetIndex));
-            }
-            catch (Exception e) {
+            } catch (Exception e) {
                 logger.error("Error trying to bind value:" + bindValueTarget + " to column:" +
                         targetColumnNames.get(targetIndex) + " of targetDataType:" + targetColumnTypes.get(targetIndex) + "/"
                         + cqlTable.getBindClass(targetIndex).getName() + " at column index:" + targetIndex);