mirrors/syncstorage-rs
1
0
Fork 0
mirror of https://github.com/mozilla-services/syncstorage-rs.git synced 2026-05-06 04:36:28 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #458 from mozilla-services/457-fix-remaining-blocking-execute

Browse Source 
fix: Fix #457 remaining blocking execute
This commit is contained in:
Philip Jenvey 2020-02-28 14:34:15 -08:00 committed by GitHub
commit 451ea17a5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1445,7 +1445,7 @@ impl SpannerDb {
"ids".to_owned(),
as_list_value(params.bsos.iter().map(|pbso| pbso.id.clone())),
);
let existing = self
let mut streaming = self
.sql(
"SELECT bso_id
FROM bsos
@ -1455,9 +1455,12 @@ impl SpannerDb {
AND bso_id IN UNNEST(@ids)",
)?
.params(sqlparams)
.execute(&self.conn)?
.map_results(|mut row| row[0].take_string_value())
.collect::<Result<Vec<_>>>()?;
.execute_async(&self.conn)?;
let mut existing = vec![];
while let Some(row) = streaming.next_async().await {
let mut row = row?;
existing.push(row[0].take_string_value());
}
let mut inserts = vec![];
let mut updates = HashMap::new();