Merge branch 'develop' into feature/extract-recordid

pravinbhat · pravinbhat · commit f9ffb231cc16 · 2024-09-11T09:17:59.000-04:00
diff --git a/RELEASE.md b/RELEASE.md
@@ -1,4 +1,8 @@
 # Release Notes
+## [4.3.9] - 2024-09-11
+- Added new `status` value of `DIFF_CORRECTED` on `cdm_run_details` table to specifically mark partitions that were corrected during the CDM validation run.
+- Upgraded Validation job skip partitions with `DIFF_CORRECTED` status on rerun with a previous `runId`. 
+
 ## [4.3.8] - 2024-09-09
 - Upgraded `spark.cdm.trackRun` feature to include `status` on `cdm_run_info` table. Also improved the code to handle rerun of previous run which may have exited before being correctly initialized. 
 
diff --git a/SIT/features/01_constant_column/cdm.fixData.assert b/SIT/features/01_constant_column/cdm.fixData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 1
 Corrected Missing Record Count: 1
 Valid Record Count: 1
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/features/01_constant_column/cdm.validateData.assert b/SIT/features/01_constant_column/cdm.validateData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 0
 Corrected Missing Record Count: 0
 Valid Record Count: 3
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/features/02_explode_map/cdm.fixData.assert b/SIT/features/02_explode_map/cdm.fixData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 5
 Corrected Missing Record Count: 5
 Valid Record Count: 5
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/features/02_explode_map/cdm.validateData.assert b/SIT/features/02_explode_map/cdm.validateData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 0
 Corrected Missing Record Count: 0
 Valid Record Count: 12
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/features/03_codec/cdm.fixData.assert b/SIT/features/03_codec/cdm.fixData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 1
 Corrected Missing Record Count: 1
 Valid Record Count: 1
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/features/03_codec/cdm.validateData.assert b/SIT/features/03_codec/cdm.validateData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 0
 Corrected Missing Record Count: 0
 Valid Record Count: 3
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/features/04_udt_mapper/cdm.fixData.assert b/SIT/features/04_udt_mapper/cdm.fixData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 1
 Corrected Missing Record Count: 1
 Valid Record Count: 1
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/features/04_udt_mapper/cdm.validateData.assert b/SIT/features/04_udt_mapper/cdm.validateData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 0
 Corrected Missing Record Count: 0
 Valid Record Count: 3
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/features/05_guardrail/cdm.fixData.assert b/SIT/features/05_guardrail/cdm.fixData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 0
 Corrected Missing Record Count: 0
 Valid Record Count: 10
 Skipped Record Count: 6
+Error Record Count: 0
diff --git a/SIT/features/05_guardrail/cdm.validateData.assert b/SIT/features/05_guardrail/cdm.validateData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 0
 Corrected Missing Record Count: 0
 Valid Record Count: 10
 Skipped Record Count: 6
