Merge pull request #52 from ocadotechnology/YACHT-1005

YACHT-1005: SLI queries big fix - comparing two nulls does not give true in result
ocadotechnology · Sep 11, 2018 · 029992f · 029992f
2 parents 5d5b667 + 8894d65
commit 029992f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/terraform/SLI_3_days_views.tf b/terraform/SLI_3_days_views.tf
@@ -69,10 +69,10 @@ resource "google_bigquery_table" "SLI_3_days_view" {
           ON
             census.projectId=last_backups.source_project_id AND
             census.datasetId=last_backups.source_dataset_id AND
-            census.tableId=last_backups.source_table_id AND
-            census.partitionId=last_backups.source_partition_id
+            census.tableId=last_backups.source_table_id
           WHERE
-            projectId != "${var.bbq_project}"
+            IFNULL(census.partitionId, 'null')=IFNULL(last_backups.source_partition_id, 'null')
+            AND projectId != "${var.bbq_project}"
             AND partitionId != "__UNPARTITIONED__"
             AND IFNULL(last_backups.backup_created, MSEC_TO_TIMESTAMP(0)) < TIMESTAMP(DATE_ADD(CURRENT_TIMESTAMP(), -3 , "DAY"))
             AND IFNULL(last_backups.backup_last_modified, MSEC_TO_TIMESTAMP(0)) < lastModifiedTime

diff --git a/terraform/SLI_4_days_views.tf b/terraform/SLI_4_days_views.tf
@@ -69,10 +69,10 @@ resource "google_bigquery_table" "SLI_4_days_view" {
           ON
             census.projectId=last_backups.source_project_id AND
             census.datasetId=last_backups.source_dataset_id AND
-            census.tableId=last_backups.source_table_id AND
-            census.partitionId=last_backups.source_partition_id
+            census.tableId=last_backups.source_table_id
           WHERE
-            projectId != "${var.bbq_project}"
+            IFNULL(census.partitionId, 'null')=IFNULL(last_backups.source_partition_id, 'null')
+            AND projectId != "${var.bbq_project}"
             AND partitionId != "__UNPARTITIONED__"
             AND IFNULL(last_backups.backup_created, MSEC_TO_TIMESTAMP(0)) < TIMESTAMP(DATE_ADD(CURRENT_TIMESTAMP(), -4 , "DAY"))
             AND IFNULL(last_backups.backup_last_modified, MSEC_TO_TIMESTAMP(0)) < lastModifiedTime

diff --git a/terraform/SLI_5_days_views.tf b/terraform/SLI_5_days_views.tf
@@ -69,10 +69,10 @@ resource "google_bigquery_table" "SLI_5_days_view" {
           ON
             census.projectId=last_backups.source_project_id AND
             census.datasetId=last_backups.source_dataset_id AND
-            census.tableId=last_backups.source_table_id AND
-            census.partitionId=last_backups.source_partition_id
+            census.tableId=last_backups.source_table_id
           WHERE
-            projectId != "${var.bbq_project}"
+            IFNULL(census.partitionId, 'null')=IFNULL(last_backups.source_partition_id, 'null')
+            AND projectId != "${var.bbq_project}"
             AND partitionId != "__UNPARTITIONED__"
             AND IFNULL(last_backups.backup_created, MSEC_TO_TIMESTAMP(0)) < TIMESTAMP(DATE_ADD(CURRENT_TIMESTAMP(), -5 , "DAY"))
             AND IFNULL(last_backups.backup_last_modified, MSEC_TO_TIMESTAMP(0)) < lastModifiedTime

diff --git a/terraform/SLI_7_days_views.tf b/terraform/SLI_7_days_views.tf
@@ -69,10 +69,10 @@ resource "google_bigquery_table" "SLI_7_days_view" {
             ON
               census.projectId=last_backups.source_project_id AND
               census.datasetId=last_backups.source_dataset_id AND
-              census.tableId=last_backups.source_table_id AND
-              census.partitionId=last_backups.source_partition_id
+              census.tableId=last_backups.source_table_id
             WHERE
-              projectId != "${var.bbq_project}"
+              IFNULL(census.partitionId, 'null')=IFNULL(last_backups.source_partition_id, 'null')
+              AND projectId != "${var.bbq_project}"
               AND partitionId != "__UNPARTITIONED__"
               AND IFNULL(last_backups.backup_created, MSEC_TO_TIMESTAMP(0)) < TIMESTAMP(DATE_ADD(CURRENT_TIMESTAMP(), -7 , "DAY"))
               AND IFNULL(last_backups.backup_last_modified, MSEC_TO_TIMESTAMP(0)) < lastModifiedTime