mozilla
/
application-services
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

suggest: Fix re-ingesting icons. 

We used `INSERT` instead of `INSERT OR REPLACE` to store icons, so
trying to re-ingest an updated icon would fail with a unique constraint
error.
This commit is contained in:
Lina Butler 2023-08-03 09:47:45 -07:00
Родитель 96530396bd
Коммит 170d06ebad
2 изменённых файлов: 209 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
components/suggest/src/db.rs
Просмотреть файл

@ -292,10 +292,10 @@ impl<'a> SuggestDao<'a> {
Ok(())
}
/// Inserts an icon for a suggestion into the database.
pub fn insert_icon(&mut self, icon_id: &str, data: &[u8]) -> Result<()> {
/// Inserts or replaces an icon for a suggestion into the database.
pub fn put_icon(&mut self, icon_id: &str, data: &[u8]) -> Result<()> {
self.conn.execute(
"INSERT INTO icons(
"INSERT OR REPLACE INTO icons(
id,
data
)

209
components/suggest/src/store.rs
Просмотреть файл

@ -251,7 +251,7 @@ where
};
let data = self.settings_client.get_attachment(&attachment.location)?;
writer.write(|dao| {
dao.insert_icon(icon_id, &data)?;
dao.put_icon(icon_id, &data)?;
dao.put_meta(LAST_INGEST_META_KEY, record.last_modified)?;
Ok(())
})?;
@ -711,7 +711,7 @@ mod tests {
/// Tests re-ingesting suggestions from an updated attachment.
#[test]
fn reingest() -> anyhow::Result<()> {
fn reingest_suggestions() -> anyhow::Result<()> {
before_each();
// Ingest suggestions from the initial snapshot.
@ -753,7 +753,7 @@ mod tests {
)?;
let store = SuggestStoreInner::new(
"file:reingest?mode=memory&cache=shared",
"file:reingest_suggestions?mode=memory&cache=shared",
SnapshotSettingsClient::with_snapshot(initial_snapshot),
);
@ -880,6 +880,209 @@ mod tests {
Ok(())
}
/// Tests re-ingesting icons from an updated attachment.
#[test]
fn reingest_icons() -> anyhow::Result<()> {
before_each();
// Ingest suggestions and icons from the initial snapshot.
let initial_snapshot = Snapshot::with_records(json!([{
"id": "data-1",
"type": "data",
"last_modified": 15,
"attachment": {
"filename": "data-1.json",
"mimetype": "application/json",
"location": "data-1.json",
"hash": "",
"size": 0,
},
}, {
"id": "icon-2",
"type": "icon",
"last_modified": 20,
"attachment": {
"filename": "icon-2.png",
"mimetype": "image/png",
"location": "icon-2.png",
"hash": "",
"size": 0,
},
}, {
"id": "icon-3",
"type": "icon",
"last_modified": 25,
"attachment": {
"filename": "icon-3.png",
"mimetype": "image/png",
"location": "icon-3.png",
"hash": "",
"size": 0,
},
}]))?
.with_data(
"data-1.json",
json!([{
"id": 0,
"advertiser": "Good Place Eats",
"iab_category": "8 - Food & Drink",
"keywords": ["la", "las", "lasa", "lasagna", "lasagna come out tomorrow"],
"title": "Lasagna Come Out Tomorrow",
"url": "https://www.lasagna.restaurant",
"icon": "2",
"impression_url": "https://example.com/impression_url",
"click_url": "https://example.com/click_url"
}, {
"id": 0,
"advertiser": "Los Pollos Hermanos",
"iab_category": "8 - Food & Drink",
"keywords": ["lo", "los", "los pollos", "los pollos hermanos"],
"title": "Los Pollos Hermanos - Albuquerque",
"url": "https://www.lph-nm.biz",
"icon": "3",
"impression_url": "https://example.com/impression_url",
"click_url": "https://example.com/click_url"
}]),
)?
.with_icon("icon-2.png", "lasagna-icon".as_bytes().into())
.with_icon("icon-3.png", "pollos-icon".as_bytes().into());
let store = SuggestStoreInner::new(
"file:reingest_icons?mode=memory&cache=shared",
SnapshotSettingsClient::with_snapshot(initial_snapshot),
);
store.ingest(SuggestIngestionConstraints::default())?;
store.dbs()?.reader.read(|dao| {
assert_eq!(dao.get_meta(LAST_INGEST_META_KEY)?, Some(25u64));
assert_eq!(
dao.conn
.query_one::<i64>("SELECT count(*) FROM suggestions")?,
2
);
assert_eq!(dao.conn.query_one::<i64>("SELECT count(*) FROM icons")?, 2);
Ok(())
})?;
// Update the snapshot with new icons.
*store.settings_client.snapshot.borrow_mut() = Snapshot::with_records(json!([{
"id": "icon-2",
"type": "icon",
"last_modified": 30,
"attachment": {
"filename": "icon-2.png",
"mimetype": "image/png",
"location": "icon-2.png",
"hash": "",
"size": 0,
},
}, {
"id": "icon-3",
"type": "icon",
"last_modified": 35,
"attachment": {
"filename": "icon-3.png",
"mimetype": "image/png",
"location": "icon-3.png",
"hash": "",
"size": 0,
}
}]))?
.with_icon("icon-2.png", "new-lasagna-icon".as_bytes().into())
.with_icon("icon-3.png", "new-pollos-icon".as_bytes().into());
store.ingest(SuggestIngestionConstraints::default())?;
store.dbs()?.reader.read(|dao| {
assert_eq!(dao.get_meta(LAST_INGEST_META_KEY)?, Some(35u64));
expect![[r#"
[
Suggestion {
block_id: 0,
advertiser: "Good Place Eats",
iab_category: "8 - Food & Drink",
is_sponsored: true,
full_keyword: "lasagna",
title: "Lasagna Come Out Tomorrow",
url: "https://www.lasagna.restaurant",
icon: Some(
[
110,
101,
119,
45,
108,
97,
115,
97,
103,
110,
97,
45,
105,
99,
111,
110,
],
),
impression_url: Some(
"https://example.com/impression_url",
),
click_url: Some(
"https://example.com/click_url",
),
provider: Amp,
},
]
"#]]
.assert_debug_eq(&dao.fetch_by_keyword("la")?);
expect![[r#"
[
Suggestion {
block_id: 0,
advertiser: "Los Pollos Hermanos",
iab_category: "8 - Food & Drink",
is_sponsored: true,
full_keyword: "los",
title: "Los Pollos Hermanos - Albuquerque",
url: "https://www.lph-nm.biz",
icon: Some(
[
110,
101,
119,
45,
112,
111,
108,
108,
111,
115,
45,
105,
99,
111,
110,
],
),
impression_url: Some(
"https://example.com/impression_url",
),
click_url: Some(
"https://example.com/click_url",
),
provider: Amp,
},
]
"#]]
.assert_debug_eq(&dao.fetch_by_keyword("lo")?);
Ok(())
})?;
Ok(())
}
/// Tests ingesting tombstones for previously-ingested suggestions and
/// icons.
#[test]