Update references to annotation2 and hopannotation2 (#155)

* Rename annotation2 and hopannotation2 views, tables, and references.

views/create_dataset_views.sh

@@ -82,11 +82,11 @@ create_view ${SRC_PROJECT} ${DST_PROJECT} ndt_raw ./ndt_raw/ndt5_legacy.sql
 create_view ${SRC_PROJECT} ${DST_PROJECT} ndt_raw ./ndt_raw/tcpinfo_legacy.sql
 create_view ${SRC_PROJECT} ${DST_PROJECT} ndt_raw ./ndt_raw/paris1_legacy.sql
 # NDT raw - NB: the raw tables are currently in mlab-oti.raw_ndt.
-create_view ${SRC_PROJECT} ${DST_PROJECT} ndt_raw ./ndt_raw/annotation.sql
+create_view ${SRC_PROJECT} ${DST_PROJECT} ndt_raw ./ndt_raw/annotation2.sql
 create_view ${SRC_PROJECT} ${DST_PROJECT} ndt_raw ./ndt_raw/ndt5.sql
 create_view ${SRC_PROJECT} ${DST_PROJECT} ndt_raw ./ndt_raw/ndt7.sql
 create_view ${SRC_PROJECT} ${DST_PROJECT} ndt_raw ./ndt_raw/pcap.sql
-create_view ${SRC_PROJECT} ${DST_PROJECT} ndt_raw ./ndt_raw/hopannotation1.sql
+create_view ${SRC_PROJECT} ${DST_PROJECT} ndt_raw ./ndt_raw/hopannotation2.sql
 create_view ${SRC_PROJECT} ${DST_PROJECT} ndt_raw ./ndt_raw/scamper1.sql
 create_view ${SRC_PROJECT} ${DST_PROJECT} ndt_raw ./ndt_raw/tcpinfo.sql
 

views/ndt/ndt5.sql

@@ -1,5 +1,5 @@
 --
 -- This view is a pass-through for annotated ndt5 data.  This materializes data
--- from ndt_raw.ndt5 with ndt_raw.annotation into a single location.
+-- from ndt_raw.ndt5 with ndt_raw.annotation2 into a single location.
 --
 SELECT * FROM `{{.ProjectID}}.ndt.ndt5`

views/ndt/ndt7.sql

@@ -1,5 +1,5 @@
 --
 -- This view is a pass-through for annotated ndt7 data.  This materializes data
--- from ndt_raw.ndt7 with ndt_raw.annotation into a single location.
+-- from ndt_raw.ndt7 with ndt_raw.annotation2 into a single location.
 --
 SELECT * FROM `{{.ProjectID}}.ndt.ndt7`

views/ndt/scamper1.sql

@@ -1,8 +1,5 @@
 --
 -- This view is a pass-through for annotated scamper1 data. This materializes
--- data from ndt_raw.scamper1 with ndt_raw.annotation into a single location.
---
--- This table includes server and client annotations but not hop annotations. For
--- recent hop annotations see: `ndt.scamper1_hopannotation1`.
+-- data from ndt_raw.scamper1 with ndt_raw.annotation2 into a single location.
 --
 SELECT * FROM `{{.ProjectID}}.ndt.scamper1`

views/ndt/tcpinfo.sql

@@ -1,5 +1,5 @@
 --
 -- This view is a pass-through for annotated tcpinfo data.  This materializes data
--- from ndt_raw.tcpinfo with ndt_raw.annotation into a single location.
+-- from ndt_raw.tcpinfo with ndt_raw.annotation2 into a single location.
 --
 SELECT * FROM `{{.ProjectID}}.ndt.tcpinfo`

views/ndt_raw/annotation2.sql

@@ -0,0 +1,3 @@
+-- This is the raw ndt annotations view.
+--
+SELECT * FROM `{{.ProjectID}}.raw_ndt.annotation2`

views/ndt_raw/hopannotation2.sql

@@ -0,0 +1,3 @@
+-- This is the raw hopannotation2 view.
+--
+SELECT * FROM `{{.ProjectID}}.raw_ndt.hopannotation2`