Merge "Batch Test improvements"

2 files changed, 15 insertions, 4 deletions

diff --git a/auth/auth-cass/cass_init/init.cql b/auth/auth-cass/cass_init/init.cql
index 75b02c53..f280de00 100644
--- a/auth/auth-cass/cass_init/init.cql
+++ b/auth/auth-cass/cass_init/init.cql
@@ -90,12 +90,12 @@ CREATE TABLE cert (
 CREATE INDEX cert_id ON cert(id);
 CREATE INDEX cert_x500 ON cert(x500);
 
-CREATE TABLE notify (
+CREATE TABLE notified (
   user 		text,
-  type 		int,
+  target        text,
+  key		text,
   last 		timestamp,
-  checksum 	int,
-  PRIMARY KEY (user,type)
+  PRIMARY KEY (user,target,key)
 );
 
 CREATE TABLE x509 (
@@ -175,6 +175,7 @@ CREATE TABLE future (
 );
 CREATE INDEX future_idx ON future(target);
 CREATE INDEX future_start_idx ON future(start);
+CREATE INDEX future_target_key ON authz.future (target_key);
 
 
 CREATE TABLE approval (
diff --git a/auth/auth-cass/cass_init/init2_10.cql b/auth/auth-cass/cass_init/init2_10.cql
index b7195076..21bd4b63 100644
--- a/auth/auth-cass/cass_init/init2_10.cql
+++ b/auth/auth-cass/cass_init/init2_10.cql
@@ -2,3 +2,13 @@ use authz;
 alter TABLE cred ADD tag varchar;
 alter TABLE future ADD target_key varchar;
 alter TABLE future ADD target_date timestamp;
+CREATE INDEX future_target_key ON authz.future (target_key);
+
+CREATE TABLE notified (
+  user          text,
+  target        text,
+  key           text,
+  last          timestamp,
+  PRIMARY KEY (user,target,key)
+);
+