Merge branch 'master' into bug/280

Author: fzzzy

spanner-2019-10-01.ddl

@@ -1,16 +1,25 @@
+-- fxa_uid: a 16 byte identifier, randomly generated by the fxa server
+--    usually a UUID, so presuming a formatted form.
+-- fxa_kid: <`mono_num`>-<`client_state`>
+--
+-- - mono_num: a monotonically increasing timestamp or generation number 
+--             in hex and padded to 13 digits, provided by the fxa server
+-- - client_state: the first 16 bytes of a SHA256 hash of the user's sync
+--             encryption key.
+
 CREATE TABLE user_collections (
-  fxa_uid STRING(MAX)  NOT NULL,
-  fxa_kid STRING(MAX)  NOT NULL,
+  fxa_uid STRING(36)  NOT NULL,
+  fxa_kid STRING(48)  NOT NULL,
   collection_id INT64  NOT NULL,
   modified TIMESTAMP   NOT NULL,
 ) PRIMARY KEY(fxa_uid, fxa_kid, collection_id);
 
 
 CREATE TABLE bso (
-  fxa_uid STRING(MAX)  NOT NULL,
-  fxa_kid STRING(MAX)  NOT NULL,
+  fxa_uid STRING(36)  NOT NULL,
+  fxa_kid STRING(48)  NOT NULL,
   collection_id INT64  NOT NULL,
-  id STRING(MAX)       NOT NULL,
+  id STRING(64)       NOT NULL,
 
   sortindex INT64,
 
@@ -31,16 +40,16 @@ INTERLEAVE IN user_collections;
 
 CREATE TABLE collections (
   id INT64          NOT NULL,
-  name STRING(MAX)  NOT NULL,
+  name STRING(32)  NOT NULL,
 ) PRIMARY KEY(id);
 
     CREATE UNIQUE INDEX CollectionName
         ON collections(name);
 
 
 CREATE TABLE batches (
-  fxa_uid STRING(MAX)  NOT NULL,
-  fxa_kid STRING(MAX)  NOT NULL,
+  fxa_uid STRING(36)  NOT NULL,
+  fxa_kid STRING(48)  NOT NULL,
   id TIMESTAMP         NOT NULL,
   collection_id INT64  NOT NULL,
   bsos STRING(MAX)     NOT NULL,