Merge pull request #409 from m-lab/views

Update views to use base_tables as base.

Author: gfr10598

.travis.yml

@@ -349,7 +349,7 @@ deploy:
     # Update these version numbers when making changes to the views.
     # TODO - add feature to allow making aliases from existing intermediate.
     pushd $TRAVIS_BUILD_DIR/schema/views_legacysql
-    &&./make_views.sh measurement-lab intermediate_v3_1_1 rc_v3_1 "rc release"
+    && ./make_views.sh measurement-lab intermediate_v3_1_1 rc_v3_1 "rc release"
     && cd $TRAVIS_BUILD_DIR/schema/views_standardsql
     && ./make_views.sh measurement-lab intermediate_v3_1_1 rc_v3_1 "rc release"
     && popd

schema/views_legacysql/common_etl.sql

@@ -70,5 +70,5 @@ SELECT
   web100_log_entry.snap.X_Rcvbuf, web100_log_entry.snap.X_Sndbuf, web100_log_entry.snap.X_dbg1,
   web100_log_entry.snap.X_dbg2, web100_log_entry.snap.X_dbg3, web100_log_entry.snap.X_dbg4,
   web100_log_entry.snap.X_rcv_ssthresh, web100_log_entry.snap.X_wnd_clamp
-FROM [measurement-lab:public.ndt]
+FROM [measurement-lab:base_tables.ndt]
 WHERE _PARTITIONTIME >= TIMESTAMP("2017-05-11 00:00:00")

schema/views_legacysql/make_views.sh

@@ -3,8 +3,8 @@
 # Also creates internal views that the public views are built on.
 # This should generally be run from a travis deployment, and the
 # arguments should be derived from the deployment tag.
-# The following legacySQL views are created in the public dataset:
-#    ndt_all​ - all (lightly filtered) tests, excluding EB,
+# The following legacySQL views are created in the rc/release datasets:
+#      ndt_all​ - all (lightly filtered) tests, excluding EB,
 #              blacklisted, short and very long tests.
 #    Separate views for download and upload NDT tests:
 # ​​​     ndt_downloads
@@ -25,13 +25,13 @@ set -u
 #                            Bash Parameters                              #
 ###########################################################################
 
-USAGE="$0 <project> <internal-dataset> <public-dataset> <alias,alias,...>"
+USAGE="$0 <project> <intermediate-dataset> <rc-dataset> <alias,alias,...>"
 PROJECT=${1:?Please provide the google cloud project: $USAGE}
 INTERMEDIATE=${PROJECT}:${2:?Please specify the internal dataset e.g. intermediate_v3_1_1: $USAGE}
-PUBLIC=${PROJECT}:${3:?Please specify the public dataset e.g. rc_v3_1: $USAGE}
+PUBLIC=${PROJECT}:${3:?Please specify the release candidate dataset e.g. rc_v3_1: $USAGE}
 ALIASES=${4:?Please specify a single alias, or quoted space separated list of aliases \{rc|\"rc release\"|none\}: $USAGE}
 
-# TODO - check that public and internal aren't swapped?
+# TODO - check that public and intermediate aren't swapped?
 # TODO - check that project is valid?
 
 

schema/views_standardsql/common_etl.sql

@@ -75,5 +75,5 @@ SELECT
       web100_log_entry.snap.X_rcv_ssthresh, web100_log_entry.snap.X_wnd_clamp)
     AS snap)
   AS web100_log_entry
-FROM `measurement-lab.public.ndt`
+FROM `measurement-lab.base_tables.ndt`
 WHERE _PARTITIONTIME >= TIMESTAMP("2017-05-11 00:00:00")

schema/views_standardsql/make_views.sh

@@ -3,7 +3,7 @@
 # Also creates internal views that the public views are built on.
 # This should generally be run from a travis deployment, and the
 # arguments should be derived from the deployment tag.
-# The following standardSQL views are created in the public dataset:
+# The following standardSQL views are created in the rc/release dataset:
 #    ndt_all​ - all (lightly filtered) tests, excluding EB,
 #              blacklisted, short and very long tests.
 #    Separate views for download and upload NDT tests:
@@ -25,13 +25,13 @@ set -u
 #                            Bash Parameters                              #
 ###########################################################################
 
-USAGE="$0 <project> <internal-dataset> <public-dataset> <alias,alias,...>"
+USAGE="$0 <project> <intermediate-dataset> <rc-dataset> <alias,alias,...>"
 PROJECT=${1:?Please provide the google cloud project: $USAGE}
 INTERMEDIATE=${PROJECT}:${2:?Please specify the internal dataset e.g. intermediate_v3_1_1: $USAGE}
-PUBLIC=${PROJECT}:${3:?Please specify the public dataset e.g. rc_v3_1: $USAGE}
+PUBLIC=${PROJECT}:${3:?Please specify the release candidate dataset e.g. rc_v3_1: $USAGE}
 ALIASES=${4:?Please specify a single alias, or quoted space separated list of aliases \{rc|\"rc release\"|none\}: $USAGE}
 
-# TODO - check that public and internal aren't swapped?
+# TODO - check that public and intermediate aren't swapped?
 # TODO - check that project is valid?
 
 
@@ -148,17 +148,17 @@ for ALIAS in $ALIASES; do
   if [ "${ALIAS}" != "none" ]; then
     echo "Linking ${PROJECT}:${ALIAS} alias"
 
-    create_view ${ALIAS} ndt_all \
+    create_view ${PROJECT}:${ALIAS} ndt_all \
       'View across the all NDT data except EB and blacklisted' \
       '#standardSQL
       SELECT * FROM `'${INTERMEDIATE/:/.}'.ndt_all`'
 
-    create_view ${ALIAS} ndt_downloads \
+    create_view ${PROJECT}:${ALIAS} ndt_downloads \
       'All good quality download tests' \
       '#standardSQL
       SELECT * FROM `'${INTERMEDIATE/:/.}'.ndt_downloads`'
 
-    create_view ${ALIAS} ndt_uploads \
+    create_view ${PROJECT}:${ALIAS} ndt_uploads \
       'All good quality upload tests' \
       '#standardSQL
       SELECT * FROM `'${INTERMEDIATE/:/.}'.ndt_uploads`'