From 53ebe05a13457e8625275fd5fa26e298b892f68e Mon Sep 17 00:00:00 2001 From: Alekhya <88394696+alekhyamoz@users.noreply.github.com> Date: Wed, 29 May 2024 19:29:45 -0400 Subject: [PATCH] =?UTF-8?q?Revert=20"RS-788=20Add=20support=20for=20organi?= =?UTF-8?q?c=20searches=20with=20ads=20to=20the=20mobile=20search=E2=80=A6?= =?UTF-8?q?"=20(#5676)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 98140594234465bf94d08fd659323d0e7fa9956e. --- .../mobile_search_aggregates_v1/query.sql | 1 - .../mobile_search_aggregates_v1/schema.yaml | 3 --- .../mobile_search_clients_daily_v1/query.sql | 17 ----------------- .../mobile_search_clients_daily_v1.schema.json | 5 ----- .../test_aggregation/expect.yaml | 1 - .../mobile_search_clients_daily_v1.yaml | 1 - .../test_aggregation/expect.yaml | 1 - .../test_ios_version_filter/expect.yaml | 1 - .../test_namespace_union/expect.yaml | 1 - .../test_overactive_filter/expect.yaml | 1 - 10 files changed, 32 deletions(-) diff --git a/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/query.sql b/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/query.sql index a4fef8c7de..1b9f92d01f 100755 --- a/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/query.sql +++ b/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/query.sql @@ -22,7 +22,6 @@ SELECT SUM(search_with_ads) AS search_with_ads, SUM(unknown) AS unknown, CAST(NULL AS string) normalized_engine, - SUM(search_with_ads_organic) AS search_with_ads_organic, FROM mobile_search_clients_daily_v1 WHERE diff --git a/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/schema.yaml b/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/schema.yaml index 989bd9b85b..cdd64dca3f 100644 --- a/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/schema.yaml +++ b/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/schema.yaml @@ -68,6 +68,3 @@ fields: - mode: NULLABLE name: ad_click_organic type: INTEGER -- mode: NULLABLE - name: search_with_ads_organic - type: INTEGER 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 3e87ff28f6..0557adec2a 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 @@ -722,12 +722,6 @@ glean_flattened_searches AS ( SUBSTR(search.key, STRPOS(search.key, '.') + 1), search.search_type ) - WHEN search.search_type = 'search-with-ads' - THEN IF( - REGEXP_CONTAINS(search.key, '\\.'), - SUBSTR(search.key, STRPOS(search.key, '.') + 1), - search.search_type - ) ELSE search.search_type END AS source, search.value AS search_count, @@ -780,8 +774,6 @@ combined_search_clients AS ( CASE WHEN search_type = 'ad-click' THEN IF(STARTS_WITH(source, 'in-content.organic'), 'ad-click-organic', search_type) - WHEN search_type = 'search-with-ads' - THEN IF(STARTS_WITH(source, 'in-content.organic'), 'search-with-ads-organic', search_type) WHEN STARTS_WITH(source, 'in-content.sap.') THEN 'tagged-sap' WHEN REGEXP_CONTAINS(source, '^in-content.*-follow-on') @@ -863,15 +855,6 @@ unfiltered_search_clients AS ( search_count ) ) AS search_with_ads, - SUM( - IF( - search_type != 'search-with-ads-organic' - OR engine IS NULL - OR search_count > 10000, - 0, - search_count - ) - ) AS search_with_ads_organic, SUM( IF(search_type != 'unknown' OR engine IS NULL OR search_count > 10000, 0, search_count) ) AS unknown, diff --git a/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/mobile_search_clients_daily_v1.schema.json b/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/mobile_search_clients_daily_v1.schema.json index 399a05b2f7..9ebe668038 100644 --- a/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/mobile_search_clients_daily_v1.schema.json +++ b/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/mobile_search_clients_daily_v1.schema.json @@ -64,11 +64,6 @@ "name": "search_with_ads", "mode": "NULLABLE" }, - { - "type": "INTEGER", - "name": "search_with_ads_organic", - "mode": "NULLABLE" - }, { "type": "INTEGER", "name": "unknown", diff --git a/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/test_aggregation/expect.yaml b/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/test_aggregation/expect.yaml index 2ab48fe7ff..c4cf22882d 100644 --- a/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/test_aggregation/expect.yaml +++ b/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/test_aggregation/expect.yaml @@ -19,7 +19,6 @@ ad_click: 0 ad_click_organic: 0 search_with_ads: 0 - search_with_ads_organic: 0 unknown: 0 - <<: *base engine: engine1 diff --git a/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/test_aggregation/mobile_search_clients_daily_v1.yaml b/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/test_aggregation/mobile_search_clients_daily_v1.yaml index a00d970347..7d63391c70 100644 --- a/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/test_aggregation/mobile_search_clients_daily_v1.yaml +++ b/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_aggregates_v1/test_aggregation/mobile_search_clients_daily_v1.yaml @@ -10,7 +10,6 @@ ad_click: 0 ad_click_organic: 0 search_with_ads: 0 - search_with_ads_organic: 0 unknown: 0 locale: fr-FR app_version: 68.2.1 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 6527b35bde..b1d1c0f1f2 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 @@ -11,7 +11,6 @@ ad_click: 0 ad_click_organic: 0 search_with_ads: 0 - search_with_ads_organic: 0 unknown: 0 app_version: 68.2.1 app_name: Fennec diff --git a/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_v1/test_ios_version_filter/expect.yaml b/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_v1/test_ios_version_filter/expect.yaml index 16cfd3a330..33c07f6da1 100644 --- a/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_v1/test_ios_version_filter/expect.yaml +++ b/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_v1/test_ios_version_filter/expect.yaml @@ -9,7 +9,6 @@ ad_click: 0 ad_click_organic: 0 search_with_ads: 0 - search_with_ads_organic: 0 unknown: 0 locale: en-US app_version: "30.0" 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 051cf67ed0..28cb0ab4db 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 @@ -9,7 +9,6 @@ ad_click: 0 ad_click_organic: 0 search_with_ads: 0 - search_with_ads_organic: 0 unknown: 0 country: US os_version: '29' diff --git a/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_v1/test_overactive_filter/expect.yaml b/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_v1/test_overactive_filter/expect.yaml index 6fc8f4460c..e2b27e2090 100644 --- a/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_v1/test_overactive_filter/expect.yaml +++ b/tests/sql/moz-fx-data-shared-prod/search_derived/mobile_search_clients_daily_v1/test_overactive_filter/expect.yaml @@ -9,7 +9,6 @@ ad_click: 0 ad_click_organic: 0 search_with_ads: 0 - search_with_ads_organic: 0 unknown: 0 locale: fr-FR app_version: 68.2.1