Replace CollectTimeStamp with StartTime for Teradata query tables (#130)

Replace CollectTimeStamp with StartTime for Teradata query log tables

Author: frsv

dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/teradata/Teradata14LogsConnector.java

@@ -132,8 +132,8 @@ String getSql(@Nonnull Predicate<? super String> predicate) {
 
             buf.append(" FROM ").append(logTable).append(" L ");
 
-            buf.append(String.format("WHERE L.CollectTimeStamp >= CAST('%s' AS TIMESTAMP)\n"
-                    + "AND L.CollectTimeStamp < CAST('%s' AS TIMESTAMP)\n",
+            buf.append(String.format("WHERE L.StartTime >= CAST('%s' AS TIMESTAMP)\n"
+                    + "AND L.StartTime < CAST('%s' AS TIMESTAMP)\n",
                     SQL_FORMAT.format(interval.getStart()), SQL_FORMAT.format(interval.getEndExclusive())));
 
             for (String condition : conditions) {
@@ -168,7 +168,7 @@ public void addTasksTo(List<? super Task<?>> out, @Nonnull ConnectorArguments ar
         List<String> logConditions = new ArrayList<>();
         if (!StringUtils.isBlank(arguments.getQueryLogEarliestTimestamp())) {
             lSqlConditions.add("ST.CollectTimeStamp >= " + arguments.getQueryLogEarliestTimestamp());
-            logConditions.add("L.CollectTimeStamp >= " + arguments.getQueryLogEarliestTimestamp());
+            logConditions.add("L.StartTime >= " + arguments.getQueryLogEarliestTimestamp());
         }
 
         final int daysToExport = arguments.getQueryLogDays(7);

dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/teradata/TeradataLogsConnector.java

@@ -116,7 +116,8 @@ public class TeradataLogsConnector extends AbstractTeradataConnector implements
         "L.SessionWDID",
         "L.Statements",
         "L.TotalIOCount",
-        "L.WarningOnly"
+        "L.WarningOnly",
+        "L.StartTime"
     };
 
     public static boolean isQueryTable(@Nonnull String expression) {
@@ -230,8 +231,8 @@ private String getSql(@Nonnull JdbcHandle handle) {
             }
 
             buf.append(String.format(" WHERE L.ErrorCode=0\n"
-                    + "AND L.CollectTimeStamp >= CAST('%s' AS TIMESTAMP)\n"
-                    + "AND L.CollectTimeStamp < CAST('%s' AS TIMESTAMP)\n",
+                    + "AND L.StartTime >= CAST('%s' AS TIMESTAMP)\n"
+                    + "AND L.StartTime < CAST('%s' AS TIMESTAMP)\n",
                     SQL_FORMAT.format(interval.getStart()), SQL_FORMAT.format(interval.getEndExclusive())));
 
             for (String condition : conditions) {
@@ -425,7 +426,7 @@ public void addTasksTo(List<? super Task<?>> out, @Nonnull ConnectorArguments ar
         // preventing that in the future. To do that, we should require getQueryLogEarliestTimestamp()
         // to parse and return an ISO instant, not a database-server-specific format.
         if (!StringUtils.isBlank(arguments.getQueryLogEarliestTimestamp()))
-            conditions.add("L.CollectTimeStamp >= " + arguments.getQueryLogEarliestTimestamp());
+            conditions.add("L.StartTime >= " + arguments.getQueryLogEarliestTimestamp());
 
         // Beware of Teradata SQLSTATE HY000. See issue #4126.
         // Most likely caused by some operation (equality?) being performed on a datum which is too long for a varchar.

dumper/app/src/test/java/com/google/edwmigration/dumper/application/dumper/connector/teradata/TeradataLogsConnectorTest.java

@@ -116,7 +116,7 @@ public void testExecution() throws Exception {
             OutputHandleFactory sinkFactory = new FileSystemOutputHandleFactory(fileSystem, "/");
             handle.getJdbcTemplate().execute("attach ':memory:' as dbc");
             // handle.getJdbcTemplate().execute("create table dbc.dbcinfo (InfoKey varchar,  InfoData varchar)");
-            handle.getJdbcTemplate().execute("create table " + TeradataLogsConnector.DEF_LOG_TABLE + " (UserName varchar, errorcode int, collecttimestamp int)");
+            handle.getJdbcTemplate().execute("create table " + TeradataLogsConnector.DEF_LOG_TABLE + " (UserName varchar, errorcode int, StartTime int)");
 
             TaskRunContext runContext = new DummyTaskRunContext(sinkFactory, handle);
             List<Task<?>> tasks = new ArrayList<>();

dumper/lib-dumper-spi/src/main/java/com/google/edwmigration/dumper/plugin/lib/dumper/spi/TeradataLogsDumpFormat.java

@@ -50,7 +50,8 @@ enum Header {
         SessionWDID,
         Statements,
         TotalIOCount,
-        WarningOnly
+        WarningOnly,
+        StartTime
 
     }
 
@@ -205,7 +206,8 @@ enum HeaderLog {
         SessionWDID,
         Statements,
         TotalIOCount,
-        WarningOnly
+        WarningOnly,
+        StartTime
 
     }
 }