Merge pull request #186 from datastax/issue/CDM-91

CDM-91: Fix NPE issue with counter tables with null fields

Author: msmygit

SIT/environment.sh

@@ -68,7 +68,7 @@ fi
 ###
 # These variables are hard-coded for now
 SUBNET=$(echo ${CIDR} | cut -d. -f1-3)
-CASS_VERSION=3.11.14
+CASS_VERSION=3
 CDM_VERSION=latest
 
 #==============================================================================================================================

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

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

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

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

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

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

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

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

SIT/smoke/04_counters/expected.out

@@ -4,7 +4,8 @@
  record3 |  2000 |  4000
  record5 |   500 |   501
  record2 |    11 |    20
+ record6 |   500 |  null
  record1 |     1 |     2
  record4 | 10000 | 20001
 
-(5 rows)
+(6 rows)

SIT/smoke/04_counters/setup.cql

@@ -6,6 +6,7 @@ UPDATE origin.smoke_counters set col1=col1+10, col2=col2+20 where key='record2';
 UPDATE origin.smoke_counters set col1=col1+1000, col2=col2+2000 where key='record3';
 UPDATE origin.smoke_counters set col1=col1+10000, col2=col2+20000 where key='record4';
 UPDATE origin.smoke_counters set col1=col1+500, col2=col2+500 where key='record5';
+UPDATE origin.smoke_counters set col1=col1+500 where key='record6';
 
 DROP TABLE IF EXISTS target.smoke_counters;
 CREATE TABLE target.smoke_counters(key text,col1 counter,col2 counter, PRIMARY KEY (key));

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

@@ -48,7 +48,12 @@ protected BoundStatement bind(Row originRow, Row targetRow, Integer ttl, Long wr
 
             try {
                 if(usingCounter && counterIndexes.contains(targetIndex)) {
-                    bindValue = ((Long) cqlTable.getOtherCqlTable().getData(originIndex, originRow) - (null==targetRow ? 0 : (Long) cqlTable.getData(targetIndex, targetRow)));
+                    bindValue = cqlTable.getOtherCqlTable().getData(originIndex, originRow);
+                    if (null == bindValue) {
+                        currentBindIndex++;
+                        continue;
+                    }
+                    bindValue = ((Long) bindValue - (null==targetRow ? 0 : (Long) cqlTable.getData(targetIndex, targetRow)));
                 }
                 else if (targetIndex== explodeMapKeyIndex) {
                     bindValue = explodeMapKey;