Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: cleanup spanner's schema #247

Merged
merged 1 commit into from
Oct 4, 2019
+185 −178
Merged

refactor: cleanup spanner's schema #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 38 additions & 30 deletions spanner-2019-10-01.ddl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,45 @@
CREATE TABLE batches (
userid STRING(MAX) NOT NULL,
collection INT64 NOT NULL,
id TIMESTAMP NOT NULL,
fxa_kid STRING(MAX) NOT NULL,
bsos STRING(MAX) NOT NULL,
expiry TIMESTAMP NOT NULL,
timestamp TIMESTAMP,
) PRIMARY KEY(userid, fxa_kid, collection, id);

CREATE TABLE collections (
collectionid INT64 NOT NULL,
name STRING(MAX) NOT NULL,
) PRIMARY KEY(collectionid);

CREATE TABLE user_collections (
userid STRING(MAX) NOT NULL,
fxa_kid STRING(MAX) NOT NULL,
collection INT64 NOT NULL,
last_modified TIMESTAMP NOT NULL,
) PRIMARY KEY(userid, fxa_kid, collection);
fxa_uid STRING(MAX) NOT NULL,
fxa_kid STRING(MAX) NOT NULL,
collection_id INT64 NOT NULL,
modified TIMESTAMP NOT NULL,
) PRIMARY KEY(fxa_uid, fxa_kid, collection_id);


CREATE TABLE bso (
userid STRING(MAX) NOT NULL,
fxa_kid STRING(MAX) NOT NULL,
collection INT64 NOT NULL,
id STRING(MAX) NOT NULL,
fxa_uid STRING(MAX) NOT NULL,
fxa_kid STRING(MAX) NOT NULL,
collection_id INT64 NOT NULL,
id STRING(MAX) NOT NULL,

sortindex INT64,
modified TIMESTAMP NOT NULL,
payload STRING(MAX) NOT NULL,
ttl TIMESTAMP NOT NULL,
) PRIMARY KEY(userid, fxa_kid, collection, id),

payload STRING(MAX) NOT NULL,

modified TIMESTAMP NOT NULL,
expiry TIMESTAMP NOT NULL,
) PRIMARY KEY(fxa_uid, fxa_kid, collection_id, id),
INTERLEAVE IN PARENT user_collections ON DELETE CASCADE;

CREATE INDEX BsoLastModified ON bso(userid, fxa_kid, collection, modified DESC, ttl), INTERLEAVE IN user_collections;
CREATE INDEX BsoLastModified
ON bso(fxa_uid, fxa_kid, collection_id, modified DESC, expiry),
INTERLEAVE IN user_collections;

CREATE INDEX BsoExpiry ON bso(expiry);


CREATE TABLE collections (
id INT64 NOT NULL,
name STRING(MAX) NOT NULL,
) PRIMARY KEY(id);


