mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 15:57:43 +03:00
mononoke/bonsai_globalrev_mapping: split out sql module
Summary: This lib.rs is getting too big. Split it. Reviewed By: StanislavGlebik Differential Revision: D25333510 fbshipit-source-id: ea15664d2de21a24ee107162e030b7762b1d413e
This commit is contained in:
Thomas Orozco
Facebook GitHub Bot
parent
00c3297c49
commit
ec0bff0b82
@ -7,20 +7,16 @@
|
||||
|
||||
#![deny(warnings)]
|
||||
|
||||
use async_trait::async_trait;
|
||||
use auto_impl::auto_impl;
|
||||
use sql::{Connection, Transaction};
|
||||
use sql_construct::{SqlConstruct, SqlConstructFromMetadataDatabaseConfig};
|
||||
use sql_ext::SqlConnections;
|
||||
use std::collections::HashSet;
|
||||
use thiserror::Error;
|
||||
mod sql;
|
||||
|
||||
use anyhow::Error;
|
||||
use context::CoreContext;
|
||||
use futures::compat::Future01CompatExt;
|
||||
use mononoke_types::{BonsaiChangeset, ChangesetId, Globalrev, RepositoryId};
|
||||
use slog::warn;
|
||||
use sql::queries;
|
||||
use async_trait::async_trait;
|
||||
use auto_impl::auto_impl;
|
||||
use mononoke_types::{ChangesetId, Globalrev, RepositoryId};
|
||||
|
||||
pub use crate::sql::{
|
||||
add_globalrevs, bulk_import_globalrevs, AddGlobalrevsErrorKind, SqlBonsaiGlobalrevMapping,
|
||||
};
|
||||
|
||||
#[derive(Clone, Debug, Eq, Hash, PartialEq)]
|
||||
pub struct BonsaiGlobalrevMappingEntry {
|
||||
@ -120,292 +116,3 @@ pub trait BonsaiGlobalrevMapping: Send + Sync {
|
||||
/// be used for Globalrev assignment.
|
||||
async fn get_max(&self, repo_id: RepositoryId) -> Result<Option<Globalrev>, Error>;
|
||||
}
|
||||
|
||||
queries! {
|
||||
write DangerouslyAddGlobalrevs(values: (
|
||||
repo_id: RepositoryId,
|
||||
bcs_id: ChangesetId,
|
||||
globalrev: Globalrev,
|
||||
)) {
|
||||
insert_or_ignore,
|
||||
"{insert_or_ignore} INTO bonsai_globalrev_mapping (repo_id, bcs_id, globalrev) VALUES {values}"
|
||||
}
|
||||
|
||||
read SelectMappingByBonsai(
|
||||
repo_id: RepositoryId,
|
||||
>list bcs_id: ChangesetId
|
||||
) -> (ChangesetId, Globalrev) {
|
||||
"SELECT bcs_id, globalrev
|
||||
FROM bonsai_globalrev_mapping
|
||||
WHERE repo_id = {repo_id} AND bcs_id in {bcs_id}"
|
||||
}
|
||||
|
||||
read SelectMappingByGlobalrev(
|
||||
repo_id: RepositoryId,
|
||||
>list globalrev: Globalrev
|
||||
) -> (ChangesetId, Globalrev) {
|
||||
"SELECT bcs_id, globalrev
|
||||
FROM bonsai_globalrev_mapping
|
||||
WHERE repo_id = {repo_id} AND globalrev in {globalrev}"
|
||||
}
|
||||
|
||||
read SelectMaxEntry(repo_id: RepositoryId) -> (Globalrev,) {
|
||||
"
|
||||
SELECT globalrev
|
||||
FROM bonsai_globalrev_mapping
|
||||
WHERE repo_id = {}
|
||||
ORDER BY globalrev DESC
|
||||
LIMIT 1
|
||||
"
|
||||
}
|
||||
|
||||
read SelectClosestGlobalrev(repo_id: RepositoryId, rev: Globalrev) -> (Globalrev,) {
|
||||
"
|
||||
SELECT globalrev
|
||||
FROM bonsai_globalrev_mapping
|
||||
WHERE repo_id = {repo_id} AND globalrev <= {rev}
|
||||
ORDER BY globalrev DESC
|
||||
LIMIT 1
|
||||
"
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct SqlBonsaiGlobalrevMapping {
|
||||
write_connection: Connection,
|
||||
read_connection: Connection,
|
||||
read_master_connection: Connection,
|
||||
}
|
||||
|
||||
impl SqlConstruct for SqlBonsaiGlobalrevMapping {
|
||||
const LABEL: &'static str = "bonsai_globalrev_mapping";
|
||||
|
||||
const CREATION_QUERY: &'static str =
|
||||
include_str!("../schemas/sqlite-bonsai-globalrev-mapping.sql");
|
||||
|
||||
fn from_sql_connections(connections: SqlConnections) -> Self {
|
||||
Self {
|
||||
write_connection: connections.write_connection,
|
||||
read_connection: connections.read_connection,
|
||||
read_master_connection: connections.read_master_connection,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl SqlConstructFromMetadataDatabaseConfig for SqlBonsaiGlobalrevMapping {}
|
||||
|
||||
#[async_trait]
|
||||
impl BonsaiGlobalrevMapping for SqlBonsaiGlobalrevMapping {
|
||||
async fn bulk_import(&self, entries: &[BonsaiGlobalrevMappingEntry]) -> Result<(), Error> {
|
||||
let entries: Vec<_> = entries
|
||||
.iter()
|
||||
.map(
|
||||
|
|
||||
BonsaiGlobalrevMappingEntry {
|
||||
repo_id,
|
||||
bcs_id,
|
||||
globalrev,
|
||||
},
|
||||
| (repo_id, bcs_id, globalrev),
|
||||
)
|
||||
.collect();
|
||||
|
||||
DangerouslyAddGlobalrevs::query(&self.write_connection, &entries[..])
|
||||
.compat()
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn get(
|
||||
&self,
|
||||
repo_id: RepositoryId,
|
||||
objects: BonsaisOrGlobalrevs,
|
||||
) -> Result<Vec<BonsaiGlobalrevMappingEntry>, Error> {
|
||||
let mut mappings = select_mapping(&self.read_connection, repo_id, &objects).await?;
|
||||
|
||||
let left_to_fetch = filter_fetched_objects(objects, &mappings[..]);
|
||||
|
||||
if left_to_fetch.is_empty() {
|
||||
return Ok(mappings);
|
||||
}
|
||||
|
||||
let mut master_mappings =
|
||||
select_mapping(&self.read_master_connection, repo_id, &left_to_fetch).await?;
|
||||
mappings.append(&mut master_mappings);
|
||||
Ok(mappings)
|
||||
}
|
||||
|
||||
async fn get_closest_globalrev(
|
||||
&self,
|
||||
repo_id: RepositoryId,
|
||||
globalrev: Globalrev,
|
||||
) -> Result<Option<Globalrev>, Error> {
|
||||
let row = SelectClosestGlobalrev::query(&self.read_connection, &repo_id, &globalrev)
|
||||
.compat()
|
||||
.await?
|
||||
.into_iter()
|
||||
.next();
|
||||
|
||||
Ok(row.map(|r| r.0))
|
||||
}
|
||||
|
||||
async fn get_max(&self, repo_id: RepositoryId) -> Result<Option<Globalrev>, Error> {
|
||||
let row = SelectMaxEntry::query(&self.read_master_connection, &repo_id)
|
||||
.compat()
|
||||
.await?
|
||||
.into_iter()
|
||||
.next();
|
||||
|
||||
Ok(row.map(|r| r.0))
|
||||
}
|
||||
}
|
||||
|
||||
fn filter_fetched_objects(
|
||||
objects: BonsaisOrGlobalrevs,
|
||||
mappings: &[BonsaiGlobalrevMappingEntry],
|
||||
) -> BonsaisOrGlobalrevs {
|
||||
match objects {
|
||||
BonsaisOrGlobalrevs::Bonsai(cs_ids) => {
|
||||
let bcs_fetched: HashSet<_> = mappings.iter().map(|m| &m.bcs_id).collect();
|
||||
|
||||
BonsaisOrGlobalrevs::Bonsai(
|
||||
cs_ids
|
||||
.iter()
|
||||
.filter_map(|cs| {
|
||||
if !bcs_fetched.contains(cs) {
|
||||
Some(*cs)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
})
|
||||
.collect(),
|
||||
)
|
||||
}
|
||||
BonsaisOrGlobalrevs::Globalrev(globalrevs) => {
|
||||
let globalrevs_fetched: HashSet<_> = mappings.iter().map(|m| &m.globalrev).collect();
|
||||
|
||||
BonsaisOrGlobalrevs::Globalrev(
|
||||
globalrevs
|
||||
.iter()
|
||||
.filter_map(|globalrev| {
|
||||
if !globalrevs_fetched.contains(globalrev) {
|
||||
Some(*globalrev)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
})
|
||||
.collect(),
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async fn select_mapping(
|
||||
connection: &Connection,
|
||||
repo_id: RepositoryId,
|
||||
objects: &BonsaisOrGlobalrevs,
|
||||
) -> Result<Vec<BonsaiGlobalrevMappingEntry>, Error> {
|
||||
if objects.is_empty() {
|
||||
return Ok(vec![]);
|
||||
}
|
||||
|
||||
let rows = match objects {
|
||||
BonsaisOrGlobalrevs::Bonsai(bcs_ids) => {
|
||||
SelectMappingByBonsai::query(&connection, &repo_id, &bcs_ids[..])
|
||||
.compat()
|
||||
.await?
|
||||
}
|
||||
BonsaisOrGlobalrevs::Globalrev(globalrevs) => {
|
||||
SelectMappingByGlobalrev::query(&connection, &repo_id, &globalrevs[..])
|
||||
.compat()
|
||||
.await?
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Ok(rows
|
||||
.into_iter()
|
||||
.map(move |(bcs_id, globalrev)| BonsaiGlobalrevMappingEntry {
|
||||
repo_id,
|
||||
bcs_id,
|
||||
globalrev,
|
||||
})
|
||||
.collect())
|
||||
}
|
||||
|
||||
/// This method is for importing Globalrevs in bulk from a set of BonsaiChangesets where you know
|
||||
/// they are correct. Don't use this to assign new Globalrevs.
|
||||
pub async fn bulk_import_globalrevs<'a>(
|
||||
ctx: &'a CoreContext,
|
||||
repo_id: RepositoryId,
|
||||
globalrevs_store: &'a impl BonsaiGlobalrevMapping,
|
||||
changesets: impl IntoIterator<Item = &'a BonsaiChangeset>,
|
||||
) -> Result<(), Error> {
|
||||
let mut entries = vec![];
|
||||
for bcs in changesets.into_iter() {
|
||||
match Globalrev::from_bcs(bcs) {
|
||||
Ok(globalrev) => {
|
||||
let entry =
|
||||
BonsaiGlobalrevMappingEntry::new(repo_id, bcs.get_changeset_id(), globalrev);
|
||||
entries.push(entry);
|
||||
}
|
||||
Err(e) => {
|
||||
warn!(
|
||||
ctx.logger(),
|
||||
"Couldn't fetch globalrev from commit: {:?}", e
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
globalrevs_store.bulk_import(&entries).await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[derive(Debug, Error)]
|
||||
pub enum AddGlobalrevsErrorKind {
|
||||
#[error("Conflict detected while inserting Globalrevs")]
|
||||
Conflict,
|
||||
|
||||
#[error("Internal error occurred while inserting Globalrevs")]
|
||||
InternalError(#[from] Error),
|
||||
}
|
||||
|
||||
// NOTE: For now, this is a top-level function since it doesn't use the connections in the
|
||||
// SqlBonsaiGlobalrevMapping, but if we were to add more implementations of the
|
||||
// BonsaiGlobalrevMapping trait, we should probably rethink the design of it, and not actually have
|
||||
// it contain any connections (instead, they should be passed on by callers).
|
||||
pub async fn add_globalrevs(
|
||||
transaction: Transaction,
|
||||
entries: impl IntoIterator<Item = &BonsaiGlobalrevMappingEntry>,
|
||||
) -> Result<Transaction, AddGlobalrevsErrorKind> {
|
||||
let rows: Vec<_> = entries
|
||||
.into_iter()
|
||||
.map(
|
||||
|
|
||||
BonsaiGlobalrevMappingEntry {
|
||||
repo_id,
|
||||
bcs_id,
|
||||
globalrev,
|
||||
},
|
||||
| (repo_id, bcs_id, globalrev),
|
||||
)
|
||||
.collect();
|
||||
|
||||
// It'd be really nice if we could rely on the error from an index conflict here, but our SQL
|
||||
// crate doesn't allow us to reach into this yet, so for now we check the number of affected
|
||||
// rows.
|
||||
|
||||
let (transaction, res) =
|
||||
DangerouslyAddGlobalrevs::query_with_transaction(transaction, &rows[..])
|
||||
.compat()
|
||||
.await?;
|
||||
|
||||
if res.affected_rows() != rows.len() as u64 {
|
||||
return Err(AddGlobalrevsErrorKind::Conflict);
|
||||
}
|
||||
|
||||
Ok(transaction)
|
||||
}
|
||||
|
||||
311
eden/mononoke/bonsai_globalrev_mapping/src/sql.rs
Normal file
311
eden/mononoke/bonsai_globalrev_mapping/src/sql.rs
Normal file
@ -0,0 +1,311 @@
|
||||
/*
|
||||
* Copyright (c) Facebook, Inc. and its affiliates.
|
||||
*
|
||||
* This software may be used and distributed according to the terms of the
|
||||
* GNU General Public License version 2.
|
||||
*/
|
||||
|
||||
#![deny(warnings)]
|
||||
|
||||
use ::sql::{queries, Connection, Transaction};
|
||||
use anyhow::Error;
|
||||
use async_trait::async_trait;
|
||||
use context::CoreContext;
|
||||
use futures::compat::Future01CompatExt;
|
||||
use mononoke_types::{BonsaiChangeset, ChangesetId, Globalrev, RepositoryId};
|
||||
use slog::warn;
|
||||
use sql_construct::{SqlConstruct, SqlConstructFromMetadataDatabaseConfig};
|
||||
use sql_ext::SqlConnections;
|
||||
use std::collections::HashSet;
|
||||
use thiserror::Error;
|
||||
|
||||
use super::{BonsaiGlobalrevMapping, BonsaiGlobalrevMappingEntry, BonsaisOrGlobalrevs};
|
||||
|
||||
queries! {
|
||||
write DangerouslyAddGlobalrevs(values: (
|
||||
repo_id: RepositoryId,
|
||||
bcs_id: ChangesetId,
|
||||
globalrev: Globalrev,
|
||||
)) {
|
||||
insert_or_ignore,
|
||||
"{insert_or_ignore} INTO bonsai_globalrev_mapping (repo_id, bcs_id, globalrev) VALUES {values}"
|
||||
}
|
||||
|
||||
read SelectMappingByBonsai(
|
||||
repo_id: RepositoryId,
|
||||
>list bcs_id: ChangesetId
|
||||
) -> (ChangesetId, Globalrev) {
|
||||
"SELECT bcs_id, globalrev
|
||||
FROM bonsai_globalrev_mapping
|
||||
WHERE repo_id = {repo_id} AND bcs_id in {bcs_id}"
|
||||
}
|
||||
|
||||
read SelectMappingByGlobalrev(
|
||||
repo_id: RepositoryId,
|
||||
>list globalrev: Globalrev
|
||||
) -> (ChangesetId, Globalrev) {
|
||||
"SELECT bcs_id, globalrev
|
||||
FROM bonsai_globalrev_mapping
|
||||
WHERE repo_id = {repo_id} AND globalrev in {globalrev}"
|
||||
}
|
||||
|
||||
read SelectMaxEntry(repo_id: RepositoryId) -> (Globalrev,) {
|
||||
"
|
||||
SELECT globalrev
|
||||
FROM bonsai_globalrev_mapping
|
||||
WHERE repo_id = {}
|
||||
ORDER BY globalrev DESC
|
||||
LIMIT 1
|
||||
"
|
||||
}
|
||||
|
||||
read SelectClosestGlobalrev(repo_id: RepositoryId, rev: Globalrev) -> (Globalrev,) {
|
||||
"
|
||||
SELECT globalrev
|
||||
FROM bonsai_globalrev_mapping
|
||||
WHERE repo_id = {repo_id} AND globalrev <= {rev}
|
||||
ORDER BY globalrev DESC
|
||||
LIMIT 1
|
||||
"
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone)]
|
||||
pub struct SqlBonsaiGlobalrevMapping {
|
||||
write_connection: Connection,
|
||||
read_connection: Connection,
|
||||
read_master_connection: Connection,
|
||||
}
|
||||
|
||||
impl SqlConstruct for SqlBonsaiGlobalrevMapping {
|
||||
const LABEL: &'static str = "bonsai_globalrev_mapping";
|
||||
|
||||
const CREATION_QUERY: &'static str =
|
||||
include_str!("../schemas/sqlite-bonsai-globalrev-mapping.sql");
|
||||
|
||||
fn from_sql_connections(connections: SqlConnections) -> Self {
|
||||
Self {
|
||||
write_connection: connections.write_connection,
|
||||
read_connection: connections.read_connection,
|
||||
read_master_connection: connections.read_master_connection,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl SqlConstructFromMetadataDatabaseConfig for SqlBonsaiGlobalrevMapping {}
|
||||
|
||||
#[async_trait]
|
||||
impl BonsaiGlobalrevMapping for SqlBonsaiGlobalrevMapping {
|
||||
async fn bulk_import(&self, entries: &[BonsaiGlobalrevMappingEntry]) -> Result<(), Error> {
|
||||
let entries: Vec<_> = entries
|
||||
.iter()
|
||||
.map(
|
||||
|
|
||||
BonsaiGlobalrevMappingEntry {
|
||||
repo_id,
|
||||
bcs_id,
|
||||
globalrev,
|
||||
},
|
||||
| (repo_id, bcs_id, globalrev),
|
||||
)
|
||||
.collect();
|
||||
|
||||
DangerouslyAddGlobalrevs::query(&self.write_connection, &entries[..])
|
||||
.compat()
|
||||
.await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn get(
|
||||
&self,
|
||||
repo_id: RepositoryId,
|
||||
objects: BonsaisOrGlobalrevs,
|
||||
) -> Result<Vec<BonsaiGlobalrevMappingEntry>, Error> {
|
||||
let mut mappings = select_mapping(&self.read_connection, repo_id, &objects).await?;
|
||||
|
||||
let left_to_fetch = filter_fetched_objects(objects, &mappings[..]);
|
||||
|
||||
if left_to_fetch.is_empty() {
|
||||
return Ok(mappings);
|
||||
}
|
||||
|
||||
let mut master_mappings =
|
||||
select_mapping(&self.read_master_connection, repo_id, &left_to_fetch).await?;
|
||||
mappings.append(&mut master_mappings);
|
||||
Ok(mappings)
|
||||
}
|
||||
|
||||
async fn get_closest_globalrev(
|
||||
&self,
|
||||
repo_id: RepositoryId,
|
||||
globalrev: Globalrev,
|
||||
) -> Result<Option<Globalrev>, Error> {
|
||||
let row = SelectClosestGlobalrev::query(&self.read_connection, &repo_id, &globalrev)
|
||||
.compat()
|
||||
.await?
|
||||
.into_iter()
|
||||
.next();
|
||||
|
||||
Ok(row.map(|r| r.0))
|
||||
}
|
||||
|
||||
async fn get_max(&self, repo_id: RepositoryId) -> Result<Option<Globalrev>, Error> {
|
||||
let row = SelectMaxEntry::query(&self.read_master_connection, &repo_id)
|
||||
.compat()
|
||||
.await?
|
||||
.into_iter()
|
||||
.next();
|
||||
|
||||
Ok(row.map(|r| r.0))
|
||||
}
|
||||
}
|
||||
|
||||
fn filter_fetched_objects(
|
||||
objects: BonsaisOrGlobalrevs,
|
||||
mappings: &[BonsaiGlobalrevMappingEntry],
|
||||
) -> BonsaisOrGlobalrevs {
|
||||
match objects {
|
||||
BonsaisOrGlobalrevs::Bonsai(cs_ids) => {
|
||||
let bcs_fetched: HashSet<_> = mappings.iter().map(|m| &m.bcs_id).collect();
|
||||
|
||||
BonsaisOrGlobalrevs::Bonsai(
|
||||
cs_ids
|
||||
.iter()
|
||||
.filter_map(|cs| {
|
||||
if !bcs_fetched.contains(cs) {
|
||||
Some(*cs)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
})
|
||||
.collect(),
|
||||
)
|
||||
}
|
||||
BonsaisOrGlobalrevs::Globalrev(globalrevs) => {
|
||||
let globalrevs_fetched: HashSet<_> = mappings.iter().map(|m| &m.globalrev).collect();
|
||||
|
||||
BonsaisOrGlobalrevs::Globalrev(
|
||||
globalrevs
|
||||
.iter()
|
||||
.filter_map(|globalrev| {
|
||||
if !globalrevs_fetched.contains(globalrev) {
|
||||
Some(*globalrev)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
})
|
||||
.collect(),
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async fn select_mapping(
|
||||
connection: &Connection,
|
||||
repo_id: RepositoryId,
|
||||
objects: &BonsaisOrGlobalrevs,
|
||||
) -> Result<Vec<BonsaiGlobalrevMappingEntry>, Error> {
|
||||
if objects.is_empty() {
|
||||
return Ok(vec![]);
|
||||
}
|
||||
|
||||
let rows = match objects {
|
||||
BonsaisOrGlobalrevs::Bonsai(bcs_ids) => {
|
||||
SelectMappingByBonsai::query(&connection, &repo_id, &bcs_ids[..])
|
||||
.compat()
|
||||
.await?
|
||||
}
|
||||
BonsaisOrGlobalrevs::Globalrev(globalrevs) => {
|
||||
SelectMappingByGlobalrev::query(&connection, &repo_id, &globalrevs[..])
|
||||
.compat()
|
||||
.await?
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
Ok(rows
|
||||
.into_iter()
|
||||
.map(move |(bcs_id, globalrev)| BonsaiGlobalrevMappingEntry {
|
||||
repo_id,
|
||||
bcs_id,
|
||||
globalrev,
|
||||
})
|
||||
.collect())
|
||||
}
|
||||
|
||||
/// This method is for importing Globalrevs in bulk from a set of BonsaiChangesets where you know
|
||||
/// they are correct. Don't use this to assign new Globalrevs.
|
||||
pub async fn bulk_import_globalrevs<'a>(
|
||||
ctx: &'a CoreContext,
|
||||
repo_id: RepositoryId,
|
||||
globalrevs_store: &'a impl BonsaiGlobalrevMapping,
|
||||
changesets: impl IntoIterator<Item = &'a BonsaiChangeset>,
|
||||
) -> Result<(), Error> {
|
||||
let mut entries = vec![];
|
||||
for bcs in changesets.into_iter() {
|
||||
match Globalrev::from_bcs(bcs) {
|
||||
Ok(globalrev) => {
|
||||
let entry =
|
||||
BonsaiGlobalrevMappingEntry::new(repo_id, bcs.get_changeset_id(), globalrev);
|
||||
entries.push(entry);
|
||||
}
|
||||
Err(e) => {
|
||||
warn!(
|
||||
ctx.logger(),
|
||||
"Couldn't fetch globalrev from commit: {:?}", e
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
globalrevs_store.bulk_import(&entries).await?;
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[derive(Debug, Error)]
|
||||
pub enum AddGlobalrevsErrorKind {
|
||||
#[error("Conflict detected while inserting Globalrevs")]
|
||||
Conflict,
|
||||
|
||||
#[error("Internal error occurred while inserting Globalrevs")]
|
||||
InternalError(#[from] Error),
|
||||
}
|
||||
|
||||
// NOTE: For now, this is a top-level function since it doesn't use the connections in the
|
||||
// SqlBonsaiGlobalrevMapping, but if we were to add more implementations of the
|
||||
// BonsaiGlobalrevMapping trait, we should probably rethink the design of it, and not actually have
|
||||
// it contain any connections (instead, they should be passed on by callers).
|
||||
pub async fn add_globalrevs(
|
||||
transaction: Transaction,
|
||||
entries: impl IntoIterator<Item = &BonsaiGlobalrevMappingEntry>,
|
||||
) -> Result<Transaction, AddGlobalrevsErrorKind> {
|
||||
let rows: Vec<_> = entries
|
||||
.into_iter()
|
||||
.map(
|
||||
|
|
||||
BonsaiGlobalrevMappingEntry {
|
||||
repo_id,
|
||||
bcs_id,
|
||||
globalrev,
|
||||
},
|
||||
| (repo_id, bcs_id, globalrev),
|
||||
)
|
||||
.collect();
|
||||
|
||||
// It'd be really nice if we could rely on the error from an index conflict here, but our SQL
|
||||
// crate doesn't allow us to reach into this yet, so for now we check the number of affected
|
||||
// rows.
|
||||
|
||||
let (transaction, res) =
|
||||
DangerouslyAddGlobalrevs::query_with_transaction(transaction, &rows[..])
|
||||
.compat()
|
||||
.await?;
|
||||
|
||||
if res.affected_rows() != rows.len() as u64 {
|
||||
return Err(AddGlobalrevsErrorKind::Conflict);
|
||||
}
|
||||
|
||||
Ok(transaction)
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user