+Error Record Count: 0
diff --git a/SIT/features/06_constant_column_remove/cdm.fixData.assert b/SIT/features/06_constant_column_remove/cdm.fixData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 1
 Corrected Missing Record Count: 1
 Valid Record Count: 1
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/features/06_constant_column_remove/cdm.validateData.assert b/SIT/features/06_constant_column_remove/cdm.validateData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 0
 Corrected Missing Record Count: 0
 Valid Record Count: 3
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/features/07_constant_column_replace/cdm.fixData.assert b/SIT/features/07_constant_column_replace/cdm.fixData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 1
 Corrected Missing Record Count: 1
 Valid Record Count: 1
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/features/07_constant_column_replace/cdm.validateData.assert b/SIT/features/07_constant_column_replace/cdm.validateData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 0
 Corrected Missing Record Count: 0
 Valid Record Count: 3
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/regression/01_explode_map_with_constants/cdm.fixData.assert b/SIT/regression/01_explode_map_with_constants/cdm.fixData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 5
 Corrected Missing Record Count: 5
 Valid Record Count: 5
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/regression/01_explode_map_with_constants/cdm.validateData.assert b/SIT/regression/01_explode_map_with_constants/cdm.validateData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 0
 Corrected Missing Record Count: 0
 Valid Record Count: 12
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/regression/02_ColumnRenameWithConstantsAndExplode/cdm.fixData.assert b/SIT/regression/02_ColumnRenameWithConstantsAndExplode/cdm.fixData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 5
 Corrected Missing Record Count: 5
 Valid Record Count: 6
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/regression/02_ColumnRenameWithConstantsAndExplode/cdm.validateData.assert b/SIT/regression/02_ColumnRenameWithConstantsAndExplode/cdm.validateData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 0
 Corrected Missing Record Count: 0
 Valid Record Count: 12
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/regression/03_performance/cdm.fixData.assert b/SIT/regression/03_performance/cdm.fixData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 100
 Corrected Missing Record Count: 100
 Valid Record Count: 3800
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/regression/03_performance/cdm.validateData.assert b/SIT/regression/03_performance/cdm.validateData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 0
 Corrected Missing Record Count: 0
 Valid Record Count: 4000
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/smoke/03_ttl_writetime/cdm.fixData.assert b/SIT/smoke/03_ttl_writetime/cdm.fixData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 1
 Corrected Missing Record Count: 1
 Valid Record Count: 3
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/smoke/03_ttl_writetime/cdm.validateData.assert b/SIT/smoke/03_ttl_writetime/cdm.validateData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 0
 Corrected Missing Record Count: 0
 Valid Record Count: 8
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/smoke/04_counters/cdm.fixForce.assert b/SIT/smoke/04_counters/cdm.fixForce.assert
@@ -5,3 +5,4 @@ Missing Record Count: 1
 Corrected Missing Record Count: 1
 Valid Record Count: 6
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/SIT/smoke/04_counters/cdm.validateData.assert b/SIT/smoke/04_counters/cdm.validateData.assert
@@ -5,3 +5,4 @@ Missing Record Count: 0
 Corrected Missing Record Count: 0
 Valid Record Count: 7
 Skipped Record Count: 0
+Error Record Count: 0
diff --git a/src/main/java/com/datastax/cdm/cql/statement/TargetUpsertRunDetailsStatement.java b/src/main/java/com/datastax/cdm/cql/statement/TargetUpsertRunDetailsStatement.java
@@ -62,7 +62,7 @@ public TargetUpsertRunDetailsStatement(CqlSession session, String keyspaceTable)
 
         this.session.execute("create table if not exists " + cdmKsTabInfo
                 + " (table_name text, run_id bigint, run_type text, prev_run_id bigint, start_time timestamp, end_time timestamp, run_info text, status text, primary key (table_name, run_id))");
