Merge pull request #64 from ocadotechnology/YACHT-1026

YACHT-1026: partitions that have no backups were filter out in SLI queries - fix
ocadotechnology · Sep 17, 2018 · 9d117ef · 9d117ef
2 parents 269d4b8 + 524e19b
commit 9d117ef
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/terraform/SLI_3_days_views.tf b/terraform/SLI_3_days_views.tf
@@ -71,7 +71,7 @@ resource "google_bigquery_table" "SLI_3_days_view" {
             census.datasetId=last_backups.source_dataset_id AND
             census.tableId=last_backups.source_table_id
           WHERE
-            IFNULL(census.partitionId, 'null')=IFNULL(last_backups.source_partition_id, 'null')
+            (last_backups.source_partition_id IS NULL OR last_backups.source_partition_id=census.partitionId)
             AND projectId != "${var.bbq_project}"
             AND projectId != "${var.bbq_restoration_project}"
             AND partitionId != "__UNPARTITIONED__"

diff --git a/terraform/SLI_4_days_views.tf b/terraform/SLI_4_days_views.tf
@@ -71,7 +71,7 @@ resource "google_bigquery_table" "SLI_4_days_view" {
             census.datasetId=last_backups.source_dataset_id AND
             census.tableId=last_backups.source_table_id
           WHERE
-            IFNULL(census.partitionId, 'null')=IFNULL(last_backups.source_partition_id, 'null')
+            (last_backups.source_partition_id IS NULL OR last_backups.source_partition_id=census.partitionId)
             AND projectId != "${var.bbq_project}"
             AND projectId != "${var.bbq_restoration_project}"
             AND partitionId != "__UNPARTITIONED__"

diff --git a/terraform/SLI_5_days_views.tf b/terraform/SLI_5_days_views.tf
@@ -71,7 +71,7 @@ resource "google_bigquery_table" "SLI_5_days_view" {
             census.datasetId=last_backups.source_dataset_id AND
             census.tableId=last_backups.source_table_id
           WHERE
-            IFNULL(census.partitionId, 'null')=IFNULL(last_backups.source_partition_id, 'null')
+            (last_backups.source_partition_id IS NULL OR last_backups.source_partition_id=census.partitionId)
             AND projectId != "${var.bbq_project}"
             AND projectId != "${var.bbq_restoration_project}"
             AND partitionId != "__UNPARTITIONED__"

diff --git a/terraform/SLI_7_days_views.tf b/terraform/SLI_7_days_views.tf
@@ -71,7 +71,7 @@ resource "google_bigquery_table" "SLI_7_days_view" {
               census.datasetId=last_backups.source_dataset_id AND
               census.tableId=last_backups.source_table_id
             WHERE
-              IFNULL(census.partitionId, 'null')=IFNULL(last_backups.source_partition_id, 'null')
+              (last_backups.source_partition_id IS NULL OR last_backups.source_partition_id=census.partitionId)
               AND projectId != "${var.bbq_project}"
               AND projectId != "${var.bbq_restoration_project}"
               AND partitionId != "__UNPARTITIONED__"