Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move Store::update_diagnostic_summary to Db

Browse source
This commit is contained in:
Antonio Scandurra 2022-11-16 15:41:33 +01:00
parent 117458f4f6
commit 95369f92eb
3 changed files with 97 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

115
crates/collab/src/db.rs
View file

@ -1724,6 +1724,81 @@ where
.await
}
pub async fn update_diagnostic_summary(
&self,
update: &proto::UpdateDiagnosticSummary,
connection_id: ConnectionId,
) -> Result<Vec<ConnectionId>> {
self.transact(|mut tx| async {
let project_id = ProjectId::from_proto(update.project_id);
let worktree_id = WorktreeId::from_proto(update.worktree_id);
let summary = update
.summary
.as_ref()
.ok_or_else(|| anyhow!("invalid summary"))?;
// Ensure the update comes from the host.
sqlx::query(
"
SELECT 1
FROM projects
WHERE id = $1 AND host_connection_id = $2
",
)
.bind(project_id)
.bind(connection_id.0 as i32)
.fetch_one(&mut tx)
.await?;
// Update summary.
sqlx::query(
"
INSERT INTO worktree_diagnostic_summaries (
project_id,
worktree_id,
path,
language_server_id,
error_count,
warning_count
)
VALUES ($1, $2, $3, $4, $5, $6)
ON CONFLICT (project_id, worktree_id, path) DO UPDATE SET
language_server_id = excluded.language_server_id,
error_count = excluded.error_count,
warning_count = excluded.warning_count
",
)
.bind(project_id)
.bind(worktree_id)
.bind(&summary.path)
.bind(summary.language_server_id as i64)
.bind(summary.error_count as i32)
.bind(summary.warning_count as i32)
.execute(&mut tx)
.await?;
let connection_ids = sqlx::query_scalar::<_, i32>(
"
SELECT connection_id
FROM project_collaborators
WHERE project_id = $1 AND connection_id != $2
",
)
.bind(project_id)
.bind(connection_id.0 as i32)
.fetch_all(&mut tx)
.await?;
tx.commit().await?;
Ok(connection_ids
.into_iter()
.map(|connection_id| ConnectionId(connection_id as u32))
.collect())
})
.await
}
pub async fn join_project(
&self,
project_id: ProjectId,
@ -1830,25 +1905,17 @@ where
})
.collect::<BTreeMap<_, _>>();
let mut params = "?,".repeat(worktrees.len());
if !worktrees.is_empty() {
params.pop();
}
// Populate worktree entries.
{
let query = format!(
let mut entries = sqlx::query_as::<_, WorktreeEntry>(
"
SELECT *
FROM worktree_entries
WHERE project_id = ? AND worktree_id IN ({params})
SELECT *
FROM worktree_entries
WHERE project_id = $1
",
);
let mut entries = sqlx::query_as::<_, WorktreeEntry>(&query).bind(project_id);
for worktree_id in worktrees.keys() {
entries = entries.bind(*worktree_id);
}
let mut entries = entries.fetch(&mut tx);
)
.bind(project_id)
.fetch(&mut tx);
while let Some(entry) = entries.next().await {
let entry = entry?;
if let Some(worktree) = worktrees.get_mut(&entry.worktree_id) {
@ -1870,19 +1937,15 @@ where
// Populate worktree diagnostic summaries.
{
let query = format!(
let mut summaries = sqlx::query_as::<_, WorktreeDiagnosticSummary>(
"
SELECT *
FROM worktree_diagnostic_summaries
WHERE project_id = $1 AND worktree_id IN ({params})
SELECT *
FROM worktree_diagnostic_summaries
WHERE project_id = $1
",
);
let mut summaries =
sqlx::query_as::<_, WorktreeDiagnosticSummary>(&query).bind(project_id);
for worktree_id in worktrees.keys() {
summaries = summaries.bind(*worktree_id);
}
let mut summaries = summaries.fetch(&mut tx);
)
.bind(project_id)
.fetch(&mut tx);
while let Some(summary) = summaries.next().await {
let summary = summary?;
if let Some(worktree) = worktrees.get_mut(&summary.worktree_id) {