@@ -61,12 +61,21 @@ private enum Format {
6161 private static final String TIME_PREDICATE =
6262 "timestamp > CURRENT_TIMESTAMP(0) - INTERVAL '14 days'" ;
6363
64+ private final ImmutableList <AssessmentQuery > assessmentQueries =
65+ ImmutableList .of (
66+ AssessmentQuery .createMetricsSelect (Format .TABLE_STORAGE_METRICS , UPPER_UNDERSCORE ),
67+ AssessmentQuery .createShow ("WAREHOUSES" , Format .WAREHOUSES , LOWER_UNDERSCORE ),
68+ SHOW_EXTERNAL_TABLES ,
69+ AssessmentQuery .createShow ("FUNCTIONS" , Format .FUNCTION_INFO , LOWER_UNDERSCORE ));
70+
71+ private final ImmutableList <AssessmentQuery > liteAssessmentQueries =
72+ ImmutableList .of (
73+ AssessmentQuery .createShow ("WAREHOUSES" , Format .WAREHOUSES , LOWER_UNDERSCORE ),
74+ AssessmentQuery .createShow ("EXTERNAL TABLES" , Format .EXTERNAL_TABLES , LOWER_UNDERSCORE ),
75+ AssessmentQuery .createShow ("FUNCTIONS" , Format .FUNCTION_INFO , LOWER_UNDERSCORE ));
76+
6477 ImmutableList <AssessmentQuery > generateAssessmentQueries () {
65- return ImmutableList .of (
66- AssessmentQuery .createMetricsSelect (Format .TABLE_STORAGE_METRICS , UPPER_UNDERSCORE ),
67- AssessmentQuery .createShow ("WAREHOUSES" , Format .WAREHOUSES , LOWER_UNDERSCORE ),
68- SHOW_EXTERNAL_TABLES ,
69- AssessmentQuery .createShow ("FUNCTIONS" , Format .FUNCTION_INFO , LOWER_UNDERSCORE ));
78+ return assessmentQueries ;
7079 }
7180
7281 ImmutableList <Task <?>> generateLiteSpecificQueries () {
@@ -101,12 +110,6 @@ ImmutableList<Task<?>> generateLiteSpecificQueries() {
101110 builder .add (warehouseMeteringTask ());
102111 builder .add (storageMetricsLiteTask ());
103112
104- ImmutableList <AssessmentQuery > liteAssessmentQueries =
105- ImmutableList .of (
106- AssessmentQuery .createShow ("WAREHOUSES" , Format .WAREHOUSES , LOWER_UNDERSCORE ),
107- AssessmentQuery .createShow ("EXTERNAL TABLES" , Format .EXTERNAL_TABLES , LOWER_UNDERSCORE ),
108- AssessmentQuery .createShow ("FUNCTIONS" , Format .FUNCTION_INFO , LOWER_UNDERSCORE ));
109-
110113 for (AssessmentQuery item : liteAssessmentQueries ) {
111114 String query = String .format (item .formatString , view , /* an empty WHERE clause */ "" );
112115 String zipName = item .zipEntryName ;
0 commit comments