diff --git a/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/snowflake/SnowflakeLogsConnector.java b/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/snowflake/SnowflakeLogsConnector.java index 148b5c895..e1329493b 100644 --- a/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/snowflake/SnowflakeLogsConnector.java +++ b/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/snowflake/SnowflakeLogsConnector.java @@ -207,6 +207,7 @@ private String createExtendedQueryFromAccountUsage(ConnectorArguments arguments) + "session_id, \n" + "user_name, \n" + "warehouse_name, \n" + + "warehouse_size, \n" + "cluster_number, \n" + "query_tag, \n" + "execution_status, \n" @@ -423,6 +424,12 @@ enum TimeSeriesView { TimeSeriesColumn.END_TIME, SnowflakeLogsConnectorProperty.QUERY_ACCELERATION_HISTORY_OVERRIDE_QUERY, TaskCategory.OPTIONAL), + QUERY_ATTRIBUTION_HISTORY( + QueryAttributionHistoryFormat.Header.class, + QueryAttributionHistoryFormat.ZIP_ENTRY_PREFIX, + TimeSeriesColumn.END_TIME, + SnowflakeLogsConnectorProperty.QUERY_ATTRIBUTION_HISTORY_OVERRIDE_QUERY + ), REPLICATION_GROUP_USAGE_HISTORY( ReplicationGroupUsageHistoryFormat.Header.class, ReplicationGroupUsageHistoryFormat.ZIP_ENTRY_PREFIX, @@ -488,6 +495,7 @@ enum TimeSeriesView { METERING_DAILY_HISTORY, PIPE_USAGE_HISTORY, QUERY_ACCELERATION_HISTORY, + QUERY_ATTRIBUTION_HISTORY, REPLICATION_GROUP_USAGE_HISTORY, SERVERLESS_TASK_HISTORY, TASK_HISTORY, diff --git a/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/snowflake/SnowflakeLogsConnectorProperty.java b/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/snowflake/SnowflakeLogsConnectorProperty.java index b239d1b0c..b95545674 100644 --- a/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/snowflake/SnowflakeLogsConnectorProperty.java +++ b/dumper/app/src/main/java/com/google/edwmigration/dumper/application/dumper/connector/snowflake/SnowflakeLogsConnectorProperty.java @@ -47,6 +47,10 @@ enum SnowflakeLogsConnectorProperty implements ConnectorProperty { QUERY_ACCELERATION_HISTORY_OVERRIDE_QUERY( "snowflake.query_acceleration_history.query", "Custom query for query acceleration history dump"), + QUERY_ATTRIBUTION_HISTORY_OVERRIDE_QUERY( + "snowflake.query_attribution_history.query", + "Custom query for query attribution history dump" + ), REPLICATION_GROUP_USAGE_HISTORY_OVERRIDE_QUERY( "snowflake.replication_group_usage_history.query", "Custom query for replication group usage history dump"), diff --git a/dumper/lib-dumper-spi/src/main/java/com/google/edwmigration/dumper/plugin/lib/dumper/spi/SnowflakeLogsDumpFormat.java b/dumper/lib-dumper-spi/src/main/java/com/google/edwmigration/dumper/plugin/lib/dumper/spi/SnowflakeLogsDumpFormat.java index 1a11c5b7e..19303e26c 100644 --- a/dumper/lib-dumper-spi/src/main/java/com/google/edwmigration/dumper/plugin/lib/dumper/spi/SnowflakeLogsDumpFormat.java +++ b/dumper/lib-dumper-spi/src/main/java/com/google/edwmigration/dumper/plugin/lib/dumper/spi/SnowflakeLogsDumpFormat.java @@ -54,6 +54,7 @@ enum Header { SessionId, UserName, WarehouseName, + WarehouseSize, ClusterNumber, QueryTag, ExecutionStatus, @@ -241,6 +242,22 @@ enum Header { } } + interface QueryAttributionHistoryFormat { + + String ZIP_ENTRY_PREFIX = "query_attribution_history-au_"; + + enum Header { + QueryId, + QueryHash, + WarehouseName, + UserName, + StartTime, + EndTime, + CreditsAttributedCompute, + CreditsUsedQueryAcceleration + } + } + interface ReplicationGroupUsageHistoryFormat { String ZIP_ENTRY_PREFIX = "replication_group_usage_history-au_";