1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
use anyhow::Context;
use fn_error_context::context;
use rusqlite::OptionalExtension;
use crate::util::wrap_git_error;
pub struct MergeBaseDb<'conn> {
conn: &'conn rusqlite::Connection,
}
#[context("Initializing tables for `MergeBaseDb`")]
fn init_tables(conn: &rusqlite::Connection) -> anyhow::Result<()> {
conn.execute(
"
CREATE TABLE IF NOT EXISTS merge_base_oids (
lhs_oid TEXT NOT NULL,
rhs_oid TEXT NOT NULL,
merge_base_oid TEXT,
UNIQUE (lhs_oid, rhs_oid)
)
",
rusqlite::params![],
)
.context("Creating tables")?;
Ok(())
}
impl<'conn> MergeBaseDb<'conn> {
#[context("Constructing `MergeBaseDb`")]
pub fn new(conn: &'conn rusqlite::Connection) -> anyhow::Result<Self> {
init_tables(&conn).context("Initializing tables")?;
Ok(MergeBaseDb { conn })
}
#[context("Querying for merge-base of OIDs {:?} and {:?}", lhs_oid, rhs_oid)]
pub fn get_merge_base_oid(
&self,
repo: &git2::Repository,
lhs_oid: git2::Oid,
rhs_oid: git2::Oid,
) -> anyhow::Result<Option<git2::Oid>> {
let (lhs_oid, rhs_oid) = if lhs_oid < rhs_oid {
(lhs_oid, rhs_oid)
} else {
(rhs_oid, lhs_oid)
};
let merge_base_oid: Option<Option<String>> = self
.conn
.query_row_named(
"
SELECT merge_base_oid
FROM merge_base_oids
WHERE lhs_oid = :lhs_oid
AND rhs_oid = :rhs_oid
",
rusqlite::named_params! {
":lhs_oid": lhs_oid.to_string(),
":rhs_oid": rhs_oid.to_string(),
},
|row| row.get("merge_base_oid"),
)
.optional()
.context("Querying merge-base DB")?;
match merge_base_oid {
Some(Some(merge_base_oid)) => {
let merge_base_oid =
git2::Oid::from_str(&merge_base_oid).context("Parsing merge-base OID")?;
Ok(Some(merge_base_oid))
}
Some(None) => Ok(None),
None => {
let merge_base_oid = match repo.merge_base(lhs_oid, rhs_oid) {
Ok(merge_base_oid) => Ok(Some(merge_base_oid)),
Err(err) => {
if err.code() == git2::ErrorCode::NotFound {
Ok(None)
} else {
Err(wrap_git_error(err))
}
}
}
.context("Querying Git repository for merge-base OID")?;
self.conn
.execute_named(
"
INSERT INTO merge_base_oids VALUES (
:lhs_oid,
:rhs_oid,
:merge_base_oid
)",
rusqlite::named_params! {
":lhs_oid": &lhs_oid.to_string(),
":rhs_oid": &rhs_oid.to_string(),
":merge_base_oid": &merge_base_oid.map(|oid| oid.to_string()),
},
)
.context("Caching merge-base OID")?;
Ok(merge_base_oid)
}
}
}
}