Skip to content

Commit a7274f2

Browse files
authored
Extract metrics from additional views (#979)
- Extract metrics from the QUERY_ATTRIBUTION_HISTORY view. - Extract warehouse_size from the QUERY_HISTORY view.
1 parent 9bcc0ea commit a7274f2

File tree

3 files changed

+29
-0
lines changed

3 files changed

+29
-0
lines changed

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ private String createExtendedQueryFromAccountUsage(ConnectorArguments arguments)
207207
+ "session_id, \n"
208208
+ "user_name, \n"
209209
+ "warehouse_name, \n"
210+
+ "warehouse_size, \n"
210211
+ "cluster_number, \n"
211212
+ "query_tag, \n"
212213
+ "execution_status, \n"
@@ -423,6 +424,12 @@ enum TimeSeriesView {
423424
TimeSeriesColumn.END_TIME,
424425
SnowflakeLogsConnectorProperty.QUERY_ACCELERATION_HISTORY_OVERRIDE_QUERY,
425426
TaskCategory.OPTIONAL),
427+
QUERY_ATTRIBUTION_HISTORY(
428+
QueryAttributionHistoryFormat.Header.class,
429+
QueryAttributionHistoryFormat.ZIP_ENTRY_PREFIX,
430+
TimeSeriesColumn.END_TIME,
431+
SnowflakeLogsConnectorProperty.QUERY_ATTRIBUTION_HISTORY_OVERRIDE_QUERY
432+
),
426433
REPLICATION_GROUP_USAGE_HISTORY(
427434
ReplicationGroupUsageHistoryFormat.Header.class,
428435
ReplicationGroupUsageHistoryFormat.ZIP_ENTRY_PREFIX,
@@ -488,6 +495,7 @@ enum TimeSeriesView {
488495
METERING_DAILY_HISTORY,
489496
PIPE_USAGE_HISTORY,
490497
QUERY_ACCELERATION_HISTORY,
498+
QUERY_ATTRIBUTION_HISTORY,
491499
REPLICATION_GROUP_USAGE_HISTORY,
492500
SERVERLESS_TASK_HISTORY,
493501
TASK_HISTORY,

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ enum SnowflakeLogsConnectorProperty implements ConnectorProperty {
4747
QUERY_ACCELERATION_HISTORY_OVERRIDE_QUERY(
4848
"snowflake.query_acceleration_history.query",
4949
"Custom query for query acceleration history dump"),
50+
QUERY_ATTRIBUTION_HISTORY_OVERRIDE_QUERY(
51+
"snowflake.query_attribution_history.query",
52+
"Custom query for query attribution history dump"
53+
),
5054
REPLICATION_GROUP_USAGE_HISTORY_OVERRIDE_QUERY(
5155
"snowflake.replication_group_usage_history.query",
5256
"Custom query for replication group usage history dump"),

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ enum Header {
5454
SessionId,
5555
UserName,
5656
WarehouseName,
57+
WarehouseSize,
5758
ClusterNumber,
5859
QueryTag,
5960
ExecutionStatus,
@@ -241,6 +242,22 @@ enum Header {
241242
}
242243
}
243244

245+
interface QueryAttributionHistoryFormat {
246+
247+
String ZIP_ENTRY_PREFIX = "query_attribution_history-au_";
248+
249+
enum Header {
250+
QueryId,
251+
QueryHash,
252+
WarehouseName,
253+
UserName,
254+
StartTime,
255+
EndTime,
256+
CreditsAttributedCompute,
257+
CreditsUsedQueryAcceleration
258+
}
259+
}
260+
244261
interface ReplicationGroupUsageHistoryFormat {
245262

246263
String ZIP_ENTRY_PREFIX = "replication_group_usage_history-au_";

0 commit comments

Comments
 (0)