mirrors/syncstorage-rs
1
0
Fork 0
mirror of https://github.com/mozilla-services/syncstorage-rs.git synced 2026-01-21 08:22:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: GETs with a limit and no sort never advance X-Weave-Next-Offset

Browse Source 
Fix #468
This commit is contained in:
Donovan Preston 2020-03-10 13:38:35 -04:00
parent 58646630ca
commit c95f2ff21a
No known key found for this signature in database
GPG Key ID: B43EF44E428C806E
2 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/db/mysql/models.rs
View File

@ -484,10 +484,9 @@ impl MysqlDb {
}
query = match sort {
Sorting::Index => query.order(bso::sortindex.desc()),
Sorting::Newest => query.order(bso::modified.desc()),
Sorting::Oldest => query.order(bso::modified.asc()),
_ => query,
Sorting::Index => query.order(bso::id.desc()).order(bso::sortindex.desc()),
Sorting::Newest => query.order(bso::id.desc()).order(bso::modified.desc()),
Sorting::Oldest | Sorting::None => query.order(bso::id.asc()).order(bso::modified.asc()),
};
let limit = limit.map(i64::from).unwrap_or(-1);

7
src/db/spanner/models.rs
View File

@ -975,10 +975,9 @@ impl SpannerDb {
sqltypes.insert("newer".to_string(), as_type(TypeCode::TIMESTAMP));
}
query = match sort {
Sorting::Index => format!("{} ORDER BY sortindex DESC", query),
Sorting::Newest => format!("{} ORDER BY modified DESC", query),
Sorting::Oldest => format!("{} ORDER BY modified ASC", query),
_ => query,
Sorting::Index => format!("{} ORDER BY sortindex DESC, bso_id DESC", query),
Sorting::Newest => format!("{} ORDER BY modified DESC, bso_id DESC", query),
Sorting::Oldest | Sorting::None => format!("{} ORDER BY modified ASC, bso_id ASC", query),
};
if let Some(limit) = limit {