From 15de5cc6d838f202070c8227cc57a8c5a2e4cab3 Mon Sep 17 00:00:00 2001
From: Ben Wu <12437227+BenWu@users.noreply.github.com>
Date: Wed, 19 May 2021 11:35:38 -0400
Subject: [PATCH] Temporarily remove glean ios from mobile search (#2040)

---
 .../mobile_search_clients_daily.template.sql  |  5 --
 .../mobile_search_clients_daily_v1/query.sql  |  5 --
 .../test_aggregation/expect.yaml              | 70 +++++++++----------
 .../test_namespace_union/expect.yaml          | 48 ++++++-------
 4 files changed, 59 insertions(+), 69 deletions(-)

diff --git a/bigquery_etl/search/templates/mobile_search_clients_daily.template.sql b/bigquery_etl/search/templates/mobile_search_clients_daily.template.sql
index 9a1df0fce6..5dd555b14b 100755
--- a/bigquery_etl/search/templates/mobile_search_clients_daily.template.sql
+++ b/bigquery_etl/search/templates/mobile_search_clients_daily.template.sql
@@ -127,11 +127,6 @@ glean_metrics AS (
     *
   FROM
     fenix_metrics_with_locale
-  UNION ALL
-  SELECT
-    *
-  FROM
-    ios_metrics
 ),
 glean_combined_searches AS (
   SELECT
diff --git a/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_v1/query.sql b/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_v1/query.sql
index 190fa17f2e..cf484ea740 100755
--- a/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_v1/query.sql
+++ b/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_v1/query.sql
@@ -421,11 +421,6 @@ glean_metrics AS (
     *
   FROM
     fenix_metrics_with_locale
-  UNION ALL
-  SELECT
-    *
-  FROM
-    ios_metrics
 ),
 glean_combined_searches AS (
   SELECT
diff --git a/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_v1/test_aggregation/expect.yaml b/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_v1/test_aggregation/expect.yaml
index 0de14dc867..c785b896e5 100644
--- a/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_v1/test_aggregation/expect.yaml
+++ b/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_v1/test_aggregation/expect.yaml
@@ -230,38 +230,38 @@
   experiments:
   - key: test_experiment
     value: test_branch
-- &ios_base
-  <<: *base
-  client_id: release_ios
-  os: iOS
-  os_version: "13.0"
-  app_version: "31.0"
-  app_name: Firefox iOS
-  normalized_app_name: Firefox iOS
-  channel: release
-  country: US
-  locale: en-US
-  profile_creation_date: 18201
-  profile_age_in_days: 30
-- <<: *ios_base
-  default_search_engine: engine2
-  engine: engine2
-  source: actionbar
-  search_count: 1
-- <<: *ios_base
-  default_search_engine: engine2
-  engine: engine2
-  source: suggestion
-  search_count: 2
-- <<: *ios_base
-  client_id: beta_ios
-  channel: beta
-  engine: engine2
-  source: in-content.sap.code
-  tagged_sap: 2
-- <<: *ios_base
-  client_id: nightly_ios
-  channel: nightly
-  engine: engine2
-  source: in-content.sap-follow-on.code
-  tagged_follow_on: 1
+#- &ios_base
+#  <<: *base
+#  client_id: release_ios
+#  os: iOS
+#  os_version: "13.0"
+#  app_version: "31.0"
+#  app_name: Firefox iOS
+#  normalized_app_name: Firefox iOS
+#  channel: release
+#  country: US
+#  locale: en-US
+#  profile_creation_date: 18201
+#  profile_age_in_days: 30
+#- <<: *ios_base
+#  default_search_engine: engine2
+#  engine: engine2
+#  source: actionbar
+#  search_count: 1
+#- <<: *ios_base
+#  default_search_engine: engine2
+#  engine: engine2
+#  source: suggestion
+#  search_count: 2
+#- <<: *ios_base
+#  client_id: beta_ios
+#  channel: beta
+#  engine: engine2
+#  source: in-content.sap.code
+#  tagged_sap: 2
+#- <<: *ios_base
+#  client_id: nightly_ios
+#  channel: nightly
+#  engine: engine2
+#  source: in-content.sap-follow-on.code
+#  tagged_follow_on: 1
diff --git a/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_v1/test_namespace_union/expect.yaml b/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_v1/test_namespace_union/expect.yaml
index f971a9e5ac..d082ee7be7 100644
--- a/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_v1/test_namespace_union/expect.yaml
+++ b/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_v1/test_namespace_union/expect.yaml
@@ -33,27 +33,27 @@
   app_name: Fenix
   normalized_app_name: Fenix
   channel: release
-- <<: *base
-  os: iOS
-  os_version: "13.0"
-  client_id: b
-  app_version: "31.0"
-  app_name: Firefox iOS
-  normalized_app_name: Firefox iOS
-  channel: release
-- <<: *base
-  os: iOS
-  os_version: "13.0"
-  client_id: b
-  app_version: "31.0"
-  app_name: Firefox iOS
-  normalized_app_name: Firefox iOS
-  channel: beta
-- <<: *base
-  os: iOS
-  os_version: "13.0"
-  client_id: b
-  app_version: "31.0"
-  app_name: Firefox iOS
-  normalized_app_name: Firefox iOS
-  channel: nightly
+#- <<: *base
+#  os: iOS
+#  os_version: "13.0"
+#  client_id: b
+#  app_version: "31.0"
+#  app_name: Firefox iOS
+#  normalized_app_name: Firefox iOS
+#  channel: release
+#- <<: *base
+#  os: iOS
+#  os_version: "13.0"
+#  client_id: b
+#  app_version: "31.0"
+#  app_name: Firefox iOS
+#  normalized_app_name: Firefox iOS
+#  channel: beta
+#- <<: *base
+#  os: iOS
+#  os_version: "13.0"
+#  client_id: b
+#  app_version: "31.0"
+#  app_name: Firefox iOS
+#  normalized_app_name: Firefox iOS
+#  channel: nightly