-        
+
         // TODO: Remove this code block after a few releases, its only added for backward compatibility
         try {
             this.session.execute("alter table " + cdmKsTabInfo + " add status text");
diff --git a/src/main/java/com/datastax/cdm/feature/TrackRun.java b/src/main/java/com/datastax/cdm/feature/TrackRun.java
@@ -32,7 +32,7 @@ public enum RUN_TYPE {
     }
 
     public enum RUN_STATUS {
-        NOT_STARTED, STARTED, PASS, FAIL, DIFF, ENDED
+        NOT_STARTED, STARTED, PASS, FAIL, DIFF, DIFF_CORRECTED, ENDED
     }
 
     public Logger logger = LoggerFactory.getLogger(this.getClass().getName());
diff --git a/src/main/java/com/datastax/cdm/job/DiffJobSession.java b/src/main/java/com/datastax/cdm/job/DiffJobSession.java
@@ -73,7 +73,7 @@ public DiffJobSession(CqlSession originSession, CqlSession targetSession, SparkC
         this.jobCounter.setRegisteredTypes(JobCounter.CounterType.READ, JobCounter.CounterType.VALID,
                 JobCounter.CounterType.MISMATCH, JobCounter.CounterType.CORRECTED_MISMATCH,
                 JobCounter.CounterType.MISSING, JobCounter.CounterType.CORRECTED_MISSING,
-                JobCounter.CounterType.SKIPPED);
+                JobCounter.CounterType.SKIPPED, JobCounter.CounterType.ERROR);
 
         autoCorrectMissing = propertyHelper.getBoolean(KnownProperties.AUTOCORRECT_MISSING);
         logger.info("PARAM -- Autocorrect Missing: {}", autoCorrectMissing);
@@ -192,11 +192,23 @@ private void getDataAndDiff(BigInteger min, BigInteger max) {
             }
 
             if (hasDiff.get() && null != trackRunFeature) {
-                trackRunFeature.updateCdmRun(min, TrackRun.RUN_STATUS.DIFF);
+                if (jobCounter.getCount(JobCounter.CounterType.MISSING) == jobCounter
+                        .getCount(JobCounter.CounterType.CORRECTED_MISSING)
+                        && jobCounter.getCount(JobCounter.CounterType.MISMATCH) == jobCounter
+                                .getCount(JobCounter.CounterType.CORRECTED_MISMATCH)) {
+                    trackRunFeature.updateCdmRun(min, TrackRun.RUN_STATUS.DIFF_CORRECTED);
+                } else {
+                    trackRunFeature.updateCdmRun(min, TrackRun.RUN_STATUS.DIFF);
+                }
             } else if (null != trackRunFeature) {
                 trackRunFeature.updateCdmRun(min, TrackRun.RUN_STATUS.PASS);
             }
         } catch (Exception e) {
+            jobCounter.threadIncrement(JobCounter.CounterType.ERROR,
+                    jobCounter.getCount(JobCounter.CounterType.READ) - jobCounter.getCount(JobCounter.CounterType.VALID)
+                            - jobCounter.getCount(JobCounter.CounterType.MISSING)
+                            - jobCounter.getCount(JobCounter.CounterType.MISMATCH)
+                            - jobCounter.getCount(JobCounter.CounterType.SKIPPED));
             logger.error("Error with PartitionRange -- ThreadID: {} Processing min: {} max: {}",
                     Thread.currentThread().getId(), min, max, e);
             if (null != trackRunFeature)
diff --git a/src/test/java/com/datastax/cdm/cql/statement/TargetUpsertRunDetailsStatementTest.java b/src/test/java/com/datastax/cdm/cql/statement/TargetUpsertRunDetailsStatementTest.java
@@ -62,7 +62,6 @@ public void setup() {
         when(preparedStatement.bind(any())).thenReturn(bStatement);
         when(cqlSession.execute(bStatement)).thenReturn(rs);
         when(rs.all()).thenReturn(List.of(row));
-
     }
 
     @Test
diff --git a/src/test/java/com/datastax/cdm/feature/TrackRunTest.java b/src/test/java/com/datastax/cdm/feature/TrackRunTest.java
@@ -16,18 +16,53 @@
 package com.datastax.cdm.feature;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.when;
 
+import java.util.Collection;
+
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
+import org.mockito.Mock;
+
+import com.datastax.cdm.cql.CommonMocks;
+import com.datastax.cdm.job.RunNotStartedException;
+import com.datastax.cdm.job.SplitPartitions;
+import com.datastax.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.cql.BoundStatement;
+
+class TrackRunTest extends CommonMocks {
+
+    @Mock
+    CqlSession cqlSession;
+
+    @Mock
+    BoundStatement bStatement;
 
-class TrackRunTest {
+    @BeforeEach
+    public void setup() {
+        // UPDATE is needed by counters, though the class should handle non-counter updates
+        commonSetup(false, false, true);
+        when(cqlSession.prepare(anyString())).thenReturn(preparedStatement);
+        when(preparedStatement.bind(any())).thenReturn(bStatement);
+    }
 
     @Test
-    void test() {
+    void countTypesAndStatus() {
         assertEquals("MIGRATE", TrackRun.RUN_TYPE.MIGRATE.name());
         assertEquals("DIFF_DATA", TrackRun.RUN_TYPE.DIFF_DATA.name());
 
         assertEquals(2, TrackRun.RUN_TYPE.values().length);
-        assertEquals(6, TrackRun.RUN_STATUS.values().length);
+        assertEquals(7, TrackRun.RUN_STATUS.values().length);
+    }
+
+    @Test
+    void init() throws RunNotStartedException {
+        TrackRun trackRun = new TrackRun(cqlSession, "keyspace.table");
+        Collection<SplitPartitions.Partition> parts = trackRun.getPendingPartitions(0);
+
+        assertEquals(0, parts.size());
     }
 
 }
