Upgraded trackRun feature to include status on Info table & also fixe…

…d rerun of uninitialized jobs

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

@@ -22,11 +22,13 @@
 
 import com.datastax.cdm.feature.TrackRun;
 import com.datastax.cdm.feature.TrackRun.RUN_TYPE;
+import com.datastax.cdm.job.RunNotStartedException;
 import com.datastax.cdm.job.SplitPartitions;
 import com.datastax.cdm.job.SplitPartitions.Partition;
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.cql.BoundStatement;
 import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.Row;
 
 public class TargetUpsertRunDetailsStatement {
     private CqlSession session;
@@ -36,45 +38,66 @@ public class TargetUpsertRunDetailsStatement {
     private long prevRunId;
     private BoundStatement boundInitInfoStatement;
     private BoundStatement boundInitStatement;
-    private BoundStatement boundUpdateInfoStatement;
+    private BoundStatement boundEndInfoStatement;
     private BoundStatement boundUpdateStatement;
     private BoundStatement boundUpdateStartStatement;
+    private BoundStatement boundSelectInfoStatement;
     private BoundStatement boundSelectStatement;
 
     public TargetUpsertRunDetailsStatement(CqlSession session, String keyspaceTable) {
         this.session = session;
         String[] ksTab = keyspaceTable.split("\\.");
+        if (ksTab.length != 2) {
+            throw new RuntimeException("Invalid keyspace.table format: " + keyspaceTable);
+        }
         this.keyspaceName = ksTab[0];
         this.tableName = ksTab[1];
         String cdmKsTabInfo = this.keyspaceName + ".cdm_run_info";
         String cdmKsTabDetails = this.keyspaceName + ".cdm_run_details";
 
         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, primary key (table_name, run_id))");
-        this.session.execute("create table if not exists " + cdmKsTabDetails
-                + " (table_name text, run_id bigint, start_time timestamp, token_min bigint, token_max bigint, status text, primary key ((table_name, run_id), token_min))");
+        try {
+            this.session.execute("alter table " + cdmKsTabInfo + " add status text");
+        } catch (Exception e) {
+            // ignore if column already exists
+        }
 
         boundInitInfoStatement = bindStatement("INSERT INTO " + cdmKsTabInfo
-                + " (table_name, run_id, run_type, prev_run_id, start_time) VALUES (?, ?, ?, ?, dateof(now()))");
+                + " (table_name, run_id, run_type, prev_run_id, start_time, status) VALUES (?, ?, ?, ?, dateof(now()), ?)");
         boundInitStatement = bindStatement("INSERT INTO " + cdmKsTabDetails
                 + " (table_name, run_id, token_min, token_max, status) VALUES (?, ?, ?, ?, ?)");
-        boundUpdateInfoStatement = bindStatement("UPDATE " + cdmKsTabInfo
-                + " SET end_time = dateof(now()), run_info = ? WHERE table_name = ? AND run_id = ?");
+        boundEndInfoStatement = bindStatement("UPDATE " + cdmKsTabInfo
+                + " SET end_time = dateof(now()), run_info = ?, status = ? WHERE table_name = ? AND run_id = ?");
         boundUpdateStatement = bindStatement(
                 "UPDATE " + cdmKsTabDetails + " SET status = ? WHERE table_name = ? AND run_id = ? AND token_min = ?");
         boundUpdateStartStatement = bindStatement("UPDATE " + cdmKsTabDetails
                 + " SET start_time = dateof(now()), status = ? WHERE table_name = ? AND run_id = ? AND token_min = ?");
+        boundSelectInfoStatement = bindStatement(
+                "SELECT status FROM " + cdmKsTabInfo + " WHERE table_name = ? AND run_id = ?");
         boundSelectStatement = bindStatement("SELECT token_min, token_max FROM " + cdmKsTabDetails
                 + " WHERE table_name = ? AND run_id = ? and status in ('NOT_STARTED', 'STARTED', 'FAIL', 'DIFF') ALLOW FILTERING");
     }
 
