From 6fba71c173669715d7bb5d0455d864cd4b37f351 Mon Sep 17 00:00:00 2001
From: Stephen Soltesz <stephen.soltesz@gmail.com>
Date: Fri, 31 Mar 2023 15:41:37 +0000
Subject: [PATCH] Update references to annotation2 and hopannotation2  (#155)

* Rename annotation2 and hopannotation2 views, tables, and references.
---
 views/create_dataset_views.sh    | 4 ++--
 views/ndt/ndt5.sql               | 2 +-
 views/ndt/ndt7.sql               | 2 +-
 views/ndt/scamper1.sql           | 5 +----
 views/ndt/tcpinfo.sql            | 2 +-
 views/ndt_raw/annotation.sql     | 3 ---
 views/ndt_raw/annotation2.sql    | 3 +++
 views/ndt_raw/hopannotation1.sql | 3 ---
 views/ndt_raw/hopannotation2.sql | 3 +++
 9 files changed, 12 insertions(+), 15 deletions(-)
 delete mode 100644 views/ndt_raw/annotation.sql
 create mode 100644 views/ndt_raw/annotation2.sql
 delete mode 100644 views/ndt_raw/hopannotation1.sql
 create mode 100644 views/ndt_raw/hopannotation2.sql

diff --git a/views/create_dataset_views.sh b/views/create_dataset_views.sh
index bfe02f9..e12de45 100755
--- a/views/create_dataset_views.sh
+++ b/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
 
diff --git a/views/ndt/ndt5.sql b/views/ndt/ndt5.sql
index 7bc3c53..9dbf008 100644
--- a/views/ndt/ndt5.sql
+++ b/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`
diff --git a/views/ndt/ndt7.sql b/views/ndt/ndt7.sql
index 2e22b6d..1c33dba 100644
--- a/views/ndt/ndt7.sql
+++ b/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`
diff --git a/views/ndt/scamper1.sql b/views/ndt/scamper1.sql
index f784a97..8496f20 100644
--- a/views/ndt/scamper1.sql
+++ b/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`
diff --git a/views/ndt/tcpinfo.sql b/views/ndt/tcpinfo.sql
index e15def1..0e1ae2d 100644
--- a/views/ndt/tcpinfo.sql
+++ b/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`
diff --git a/views/ndt_raw/annotation.sql b/views/ndt_raw/annotation.sql
deleted file mode 100644
index 7d73ad1..0000000
--- a/views/ndt_raw/annotation.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- This is the raw ndt annotations view.
---
-SELECT * FROM `{{.ProjectID}}.raw_ndt.annotation`
diff --git a/views/ndt_raw/annotation2.sql b/views/ndt_raw/annotation2.sql
new file mode 100644
index 0000000..4dcd23c
--- /dev/null
+++ b/views/ndt_raw/annotation2.sql
@@ -0,0 +1,3 @@
+-- This is the raw ndt annotations view.
+--
+SELECT * FROM `{{.ProjectID}}.raw_ndt.annotation2`
diff --git a/views/ndt_raw/hopannotation1.sql b/views/ndt_raw/hopannotation1.sql
deleted file mode 100644
index cf95f69..0000000
--- a/views/ndt_raw/hopannotation1.sql
+++ /dev/null
@@ -1,3 +0,0 @@
--- This is the raw hopannotation1 view.
---
-SELECT * FROM `{{.ProjectID}}.raw_ndt.hopannotation1`
diff --git a/views/ndt_raw/hopannotation2.sql b/views/ndt_raw/hopannotation2.sql
new file mode 100644
index 0000000..c644be1
--- /dev/null
+++ b/views/ndt_raw/hopannotation2.sql
@@ -0,0 +1,3 @@
+-- This is the raw hopannotation2 view.
+--
+SELECT * FROM `{{.ProjectID}}.raw_ndt.hopannotation2`