Add test for earlies timestamp

Author: misolt

dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/snowflake/SnowflakeLogsConnector.java

@@ -18,6 +18,7 @@
 
 import static com.google.edwmigration.dumper.application.dumper.connector.snowflake.SnowflakeInput.SCHEMA_ONLY_SOURCE;
 import static com.google.edwmigration.dumper.application.dumper.utils.ArchiveNameUtil.getEntryFileNameWithTimestamp;
+import static org.apache.commons.lang3.StringUtils.isBlank;
 
 import com.google.auto.service.AutoService;
 import com.google.common.base.CaseFormat;
@@ -225,11 +226,7 @@ private String createQueryFromAccountUsage(ConnectorArguments arguments)
                 + "FROM SNOWFLAKE.ACCOUNT_USAGE.QUERY_HISTORY\n"
                 + "WHERE end_time >= to_timestamp_ltz('%s')\n"
                 + "AND end_time <= to_timestamp_ltz('%s')\n");
-    if (!StringUtils.isBlank(arguments.getQueryLogEarliestTimestamp()))
-      queryBuilder
-          .append("AND start_time >= ")
-          .append(arguments.getQueryLogEarliestTimestamp())
-          .append("\n");
+    queryBuilder.append(extractEarliestTimestamp(arguments));
     if (overrideWhere != null) queryBuilder.append(" AND ").append(overrideWhere);
     return queryBuilder.toString().replace('\n', ' ');
   }
@@ -242,8 +239,6 @@ private String createQueryFromInformationSchema(ConnectorArguments arguments)
     String overrideQuery = getOverrideQuery(arguments);
     if (overrideQuery != null) return overrideQuery;
 
-    String overrideWhere = getOverrideWhere(arguments);
-
     @SuppressWarnings("OrphanedFormatString")
     StringBuilder queryBuilder =
         new StringBuilder(
@@ -268,20 +263,18 @@ private String createQueryFromInformationSchema(ConnectorArguments arguments)
                 // maximum range of 7 trailing days.
                 + ",end_time_range_start=>to_timestamp_ltz('%s')\n"
                 + ",end_time_range_end=>to_timestamp_ltz('%s')\n"
-                + "))\n");
+                // It makes leter formatting easier if we always have a 'WHERE'.
+                + ")) WHERE 1=1\n");
     // if the user specifies an earliest start time there will be extraneous empty dump files
     // because we always iterate over the full 7 trailing days; maybe it's worth
     // 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.
-    // TODO: Use ZonedIntervalIterableGenerator.forConnectorArguments()
-    boolean appendStartTime = !StringUtils.isBlank(arguments.getQueryLogEarliestTimestamp());
-    if (appendStartTime)
-      queryBuilder
-          .append("WHERE start_time >= ")
-          .append(arguments.getQueryLogEarliestTimestamp())
-          .append("\n");
-    if (overrideWhere != null)
-      queryBuilder.append(appendStartTime ? " AND " : "WHERE").append(overrideWhere);
+    queryBuilder.append(extractEarliestTimestamp(arguments));
+
+    String overrideWhere = getOverrideWhere(arguments);
+    if (overrideWhere != null) {
+      queryBuilder.append(" AND " + overrideWhere);
+    }
     return queryBuilder.toString().replace('\n', ' ');
   }
 
@@ -343,15 +336,21 @@ private String createExtendedQueryFromAccountUsage(ConnectorArguments arguments)
                 + "AND end_time <= to_timestamp_ltz('%s')\n"
                 + "AND is_client_generated_statement = FALSE\n");
 
-    if (!StringUtils.isBlank(arguments.getQueryLogEarliestTimestamp()))
-      queryBuilder
-          .append("AND start_time >= ")
-          .append(arguments.getQueryLogEarliestTimestamp())
-          .append("\n");
+    queryBuilder.append(extractEarliestTimestamp(arguments));
     if (overrideWhere != null) queryBuilder.append(" AND ").append(overrideWhere);
     return queryBuilder.toString().replace('\n', ' ');
   }
 
+  @Nonnull
+  static String extractEarliestTimestamp(@Nonnull ConnectorArguments arguments) {
+    String timestamp = arguments.getQueryLogEarliestTimestamp();
+    if (isBlank(timestamp)) {
+      return "";
+    } else {
+      return String.format("AND start_time >= %s\n", timestamp);
+    }
+  }
+
   @CheckForNull
   private String getOverrideQuery(@Nonnull ConnectorArguments arguments)
       throws MetadataDumperUsageException {

dumper/app/src/test/java/com/google/edwmigration/dumper/application/dumper/connector/snowflake/SnowflakeLogsConnectorTest.java

@@ -16,10 +16,12 @@
  */
 package com.google.edwmigration.dumper.application.dumper.connector.snowflake;
 
-import com.google.common.base.Predicates;
+import static com.google.common.base.Predicates.alwaysTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import com.google.edwmigration.dumper.application.dumper.ConnectorArguments;
 import com.google.edwmigration.dumper.application.dumper.MetadataDumperUsageException;
-import com.google.edwmigration.dumper.plugin.lib.dumper.spi.SnowflakeLogsDumpFormat;
 import com.google.edwmigration.dumper.test.TestUtils;
 import java.io.File;
 import java.io.IOException;
@@ -30,20 +32,48 @@
 
 /** @author shevek */
 @RunWith(JUnit4.class)
-public class SnowflakeLogsConnectorTest extends AbstractSnowflakeConnectorExecutionTest {
-
-  private final SnowflakeLogsConnector connector = new SnowflakeLogsConnector();
+public class SnowflakeLogsConnectorTest {
 
   @Test
   public void testExecution() throws Exception {
+    class ExecutionTest extends AbstractSnowflakeConnectorExecutionTest {
+      void test(File output) {
+        if (run(ARGS(new SnowflakeLogsConnector(), output))) {
+          new ZipValidator()
+              .withFormat("snowflake.logs.zip")
+              .withAllowedEntries(alwaysTrue())
+              .run(output);
+        }
+      }
+    }
     File outputFile = TestUtils.newOutputFile("compilerworks-snowflake-logs-au.zip");
-    if (!run(ARGS(connector, outputFile))) return;
 
-    ZipValidator validator = new ZipValidator().withFormat(SnowflakeLogsDumpFormat.FORMAT_NAME);
+    new ExecutionTest().test(outputFile);
+  }
+
+  @Test
+  public void extractEarliestTimestamp_notProvided_emptyResult() throws IOException {
+    ConnectorArguments arguments = new ConnectorArguments("--connector", "snowflake-logs");
+
+    String result = SnowflakeLogsConnector.extractEarliestTimestamp(arguments);
+
+    assertEquals("", result);
+  }
+
+  @Test
+  public void extractEarliestTimestamp_provided_resultMatches() throws IOException {
+    ConnectorArguments arguments =
+        new ConnectorArguments(
+            "--connector",
+            "snowflake-logs",
+            "--" + ConnectorArguments.OPT_QUERY_LOG_EARLIEST_TIMESTAMP,
+            "2024-03-21");
 
-    validator.withAllowedEntries(Predicates.alwaysTrue()); // Permit any files.
+    String result = SnowflakeLogsConnector.extractEarliestTimestamp(arguments);
 
-    validator.run(outputFile);
+    assertTrue(result, result.contains("2024-03-21"));
+    assertTrue(result, result.contains("start_time"));
+    assertTrue(result, result.endsWith("\n"));
   }
 
   @Test