-    public Collection<SplitPartitions.Partition> getPendingPartitions(long prevRunId) {
+    public Collection<SplitPartitions.Partition> getPendingPartitions(long prevRunId) throws RunNotStartedException {
         this.prevRunId = prevRunId;
+        final Collection<SplitPartitions.Partition> pendingParts = new ArrayList<SplitPartitions.Partition>();
         if (prevRunId == 0) {
-            return new ArrayList<SplitPartitions.Partition>();
+            return pendingParts;
+        }
+
+        ResultSet rsInfo = session
+                .execute(boundSelectInfoStatement.setString("table_name", tableName).setLong("run_id", prevRunId));
+        Row cdmRunStatus = rsInfo.one();
+        if (cdmRunStatus == null) {
+            return pendingParts;
+        } else {
+            String status = cdmRunStatus.getString("status");
+            if (TrackRun.RUN_STATUS.NOT_STARTED.toString().equals(status)) {
+                throw new RunNotStartedException("Run not started for run_id: " + prevRunId);
+            }
         }
 
-        final Collection<SplitPartitions.Partition> pendingParts = new ArrayList<SplitPartitions.Partition>();
         ResultSet rs = session
                 .execute(boundSelectStatement.setString("table_name", tableName).setLong("run_id", prevRunId));
         rs.forEach(row -> {
@@ -89,8 +112,12 @@ public Collection<SplitPartitions.Partition> getPendingPartitions(long prevRunId
     public long initCdmRun(Collection<SplitPartitions.Partition> parts, RUN_TYPE runType) {
         runId = System.currentTimeMillis();
         session.execute(boundInitInfoStatement.setString("table_name", tableName).setLong("run_id", runId)
-                .setString("run_type", runType.toString()).setLong("prev_run_id", prevRunId));
+                .setString("run_type", runType.toString()).setLong("prev_run_id", prevRunId)
+                .setString("status", TrackRun.RUN_STATUS.NOT_STARTED.toString()));
         parts.forEach(part -> initCdmRun(part));
+        session.execute(boundInitInfoStatement.setString("table_name", tableName).setLong("run_id", runId)
+                .setString("run_type", runType.toString()).setLong("prev_run_id", prevRunId)
+                .setString("status", TrackRun.RUN_STATUS.STARTED.toString()));
         return runId;
     }
 
@@ -101,9 +128,9 @@ private void initCdmRun(Partition partition) {
                 .setString("status", TrackRun.RUN_STATUS.NOT_STARTED.toString()));
     }
 
-    public void updateCdmRunInfo(String runInfo) {
-        session.execute(boundUpdateInfoStatement.setString("table_name", tableName).setLong("run_id", runId)
-                .setString("run_info", runInfo));
+    public void endCdmRun(String runInfo) {
+        session.execute(boundEndInfoStatement.setString("table_name", tableName).setLong("run_id", runId)
+                .setString("run_info", runInfo).setString("status", TrackRun.RUN_STATUS.ENDED.toString()));
     }
 
     public void updateCdmRun(BigInteger min, TrackRun.RUN_STATUS status) {

src/main/java/com/datastax/cdm/data/DataUtility.java

@@ -131,10 +131,16 @@ public static String getMyClassMethodLine(Exception e) {
                 break;
             }
         }
-        String className = targetStackTraceElement.getClassName();
-        String methodName = targetStackTraceElement.getMethodName();
-        int lineNumber = targetStackTraceElement.getLineNumber();
+        if (null == targetStackTraceElement && null != stackTraceElements && stackTraceElements.length > 0) {
+            targetStackTraceElement = stackTraceElements[0];
+        }
+        if (null != targetStackTraceElement) {
+            String className = targetStackTraceElement.getClassName();
+            String methodName = targetStackTraceElement.getMethodName();
+            int lineNumber = targetStackTraceElement.getLineNumber();
+            return className + "." + methodName + ":" + lineNumber;
+        }
 
-        return className + "." + methodName + ":" + lineNumber;
+        return "Unknown";
     }
 }

src/main/java/com/datastax/cdm/feature/TrackRun.java

@@ -22,6 +22,7 @@
 import org.slf4j.LoggerFactory;
 
 import com.datastax.cdm.cql.statement.TargetUpsertRunDetailsStatement;
+import com.datastax.cdm.job.RunNotStartedException;
 import com.datastax.cdm.job.SplitPartitions;
 import com.datastax.oss.driver.api.core.CqlSession;
 
@@ -31,7 +32,7 @@ public enum RUN_TYPE {
     }
 
     public enum RUN_STATUS {
-        NOT_STARTED, STARTED, PASS, FAIL, DIFF
+        NOT_STARTED, STARTED, PASS, FAIL, DIFF, ENDED
     }
 
     public Logger logger = LoggerFactory.getLogger(this.getClass().getName());
@@ -41,7 +42,7 @@ public TrackRun(CqlSession session, String keyspaceTable) {
         this.runStatement = new TargetUpsertRunDetailsStatement(session, keyspaceTable);
     }
 
-    public Collection<SplitPartitions.Partition> getPendingPartitions(long prevRunId) {
+    public Collection<SplitPartitions.Partition> getPendingPartitions(long prevRunId) throws RunNotStartedException {
         Collection<SplitPartitions.Partition> pendingParts = runStatement.getPendingPartitions(prevRunId);
         logger.info("###################### {} partitions pending from previous run id {} ######################",
                 pendingParts.size(), prevRunId);
@@ -60,6 +61,6 @@ public void updateCdmRun(BigInteger min, RUN_STATUS status) {
     }
 
     public void endCdmRun(String runInfo) {
-        runStatement.updateCdmRunInfo(runInfo);
+        runStatement.endCdmRun(runInfo);
     }
 }

src/main/java/com/datastax/cdm/job/RunNotStartedException.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright DataStax, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.datastax.cdm.job;
+
+public class RunNotStartedException extends Exception {
+
+    private static final long serialVersionUID = -4108800389847708120L;
+
+    public RunNotStartedException(String message) {
+        super(message);
+    }
+
+}

src/main/scala/com/datastax/cdm/job/BasePartitionJob.scala

@@ -38,7 +38,11 @@ abstract class BasePartitionJob extends BaseJob[SplitPartitions.Partition] {
     }
 
     if (prevRunId != 0) {
-      trackRunFeature.getPendingPartitions(prevRunId)
+      try {
+        trackRunFeature.getPendingPartitions(prevRunId)
+      } catch {
+        case e: RunNotStartedException => SplitPartitions.getRandomSubPartitions(pieces, minPartition, maxPartition, coveragePercent)
+      }
     } else {
       SplitPartitions.getRandomSubPartitions(pieces, minPartition, maxPartition, coveragePercent)
     }

src/test/java/com/datastax/cdm/cql/statement/TargetUpsertRunDetailsStatementTest.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright DataStax, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.datastax.cdm.cql.statement;
+
+import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.Mockito.*;
+
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
+
+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.oss.driver.api.core.CqlSession;
+import com.datastax.oss.driver.api.core.cql.BoundStatement;
+import com.datastax.oss.driver.api.core.cql.PreparedStatement;
+import com.datastax.oss.driver.api.core.cql.ResultSet;
+import com.datastax.oss.driver.api.core.cql.Row;
+import com.datastax.oss.driver.api.core.type.DataTypes;
+
+public class TargetUpsertRunDetailsStatementTest extends CommonMocks {
+    @Mock
+    PreparedStatement preparedStatement;
+
+    @Mock
+    CqlSession cqlSession;
+
+    @Mock
+    ResultSet rs;
+
+    @Mock
+    Row row;
+
+    @Mock
+    BoundStatement bStatement;
+
+    TargetUpsertRunDetailsStatement targetUpsertRunDetailsStatement;
+
+    @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);
+        when(cqlSession.execute(bStatement)).thenReturn(rs);
+        when(rs.all()).thenReturn(List.of(row));
+
+    }
+
+    @Test
+    public void init() throws RunNotStartedException {
+        targetUpsertRunDetailsStatement = new TargetUpsertRunDetailsStatement(cqlSession, "ks.table1");
+        assertEquals(Collections.emptyList(), targetUpsertRunDetailsStatement.getPendingPartitions(0));
+    }
+
+    @Test
+    public void incorrectKsTable() throws RunNotStartedException {
+        assertThrows(RuntimeException.class, () -> new TargetUpsertRunDetailsStatement(cqlSession, "table1"));
+    }
+
+}

src/test/java/com/datastax/cdm/data/DataUtilityTest.java

@@ -137,11 +137,26 @@ public void extractObjectsFromCollectionTest() {
     }
 
     @Test
-    public void getMyClassMethodLineTest() {
+    public void getMyClassMethodLineTestCDMClass() {
         Exception ex = new Exception();
         ex.setStackTrace(new StackTraceElement[] { new StackTraceElement("com.datastax.cdm.data.DataUtilityTest",
                 "getMyClassMethodLineTest", "DataUtilityTest.java", 0) });
         assertEquals("com.datastax.cdm.data.DataUtilityTest.getMyClassMethodLineTest:0",
                 DataUtility.getMyClassMethodLine(ex));
     }
+
+    @Test
+    public void getMyClassMethodLineTestOtherClass() {
+        Exception ex = new Exception();
+        ex.setStackTrace(new StackTraceElement[] { new StackTraceElement("com.datastax.other.SomeClass",
+                "getMyClassMethodLineTest", "SomeClass.java", 0) });
+        assertEquals("com.datastax.other.SomeClass.getMyClassMethodLineTest:0", DataUtility.getMyClassMethodLine(ex));
+    }
+
+    @Test
+    public void getMyClassMethodLineTestUnknown() {
+        Exception ex = new Exception();
+        ex.setStackTrace(new StackTraceElement[] {});
+        assertEquals("Unknown", DataUtility.getMyClassMethodLine(ex));
+    }
 }

src/test/java/com/datastax/cdm/feature/TrackRunTest.java

@@ -27,7 +27,7 @@ void test() {
         assertEquals("DIFF_DATA", TrackRun.RUN_TYPE.DIFF_DATA.name());
 
         assertEquals(2, TrackRun.RUN_TYPE.values().length);
-        assertEquals(5, TrackRun.RUN_STATUS.values().length);
+        assertEquals(6, TrackRun.RUN_STATUS.values().length);
     }
 
 }