Skip to content

Commit 880a0d1

Browse files
committed
Fix: acceleration history task should be optional
The category of this task was broken by an earlier change.
1 parent 0daf8ed commit 880a0d1

File tree

2 files changed

+30
-2
lines changed

2 files changed

+30
-2
lines changed

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

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,8 @@ enum TimeSeriesView {
430430
QueryAccelerationHistoryFormat.Header.class,
431431
QueryAccelerationHistoryFormat.ZIP_ENTRY_PREFIX,
432432
TimeSeriesColumn.END_TIME,
433-
SnowflakeLogsConnectorProperty.QUERY_ACCELERATION_HISTORY_OVERRIDE_QUERY),
433+
SnowflakeLogsConnectorProperty.QUERY_ACCELERATION_HISTORY_OVERRIDE_QUERY,
434+
TaskCategory.OPTIONAL),
434435
REPLICATION_GROUP_USAGE_HISTORY(
435436
ReplicationGroupUsageHistoryFormat.Header.class,
436437
QueryAccelerationHistoryFormat.ZIP_ENTRY_PREFIX,
@@ -461,20 +462,31 @@ enum TimeSeriesView {
461462
final ConnectorProperty property;
462463
final String queryPrefix;
463464
final String zipPrefix;
465+
final TaskCategory category;
464466
final TimeSeriesColumn column;
465467

466468
TimeSeriesView(
467469
Class<? extends Enum<?>> headerClass,
468470
String zipPrefix,
469471
TimeSeriesColumn column,
470-
SnowflakeLogsConnectorProperty property) {
472+
SnowflakeLogsConnectorProperty property,
473+
TaskCategory category) {
471474
this.headerClass = headerClass;
472475
this.property = property;
473476
this.queryPrefix = formatPrefix(headerClass, name());
474477
this.zipPrefix = zipPrefix;
478+
this.category = category;
475479
this.column = column;
476480
}
477481

482+
TimeSeriesView(
483+
Class<? extends Enum<?>> headerClass,
484+
String zipPrefix,
485+
TimeSeriesColumn column,
486+
SnowflakeLogsConnectorProperty property) {
487+
this(headerClass, zipPrefix, column, property, TaskCategory.REQUIRED);
488+
}
489+
478490
static final ImmutableList<TimeSeriesView> valuesInOrder =
479491
ImmutableList.of(
480492
WAREHOUSE_EVENTS_HISTORY,

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@
2626
import static org.junit.Assert.assertFalse;
2727
import static org.junit.Assert.assertThrows;
2828
import static org.junit.Assert.assertTrue;
29+
import static org.junit.Assume.assumeFalse;
2930

3031
import com.google.common.collect.ImmutableList;
3132
import com.google.edwmigration.dumper.application.dumper.ConnectorArguments;
3233
import com.google.edwmigration.dumper.application.dumper.MetadataDumperUsageException;
3334
import com.google.edwmigration.dumper.application.dumper.connector.snowflake.SnowflakeLogsConnector.TimeSeriesView;
35+
import com.google.edwmigration.dumper.application.dumper.task.TaskCategory;
3436
import com.google.edwmigration.dumper.test.TestUtils;
3537
import java.io.File;
3638
import org.junit.Test;
@@ -111,6 +113,20 @@ public void addOverridesToQuery_whereOverride_success() {
111113
assertTrue(result, result.contains(override));
112114
}
113115

116+
@Test
117+
public void category_accelerationHistory_isOptional() {
118+
TimeSeriesView view = TimeSeriesView.QUERY_ACCELERATION_HISTORY;
119+
120+
assertEquals(view.category, TaskCategory.OPTIONAL);
121+
}
122+
123+
@Theory
124+
public void category_notAccelerationHistory_isRequired(TimeSeriesView view) {
125+
assumeFalse(view.equals(TimeSeriesView.QUERY_ACCELERATION_HISTORY));
126+
127+
assertEquals(view.category, TaskCategory.REQUIRED);
128+
}
129+
114130
@Test
115131
public void earliestTimestamp_notProvided_emptyResult() {
116132
ConnectorArguments arguments =

0 commit comments

Comments
 (0)