Store and retrieve collection metadata in storage

mozilla · Dec 19, 2024 · 89d95d2 · 89d95d2
1 parent 0ed7091
commit 89d95d2
Show file tree

Hide file tree

Showing 2 changed files with 198 additions and 56 deletions.
diff --git a/components/remote_settings/src/client.rs b/components/remote_settings/src/client.rs
@@ -151,9 +151,15 @@ impl<C: ApiClient> RemoteSettingsClient<C> {
                 .get_last_modified_timestamp(&collection_url)?
                 .unwrap_or(0);
             if packaged_data.timestamp > cached_timestamp {
-                inner
-                    .storage
-                    .set_records(&collection_url, &packaged_data.data)?;
+                // Remove previously cached data (packaged data does not have tombstones).
+                inner.storage.empty()?;
+                // Insert new packaged data.
+                inner.storage.insert_collection_content(
+                    &collection_url,
+                    &packaged_data.data,
+                    packaged_data.timestamp,
+                    CollectionMetadata::default(),
+                )?;
                 return Ok(Some(self.filter_records(packaged_data.data)));
             }
         }
@@ -169,7 +175,12 @@ impl<C: ApiClient> RemoteSettingsClient<C> {
             // Case 3: sync_if_empty=true
             (None, true) => {
                 let changeset = inner.api_client.fetch_changeset(None)?;
-                inner.storage.set_records(&collection_url, &changeset.changes)?;
+                inner.storage.insert_collection_content(
+                    &collection_url,
+                    &changeset.changes,
+                    changeset.timestamp,
+                    changeset.metadata,
+                )?;
                 Some(self.filter_records(changeset.changes))
             }
             // Case 4: Nothing to return
@@ -182,7 +193,12 @@ impl<C: ApiClient> RemoteSettingsClient<C> {
         let collection_url = inner.api_client.collection_url();
         let mtime = inner.storage.get_last_modified_timestamp(&collection_url)?;
         let changeset = inner.api_client.fetch_changeset(mtime)?;
-        inner.storage.merge_records(&collection_url, &changeset.changes)
+        inner.storage.insert_collection_content(
+            &collection_url,
+            &changeset.changes,
+            changeset.timestamp,
+            changeset.metadata,
+        )
     }
 
     /// Downloads an attachment from [attachment_location]. NOTE: there are no guarantees about a
@@ -1795,7 +1811,7 @@ mod jexl_tests {
         };
 
         let mut storage = Storage::new(":memory:".into()).expect("Error creating storage");
-        let _ = storage.set_collection_content(
+        let _ = storage.insert_collection_content(
             "http://rs.example.com/v1/buckets/main/collections/test-collection",
             &records,
             42,
@@ -1853,7 +1869,7 @@ mod jexl_tests {
         };
 
         let mut storage = Storage::new(":memory:".into()).expect("Error creating storage");
-        let _ = storage.set_collection_content(
+        let _ = storage.insert_collection_content(
             "http://rs.example.com/v1/buckets/main/collections/test-collection",
             &records,
             42,
@@ -1940,7 +1956,12 @@ mod cached_data_tests {
 
         let mut api_client = MockApiClient::new();
         let mut storage = Storage::new(":memory:".into())?;
-        storage.set_records(collection_url, &vec![old_record.clone()])?;
+        storage.insert_collection_content(
+            collection_url,
+            &vec![old_record.clone()],
+            42,
+            CollectionMetadata::default(),
+        )?;
 
         api_client
             .expect_collection_url()
@@ -2095,7 +2116,12 @@ mod cached_data_tests {
             attachment: None,
             fields: serde_json::Map::new(),
         }];
-        storage.set_records(&collection_url, &cached_records)?;
+        storage.insert_collection_content(
+            &collection_url,
+            &cached_records,
+            42,
+            CollectionMetadata::default(),
+        )?;
 
         api_client
             .expect_collection_url()
@@ -2131,7 +2157,12 @@ mod cached_data_tests {
 
         // Set up empty cached records
         let cached_records: Vec<RemoteSettingsRecord> = vec![];
-        storage.set_records(&collection_url, &cached_records)?;
+        storage.insert_collection_content(
+            &collection_url,
+            &cached_records,
+            42,
+            CollectionMetadata::default(),
+        )?;
 
         api_client
             .expect_collection_url()