scmstore: add test for aux data prefetching on CAS

Summary:
Add a failing test showing the backingstore isn't getting file aux data when fetching trees on CAS.

I tried to get a good test running a real eden, but I couldn't find a good way. Instead, I added a --store-model flag to the debugscmstore command which causes the scmstore query to use the storemodel trait entry point instead if the direct scmstore struct types. This way we can directly test what the backingstore gets from scmstore.

Reviewed By: zzl0

Differential Revision: D71522122

fbshipit-source-id: a9af328b43400c8d5895341a08436960fa15e12f

Author: muirdm

eden/scm/lib/commands/debugcommands/cmddebugscmstore/BUCK

@@ -25,6 +25,7 @@ rust_library(
         "//eden/scm/lib/metrics:metrics",
         "//eden/scm/lib/repo:repo",
         "//eden/scm/lib/revisionstore:revisionstore",
+        "//eden/scm/lib/storemodel:storemodel",
         "//eden/scm/lib/types:types",
     ],
 )

eden/scm/lib/commands/debugcommands/cmddebugscmstore/Cargo.toml

@@ -17,5 +17,6 @@ sapling-manifest = { version = "0.1.0", path = "../../../manifest" }
 sapling-metrics = { version = "0.1.0", path = "../../../metrics" }
 sapling-repo = { version = "0.1.0", path = "../../../repo" }
 sapling-revisionstore = { version = "0.1.0", path = "../../../revisionstore" }
+sapling-storemodel = { version = "0.1.0", path = "../../../storemodel" }
 sapling-types = { version = "0.1.0", path = "../../../types" }
 serde = { version = "1.0.185", features = ["derive", "rc"] }

eden/scm/lib/commands/debugcommands/cmddebugscmstore/src/lib.rs

@@ -29,6 +29,7 @@ use revisionstore::scmstore::FileAttributes;
 use serde::de::value;
 use serde::de::value::StringDeserializer;
 use serde::de::Deserialize;
+use storemodel::TreeStore;
 use types::fetch_mode::FetchMode;
 use types::Key;
 use types::RepoPathBuf;
@@ -53,6 +54,9 @@ define_flags! {
         /// Request tree parents.
         tree_parents: bool,
 
+        /// Run in storemodel (using storemodel traits). This is what eden uses.
+        store_model: bool,
+
         /// Revision for positional file paths.
         #[short('r')]
         #[argtype("REV")]
@@ -138,6 +142,7 @@ pub fn run(ctx: ReqCtx<DebugScmStoreOpts>, repo: &Repo) -> Result<u8> {
             &fresh_repo,
             keys,
             fetch_mode,
+            ctx.opts.store_model,
             ctx.opts.tree_parents,
             ctx.opts.aux_only,
         )?,
@@ -213,6 +218,7 @@ fn fetch_trees(
     repo: &Repo,
     keys: Vec<Key>,
     fetch_mode: FetchMode,
+    store_model: bool,
     tree_parents: bool,
     aux_only: bool,
 ) -> Result<()> {
@@ -230,14 +236,30 @@ fn fetch_trees(
         attrs |= TreeAttributes::PARENTS;
     }
 
-    let fetch_result = store.fetch_batch(keys.into_iter(), attrs, fetch_mode);
+    if store_model {
+        for tree in store.get_tree_iter(keys, fetch_mode)? {
+            let (key, tree) = tree?;
 
-    let (found, missing, _errors) = fetch_result.consume();
-    for complete in found.into_iter() {
-        write!(stdout, "Successfully fetched tree: {:#?}\n", complete)?;
-    }
-    for incomplete in missing.into_iter() {
-        write!(stdout, "Failed to fetch tree: {:#?}\n", incomplete)?;
+            writeln!(stdout, "Tree '{}' entries", key.path)?;
+            for entry in tree.iter()? {
+                writeln!(stdout, "  {:?}", entry?)?;
+            }
+
+            writeln!(stdout, "Tree '{}' file aux", key.path)?;
+            for entry in tree.file_aux_iter()? {
+                writeln!(stdout, "  {:?}", entry?)?;
+            }
+        }
+    } else {
+        let fetch_result = store.fetch_batch(keys.into_iter(), attrs, fetch_mode);
+
+        let (found, missing, _errors) = fetch_result.consume();
+        for complete in found.into_iter() {
+            write!(stdout, "Successfully fetched tree: {:#?}\n", complete)?;
+        }
+        for incomplete in missing.into_iter() {
+            write!(stdout, "Failed to fetch tree: {:#?}\n", incomplete)?;
+        }
     }
 
     Ok(())

eden/scm/tests/test-scmstore-storemodel-aux-data.t

@@ -0,0 +1,29 @@
+
+  $ setconfig scmstore.cas-mode=on
+
+  $ setconfig push.edenapi=true
+  $ setconfig scmstore.tree-metadata-mode=always
+
+  $ newserver server
+
+  $ newclientrepo client server
+  $ drawdag <<EOS
+  > A # A/dir/foo = foo
+  >   # A/dir/bar = bar
+  > EOS
+  $ hg push -qr $A --to main --create
+
+Reset local repo stores
+  $ newclientrepo client2 server
+  $ hg pull -qr $A
+
+First fetch aux data for root dir (needed to for subsequent fetch).
+  $ hg debugscmstore --mode tree -r $A "" >/dev/null
+
+--store-model uses the storemodel trait (which is what EdenFS uses)
+FIXME: missing aux data
+  $ hg debugscmstore --mode tree -r $A "dir" --store-model
+  Tree 'dir' entries
+    (PathComponentBuf("bar"), HgId("a324b8bf63f7d56de9d36f8747e3b68a72a4d968"), File(Regular))
+    (PathComponentBuf("foo"), HgId("49d8cbb15ce257920447006b46978b7af980a979"), File(Regular))
+  Tree 'dir' file aux