file storage refactor

GitOrigin-RevId: 1e654aaf7ca1ea7297c37cdcea193f6aae850f1f

Author: gautamg795

crates/application/src/lib.rs

@@ -200,7 +200,10 @@ use model::{
         },
         ExternalPackagesModel,
     },
-    file_storage::FileStorageId,
+    file_storage::{
+        types::FileStorageEntry,
+        FileStorageId,
+    },
     modules::{
         module_versions::{
             AnalyzedModule,
@@ -2193,6 +2196,17 @@ impl<RT: Runtime> Application<RT> {
         Ok(storage_id)
     }
 
+    pub async fn store_file_entry(
+        &self,
+        entry: FileStorageEntry,
+    ) -> anyhow::Result<DeveloperDocumentId> {
+        let storage_id = self
+            .file_storage
+            .store_entry(entry, &self.usage_tracking)
+            .await?;
+        Ok(storage_id)
+    }
+
     pub async fn get_file(&self, storage_id: FileStorageId) -> anyhow::Result<FileStream> {
         let mut file_storage_tx = self.begin(Identity::system()).await?;
 
@@ -2576,6 +2590,10 @@ impl<RT: Runtime> Application<RT> {
             .map(|(ts, t, _)| (ts, t))
     }
 
+    pub fn files_storage(&self) -> Arc<dyn Storage> {
+        self.files_storage.clone()
+    }
+
     pub async fn shutdown(&self) -> anyhow::Result<()> {
         self.log_sender.shutdown()?;
         self.table_summary_worker.shutdown().await?;

crates/file_storage/src/core.rs

@@ -370,10 +370,19 @@ impl<RT: Runtime> FileStorage<RT> {
             .transactional_file_storage
             .upload_file(content_length, content_type, file, expected_sha256)
             .await?;
-        let size = entry.size;
+        self.store_entry(entry, usage_tracker).await
+    }
 
+    /// Record the existence of a file that has already been uploaded to the
+    /// underlying storage implementation.
+    pub async fn store_entry(
+        &self,
+        entry: FileStorageEntry,
+        usage_tracker: &dyn StorageUsageTracker,
+    ) -> anyhow::Result<DeveloperDocumentId> {
         // Start/Complete transaction after the slow upload process
         // to avoid OCC risk.
+        let size = entry.size;
         let mut tx = self.database.begin(Identity::system()).await?;
         let virtual_id = self
             .transactional_file_storage