Remove billing data query Registry 1.0 vestiges

These were a few straggling special cases to deal with Registry 1.0 data;
that data was removed ages ago and I just never got around to cleaning these
up.  This removes them at long last.

There were also some TODOs for the same bug around better TLD extraction that
supports multi-part TLDs (though that's pretty unrelated to Registry 1.0/2.0),
so I fixed those since it turns out supporting multi-part TLDs is trivial.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=151003181
This commit is contained in:
nickfelt 2017-03-23 07:53:39 -07:00 committed by Ben McIlwain
parent ec4ffe53f0
commit dfce7608e7
2 changed files with 5 additions and 11 deletions

View file

@ -68,8 +68,8 @@ FROM (
FROM ( FROM (
SELECT SELECT
*, *,
-- TODO(b/20828509): make this robust to multi-part TLDS. -- Count everything after first dot as TLD (to support multi-part TLDs).
LAST(SPLIT(targetId, '.')) AS tld REGEXP_EXTRACT(targetId, r'[.](.+)') AS tld,
FROM [%SOURCE_DATASET%.OneTime]) FROM [%SOURCE_DATASET%.OneTime])
WHERE WHERE
-- Filter out prober data. -- Filter out prober data.
@ -100,13 +100,10 @@ LEFT JOIN EACH (
FROM ( FROM (
SELECT SELECT
*, *,
-- TODO(b/20828509): make this robust to multi-part TLDS. -- Count everything after first dot as TLD (to support multi-part TLDs).
LAST(SPLIT(targetId, '.')) AS tld REGEXP_EXTRACT(targetId, r'[.](.+)') AS tld,
FROM FROM
[%SOURCE_DATASET%.Cancellation] [%SOURCE_DATASET%.Cancellation])
WHERE
-- Filter out Registry 1.0 data - TODO(b/20828509): remove this.
__key__.namespace = '')
WHERE WHERE
-- Filter out prober data. -- Filter out prober data.
tld IN tld IN

View file

@ -39,8 +39,5 @@ SELECT
AS reservedListPaths, AS reservedListPaths,
FROM FROM
[%SOURCE_DATASET%.Registry] [%SOURCE_DATASET%.Registry]
WHERE
-- Filter out Registry 1.0 data - TODO(b/20828509): remove this.
__key__.namespace = ''
ORDER BY ORDER BY
tld tld