CREATE INDEX BsoTtl ON bso(ttl)
CREATE TABLE batches (
fxa_uid STRING(MAX) NOT NULL,
fxa_kid STRING(MAX) NOT NULL,
id TIMESTAMP NOT NULL,
collection_id INT64 NOT NULL,
bsos STRING(MAX) NOT NULL,
expiry TIMESTAMP NOT NULL,
timestamp TIMESTAMP,
) PRIMARY KEY(fxa_uid, fxa_kid, collection_id, id);
90 changes: 45 additions & 45 deletions src/db/spanner/batch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,20 @@ pub fn create(db: &SpannerDb, params: params::CreateBatch) -> Result<results::Cr
let timestamp = db.timestamp()?.as_i64();
if params.bsos.is_empty() {
db.sql(
"INSERT INTO batches (userid, fxa_kid, collection, id, bsos, expiry, timestamp)
VALUES (@fxa_uid, @fxa_kid, @collectionid, @bsoid, @bsos, @expiry, @timestamp)",
"INSERT INTO batches (fxa_uid, fxa_kid, collection_id, id, bsos, expiry, timestamp)
VALUES (@fxa_uid, @fxa_kid, @collection_id, @bso_id, @bsos, @expiry, @timestamp)",
)?
.params(params! {
"fxa_uid" => params.user_id.fxa_uid.clone(),
"fxa_kid" => params.user_id.fxa_kid.clone(),
"collectionid" => collection_id.clone(),
"bsoid" => to_rfc3339(timestamp)?,
"collection_id" => collection_id.clone(),
"bso_id" => to_rfc3339(timestamp)?,
"timestamp" => to_rfc3339(timestamp)?,
"bsos" => "".to_string(),
"expiry" => to_rfc3339(timestamp + BATCH_LIFETIME)?,
})
.param_types(param_types! {
"bsoid" => SpannerType::Timestamp,
"bso_id" => SpannerType::Timestamp,
"expiry" => SpannerType::Timestamp,
"timestamp" => SpannerType::Timestamp,
})
Expand All @@ -69,20 +69,20 @@ pub fn create(db: &SpannerDb, params: params::CreateBatch) -> Result<results::Cr
.to_string();

db.sql(
"INSERT INTO batches (userid, fxa_kid, collection, id, bsos, expiry, timestamp)
VALUES (@fxa_uid, @fxa_kid, @collectionid, @bsoid, @bsos, @expiry, @timestamp)",
"INSERT INTO batches (fxa_uid, fxa_kid, collection_id, id, bsos, expiry, timestamp)
VALUES (@fxa_uid, @fxa_kid, @collection_id, @bso_id, @bsos, @expiry, @timestamp)",
)?
.params(params! {
"fxa_uid" => params.user_id.fxa_uid.clone(),
"fxa_kid" => params.user_id.fxa_kid.clone(),
"collectionid" => collection_id.clone(),
"bsoid" => to_rfc3339(timestamp + i as i64)?,
"collection_id" => collection_id.clone(),
"bso_id" => to_rfc3339(timestamp + i as i64)?,
"timestamp" => to_rfc3339(timestamp)?,
"bsos" => bsos,
"expiry" => to_rfc3339(timestamp + BATCH_LIFETIME)?,
})
.param_types(param_types! {
"bsoid" => SpannerType::Timestamp,
"bso_id" => SpannerType::Timestamp,
"expiry" => SpannerType::Timestamp,
"timestamp" => SpannerType::Timestamp,
})
Expand All @@ -96,17 +96,17 @@ pub fn validate(db: &SpannerDb, params: params::ValidateBatch) -> Result<bool> {
let collection_id = db.get_collection_id(&params.collection)?;
let exists = db
.sql(
"SELECT expiry FROM batches
WHERE userid = @fxa_uid
AND fxa_kid = @fxa_kid
AND collection = @collectionid
AND timestamp = @timestamp
"SELECT expiry FROM batches
WHERE fxa_uid = @fxa_uid
AND fxa_kid = @fxa_kid
AND collection_id = @collection_id
AND timestamp = @timestamp
AND expiry > @expiry",
)?
.params(params! {
"fxa_uid" => params.user_id.fxa_uid,
"fxa_kid" => params.user_id.fxa_kid,
"collectionid" => collection_id.to_string(),
"collection_id" => collection_id.to_string(),
"timestamp" => to_rfc3339(params.id)?,
"expiry" => to_rfc3339(db.timestamp()?.as_i64())?,
})
Expand All @@ -123,19 +123,19 @@ pub fn select_max_id(db: &SpannerDb, params: params::ValidateBatch) -> Result<i6
let collection_id = db.get_collection_id(&params.collection)?;
let exists = db
.sql(
"SELECT UNIX_MILLIS(id)
FROM batches
WHERE userid = @fxa_uid
"SELECT UNIX_MILLIS(id)
FROM batches
WHERE fxa_uid = @fxa_uid
AND fxa_kid = @fxa_kid
AND collection = @collectionid
AND timestamp = @timestamp
AND expiry > @expiry
AND collection_id = @collection_id
AND timestamp = @timestamp
AND expiry > @expiry
ORDER BY id DESC",
)?
.params(params! {
"fxa_uid" => params.user_id.fxa_uid,
"fxa_kid" => params.user_id.fxa_kid,
"collectionid" => collection_id.to_string(),
"collection_id" => collection_id.to_string(),
"timestamp" => to_rfc3339(params.id)?,
"expiry" => to_rfc3339(db.timestamp()?.as_i64())?,
})
Expand Down Expand Up @@ -176,20 +176,20 @@ pub fn append(db: &SpannerDb, params: params::AppendToBatch) -> Result<()> {
})
.to_string();
db.sql(
"INSERT INTO batches (userid, fxa_kid, collection, id, bsos, expiry, timestamp)
VALUES (@fxa_uid, @fxa_kid, @collectionid, @bsoid, @bsos, @expiry, @timestamp)",
"INSERT INTO batches (fxa_uid, fxa_kid, collection_id, id, bsos, expiry, timestamp)
VALUES (@fxa_uid, @fxa_kid, @collection_id, @bso_id, @bsos, @expiry, @timestamp)",
)?
.params(params! {
"fxa_uid" => params.user_id.fxa_uid.clone(),
"fxa_kid" => params.user_id.fxa_kid.clone(),
"collectionid" => collection_id.to_string(),
"bsoid" => to_rfc3339(params.id + i)?,
"collection_id" => collection_id.to_string(),
"bso_id" => to_rfc3339(params.id + i)?,
"timestamp" => to_rfc3339(params.id)?,
"expiry" => to_rfc3339(timestamp + BATCH_LIFETIME)?,
"bsos" => bsos,
})
.param_types(param_types! {
"bsoid" => SpannerType::Timestamp,
"bso_id" => SpannerType::Timestamp,
"timestamp" => SpannerType::Timestamp,
"expiry" => SpannerType::Timestamp,
})
Expand All @@ -208,23 +208,23 @@ pub fn get(db: &SpannerDb, params: params::GetBatch) -> Result<Option<results::G

let result = db
.sql(
"SELECT id, bsos, expiry
FROM batches
WHERE userid = @fxa_uid
AND fxa_kid = @fxa_kid
AND collection = @collectionid
AND timestamp = @bsoid
"SELECT id, bsos, expiry
FROM batches
WHERE fxa_uid = @fxa_uid
AND fxa_kid = @fxa_kid
AND collection_id = @collection_id
AND timestamp = @bso_id
AND expiry > @expiry",
)?
.params(params! {
"fxa_uid" => params.user_id.fxa_uid,
"fxa_kid" => params.user_id.fxa_kid,
"collectionid" => collection_id.to_string(),
"bsoid" => to_rfc3339(params.id)?,
"collection_id" => collection_id.to_string(),
"bso_id" => to_rfc3339(params.id)?,
"expiry" => to_rfc3339(timestamp)?,
})
.param_types(param_types! {
"bsoid" => SpannerType::Timestamp,
"bso_id" => SpannerType::Timestamp,
"expiry" => SpannerType::Timestamp,
})
.execute(&db.conn)?
Expand All @@ -247,20 +247,20 @@ pub fn delete(db: &SpannerDb, params: params::DeleteBatch) -> Result<()> {
let collection_id = db.get_collection_id(&params.collection)?;

db.sql(
"DELETE FROM batches
WHERE userid = @fxa_uid
AND fxa_kid = @fxa_kid
AND collection = @collectionid
AND timestamp = @bsoid",
"DELETE FROM batches
WHERE fxa_uid = @fxa_uid
AND fxa_kid = @fxa_kid
AND collection_id = @collection_id
AND timestamp = @bso_id",
)?
.params(params! {
"fxa_uid" => params.user_id.fxa_uid,
"fxa_kid" => params.user_id.fxa_kid,
"collectionid" => collection_id.to_string(),
"bsoid" => to_rfc3339(params.id)?,
"collection_id" => collection_id.to_string(),
"bso_id" => to_rfc3339(params.id)?,
})
.param_types(param_types! {
"bsoid" => SpannerType::Timestamp,
"bso_id" => SpannerType::Timestamp,
})
.execute(&db.conn)?;
Ok(())
Expand Down
Loading