implement support for eagerepo: part #2 (new store)

Summary: implement support for eagerepo - add a store

Reviewed By: quark-zju

Differential Revision: D58870596

fbshipit-source-id: 4d2f9d7cdaa3993f17304711188cea1cfb41887f

Author: Liubov Dmitrieva

eden/scm/lib/eagerepo/src/api.rs

@@ -1326,12 +1326,46 @@ impl EagerRepo {
         Ok(())
     }
 
+    fn opt_augmented_tree_blob_with_digest_for_api(
+        &self,
+        id: HgId,
+        handler: &str,
+    ) -> edenapi::Result<Option<minibytes::Bytes>> {
+        // Emulate the HTTP errors.
+        match self.get_augmented_tree_blob(id) {
+            Ok(None) => {
+                trace!(" not found: {}", id.to_hex());
+                // TODO: try to derive it recursively from the sapling manifest
+                Ok(None)
+            }
+            Ok(Some(data)) => {
+                trace!(" found: {}, {} bytes", id.to_hex(), data.len());
+                Ok(Some(data))
+            }
+            Err(e) => Err(SaplingRemoteApiError::HttpError {
+                status: StatusCode::INTERNAL_SERVER_ERROR,
+                message: format!("{:?}", e),
+                headers: Default::default(),
+                url: self.url(handler),
+            }),
+        }
+    }
+
     async fn get_augmented_tree_blob_with_digest_for_api(
         &self,
-        _id: HgId,
-        _handler: &str,
+        id: HgId,
+        handler: &str,
     ) -> edenapi::Result<minibytes::Bytes> {
-        unimplemented!()
+        // Emulate the HTTP errors.
+        match self.opt_augmented_tree_blob_with_digest_for_api(id, handler)? {
+            None => Err(SaplingRemoteApiError::HttpError {
+                status: StatusCode::NOT_FOUND,
+                message: format!("{} cannot be found", id.to_hex()),
+                headers: Default::default(),
+                url: self.url(handler),
+            }),
+            Some(data) => Ok(data),
+        }
     }
 
     async fn flush_for_api(&self, handler: &str) -> edenapi::Result<()> {

eden/scm/lib/eagerepo/src/eager_repo.rs

@@ -70,6 +70,9 @@ use crate::Result;
 pub struct EagerRepo {
     pub(crate) dag: Mutex<Dag>,
     pub(crate) store: EagerRepoStore,
+    // Additional store for the Augmented Trees, since they are addressed by
+    // the same sha1 hashes, making it impossible to store in the primary store
+    pub(crate) secondary_tree_store: EagerRepoStore,
     metalog: RwLock<MetaLog>,
     pub(crate) dir: PathBuf,
     pub(crate) mut_store: Mutex<MutationStore>,
@@ -232,12 +235,15 @@ impl EagerRepo {
         let store_dir = hg_dir.join("store");
         let dag = Dag::open(store_dir.join("segments").join("v1"))?;
         let store = EagerRepoStore::open(&store_dir.join("hgcommits").join("v1"))?;
+        let secondary_tree_store =
+            EagerRepoStore::open(&store_dir.join("augmentedtrees").join("v1"))?;
         let metalog = MetaLog::open(store_dir.join("metalog"), None)?;
         let mut_store = MutationStore::open(store_dir.join("mutation"))?;
 
         let repo = Self {
             dag: Mutex::new(dag),
             store,
+            secondary_tree_store,
             metalog: RwLock::new(metalog),
             dir: dir.to_path_buf(),
             mut_store: Mutex::new(mut_store),
@@ -328,6 +334,7 @@ impl EagerRepo {
     /// Write pending changes to disk.
     pub async fn flush(&self) -> Result<()> {
         self.store.flush()?;
+        self.secondary_tree_store.flush()?;
         let master_heads = {
             let books = self.get_bookmarks_map()?;
             let mut heads = Vec::new();
@@ -362,6 +369,17 @@ impl EagerRepo {
         self.store.get_sha1_blob(id)
     }
 
+    /// Insert SHA1 blob to zstore for augmented trees.
+    /// These blobs are not content addressed
+    pub fn add_augmented_tree_blob(&self, id: Id20, data: &[u8]) -> Result<()> {
+        self.secondary_tree_store.add_arbitrary_blob(id, data)
+    }
+
+    /// Read SHA1 blob from zstore for augmented trees.
+    pub fn get_augmented_tree_blob(&self, id: Id20) -> Result<Option<Bytes>> {
+        self.secondary_tree_store.get_sha1_blob(id)
+    }
+
     /// Insert a commit. Return the commit hash.
     pub async fn add_commit(&self, parents: &[Id20], raw_text: &[u8]) -> Result<Id20> {
         let parents: Vec<Vertex> = parents