Minor logging changes (making logs consistent)

Author: pravinbhat

src/main/java/datastax/astra/migrate/CopyJobSession.java

@@ -17,6 +17,7 @@ public class CopyJobSession extends AbstractJobSession {
     private static CopyJobSession copyJobSession;
     public Logger logger = LoggerFactory.getLogger(this.getClass().getName());
     protected AtomicLong readCounter = new AtomicLong(0);
+    protected AtomicLong skippedCounter = new AtomicLong(0);
     protected AtomicLong writeCounter = new AtomicLong(0);
 
     protected CopyJobSession(CqlSession sourceSession, CqlSession astraSession, SparkConf sc) {
@@ -56,6 +57,8 @@ public void getDataAndInsert(BigInteger min, BigInteger max) {
                             Long sourceWriteTimeStamp = getLargestWriteTimeStamp(sourceRow);
                             if (sourceWriteTimeStamp < minWriteTimeStampFilter
                                     || sourceWriteTimeStamp > maxWriteTimeStampFilter) {
+                                readCounter.incrementAndGet();
+                                skippedCounter.incrementAndGet();
                                 continue;
                             }
                         }
@@ -131,6 +134,7 @@ public synchronized void printCounts(boolean isFinal) {
             logger.info("################################################################################################");
         }
         logger.info("{} Read Record Count: {}", msg, readCounter.get());
+        logger.info("{} Skipped Record Count: {}", msg, skippedCounter.get());
         logger.info("{} Write Record Count: {}", msg, writeCounter.get());
         if (isFinal) {
             logger.info("################################################################################################");

src/main/java/datastax/astra/migrate/CopyPKJobSession.java

@@ -71,7 +71,7 @@ public void printCounts(boolean isFinal) {
             logger.info("################################################################################################");
         }
         logger.info("ThreadID: {} Read Record Count: {}", Thread.currentThread().getId(), readCounter.get());
-        logger.info("ThreadID: {} Read Missing Count: {}", Thread.currentThread().getId(), missingCounter.get());
+        logger.info("ThreadID: {} Missing Record Count: {}", Thread.currentThread().getId(), missingCounter.get());
         logger.info("ThreadID: {} Inserted Record Count: {}", Thread.currentThread().getId(), writeCounter.get());
         if (isFinal) {
             logger.info("################################################################################################");

src/main/java/datastax/astra/migrate/DiffJobSession.java

@@ -114,13 +114,13 @@ public synchronized void printCounts(boolean isFinal) {
             msg += " Final";
             logger.info("################################################################################################");
         }
-        logger.info(msg + " Read Record Count: " + readCounter.get());
-        logger.info(msg + " Read Mismatch Count: " + mismatchCounter.get());
-        logger.info(msg + " Corrected Mismatch Count: " + correctedMismatchCounter.get());
-        logger.info(msg + " Read Missing Count: " + missingCounter.get());
-        logger.info(msg + " Corrected Missing Count: " + correctedMissingCounter.get());
-        logger.info(msg + " Read Valid Count: " + validCounter.get());
-        logger.info(msg + " Read Skipped Count: " + skippedCounter.get());
+        logger.info("{} Read Record Count: {}", msg, readCounter.get());
+        logger.info("{} Mismatch Record Count: {}", msg, mismatchCounter.get());
+        logger.info("{} Corrected Mismatch Record Count: {}", msg, correctedMismatchCounter.get());
+        logger.info("{} Missing Record Count: {}", msg, missingCounter.get());
+        logger.info("{} Corrected Missing Record Count: {}", msg, correctedMissingCounter.get());
+        logger.info("{} Valid Record Count: {}", msg, validCounter.get());
+        logger.info("{} Skipped Record Count: {}", msg, skippedCounter.get());
         if (isFinal) {
             logger.info("################################################################################################");
         }
@@ -129,13 +129,13 @@ public synchronized void printCounts(boolean isFinal) {
     private void diff(Row sourceRow, Row astraRow) {
         if (astraRow == null) {
             missingCounter.incrementAndGet();
-            logger.error("Missing target row found for key: " + getKey(sourceRow));
+            logger.error("Missing target row found for key: {}", getKey(sourceRow));
             //correct data
 
             if (autoCorrectMissing) {
                 astraSession.execute(bindInsert(astraInsertStatement, sourceRow, null));
                 correctedMissingCounter.incrementAndGet();
-                logger.error("Inserted missing row in target: " + getKey(sourceRow));
+                logger.error("Inserted missing row in target: {}", getKey(sourceRow));
             }
 
             return;
@@ -144,7 +144,7 @@ private void diff(Row sourceRow, Row astraRow) {
         String diffData = isDifferent(sourceRow, astraRow);
         if (!diffData.isEmpty()) {
             mismatchCounter.incrementAndGet();
-            logger.error("Mismatch row found for key: " + getKey(sourceRow) + " Mismatch: " + diffData);
+            logger.error("Mismatch row found for key: {} Mismatch: {}", getKey(sourceRow), diffData);
 
             if (autoCorrectMismatch) {
                 if (isCounterTable) {
@@ -153,7 +153,7 @@ private void diff(Row sourceRow, Row astraRow) {
                     astraSession.execute(bindInsert(astraInsertStatement, sourceRow, null));
                 }
                 correctedMismatchCounter.incrementAndGet();
-                logger.error("Updated mismatch row in target: " + getKey(sourceRow));
+                logger.error("Updated mismatch row in target: {}", getKey(sourceRow));
             }
 
             return;