InferredCopyFrom: add derivation placeholder

Liu Yang · facebook-github-bot · commit d8a1418989a5 · 2025-05-28T12:52:38.000-07:00
Summary: Similar to D61713279, just setting up the boilerplate.

Reviewed By: markbt

Differential Revision: D75146827

fbshipit-source-id: 4ede3c8e5fe4ac0e79dd13813fd2b47d6e2adab9
diff --git a/eden/mononoke/Cargo.toml b/eden/mononoke/Cargo.toml
@@ -292,6 +292,7 @@ members = [
   "derived_data/if/clients",
   "derived_data/if/mocks",
   "derived_data/if/services",
+  "derived_data/inferred_copy_from",
   "derived_data/manager",
   "derived_data/mercurial_derivation",
   "derived_data/remote",
diff --git a/eden/mononoke/bookmarks/BUCK b/eden/mononoke/bookmarks/BUCK
@@ -167,6 +167,7 @@ rust_library(
         "//eden/mononoke/derived_data:skeleton_manifest",
         "//eden/mononoke/derived_data:skeleton_manifest_v2",
         "//eden/mononoke/derived_data:unodes",
+        "//eden/mononoke/derived_data:inferred_copy_from",
         "//eden/mononoke/derived_data/content_manifest_derivation:content_manifest_derivation",
         "//eden/mononoke/derived_data/filenodes_derivation:filenodes_derivation",
         "//eden/mononoke/derived_data/mercurial_derivation:mercurial_derivation",
diff --git a/eden/mononoke/bookmarks/warm_bookmarks_cache/Cargo.toml b/eden/mononoke/bookmarks/warm_bookmarks_cache/Cargo.toml
@@ -33,6 +33,7 @@ futures = { version = "0.3.30", features = ["async-await", "compat"] }
 futures_stats = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
 futures_watchdog = { version = "0.1.0", path = "../../common/futures_watchdog" }
 git_types = { version = "0.1.0", path = "../../git/git_types" }
+inferred_copy_from = { version = "0.1.0", path = "../../derived_data/inferred_copy_from" }
 itertools = "0.14.0"
 justknobs = { version = "0.1.0", git = "https://github.com/facebookexperimental/rust-shed.git", branch = "main" }
 lazy_static = { version = "1.5", features = ["spin_no_std"], default-features = false }
diff --git a/eden/mononoke/bookmarks/warm_bookmarks_cache/lib.rs b/eden/mononoke/bookmarks/warm_bookmarks_cache/lib.rs
@@ -66,6 +66,7 @@ use futures_stats::TimedFutureExt;
 use futures_watchdog::WatchdogExt;
 use git_types::MappedGitCommitId;
 use git_types::RootGitDeltaManifestV2Id;
+use inferred_copy_from::RootInferredCopyFromId;
 use itertools::Itertools;
 #[cfg(fbcode_build)]
 use lazy_static::lazy_static;
@@ -320,6 +321,11 @@ impl WarmBookmarksCacheBuilder {
                 &self.ctx,
                 repo_derived_data.clone(),
             )),
+            DerivableType::InferredCopyFrom => Some(create_derived_data_warmer::<
+                RootInferredCopyFromId,
+            >(
+                &self.ctx, repo_derived_data.clone()
+            )),
             DerivableType::TestManifests => None,
             DerivableType::TestShardedManifests => None,
         }
diff --git a/eden/mononoke/commit_rewriting/cross_repo_sync/src/test/git_submodules/git_submodules_test_utils.rs b/eden/mononoke/commit_rewriting/cross_repo_sync/src/test/git_submodules/git_submodules_test_utils.rs
@@ -551,6 +551,8 @@ pub(crate) fn submodule_repo_derived_data_types_config() -> HashMap<String, Deri
                 DerivableType::HgChangesets,
                 DerivableType::HgAugmentedManifests,
                 DerivableType::FileNodes,
+                // TODO(lyang) Remove once the new type impl is ready
+                DerivableType::InferredCopyFrom,
             ]
             .contains(t)
         })
diff --git a/eden/mononoke/derived_data/BUCK b/eden/mononoke/derived_data/BUCK
@@ -57,6 +57,7 @@ rust_library(
         ":derived_data_manager",
         ":fastlog",
         ":fsnodes",
+        ":inferred_copy_from",
         ":skeleton_manifest",
         ":skeleton_manifest_v2",
         ":test_manifest",
@@ -558,6 +559,21 @@ rust_library(
     ],
 )
 
+rust_library(
+    name = "inferred_copy_from",
+    srcs = glob(["inferred_copy_from/*.rs"]),
+    autocargo = {"cargo_toml_dir": "inferred_copy_from"},
+    deps = [
+        "fbsource//third-party/rust:anyhow",
+        "fbsource//third-party/rust:async-trait",
+        "//eden/mononoke/blobstore:blobstore",
+        "//eden/mononoke/derived_data:derived_data_manager",
+        "//eden/mononoke/derived_data/remote/if:derived_data_service_if-rust",
+        "//eden/mononoke/mononoke_types:mononoke_types",
+        "//eden/mononoke/server/context:context",
+    ],
+)
+
 rust_library(
     name = "test_manifest",
     srcs = glob(["test_manifest/*.rs"]),
diff --git a/eden/mononoke/derived_data/bulk_derivation/Cargo.toml b/eden/mononoke/derived_data/bulk_derivation/Cargo.toml
@@ -27,6 +27,7 @@ filenodes_derivation = { version = "0.1.0", path = "../filenodes_derivation" }
 fsnodes = { version = "0.1.0", path = "../fsnodes" }
 futures = { version = "0.3.30", features = ["async-await", "compat"] }
 git_types = { version = "0.1.0", path = "../../git/git_types" }
+inferred_copy_from = { version = "0.1.0", path = "../inferred_copy_from" }
 mercurial_derivation = { version = "0.1.0", path = "../mercurial_derivation" }
 mononoke_macros = { version = "0.1.0", path = "../../mononoke_macros" }
 mononoke_types = { version = "0.1.0", path = "../../mononoke_types" }
diff --git a/eden/mononoke/derived_data/bulk_derivation/lib.rs b/eden/mononoke/derived_data/bulk_derivation/lib.rs
@@ -34,6 +34,7 @@ use futures::TryStreamExt;
 use futures::stream;
 use git_types::MappedGitCommitId;
 use git_types::RootGitDeltaManifestV2Id;
+use inferred_copy_from::RootInferredCopyFromId;
 use mercurial_derivation::MappedHgChangesetId;
 use mercurial_derivation::RootHgAugmentedManifestId;
 use mononoke_macros::mononoke;
@@ -331,6 +332,9 @@ fn manager_for_type(
         DerivableType::GitDeltaManifestsV2 => {
             Arc::new(SingleTypeManager::<RootGitDeltaManifestV2Id>::new(manager))
         }
+        DerivableType::InferredCopyFrom => {
+            Arc::new(SingleTypeManager::<RootInferredCopyFromId>::new(manager))
+        }
         DerivableType::BssmV3 => Arc::new(SingleTypeManager::<RootBssmV3DirectoryId>::new(manager)),
         DerivableType::TestManifests => {
             Arc::new(SingleTypeManager::<RootTestManifestDirectory>::new(manager))
diff --git a/eden/mononoke/derived_data/if/derived_data_type.thrift b/eden/mononoke/derived_data/if/derived_data_type.thrift
@@ -36,4 +36,5 @@ enum DerivedDataType {
   SKELETON_MANIFEST_V2 = 20,
   CCSM = 21,
   CONTENT_MANIFEST = 22,
+  INFERRED_COPY_FROM = 23,
 }
diff --git a/eden/mononoke/derived_data/inferred_copy_from/Cargo.toml b/eden/mononoke/derived_data/inferred_copy_from/Cargo.toml
@@ -0,0 +1,20 @@
+# @generated by autocargo from //eden/mononoke/derived_data:inferred_copy_from
+
+[package]
+name = "inferred_copy_from"
+version = "0.1.0"
+authors = ["Facebook"]
+edition = "2021"
+license = "GPLv2+"
+
+[lib]
+path = "lib.rs"
+
+[dependencies]
+anyhow = "1.0.95"
+async-trait = "0.1.86"
+blobstore = { version = "0.1.0", path = "../../blobstore" }
+context = { version = "0.1.0", path = "../../server/context" }
+derived_data_manager = { version = "0.1.0", path = "../manager" }
+derived_data_service_if = { version = "0.1.0", path = "../remote/if" }
+mononoke_types = { version = "0.1.0", path = "../../mononoke_types" }
diff --git a/eden/mononoke/derived_data/inferred_copy_from/lib.rs b/eden/mononoke/derived_data/inferred_copy_from/lib.rs
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This software may be used and distributed according to the terms of the
+ * GNU General Public License version 2.
+ */
+
+mod mapping;
+
+pub use mapping::RootInferredCopyFromId;
+pub use mapping::format_key;
diff --git a/eden/mononoke/derived_data/inferred_copy_from/mapping.rs b/eden/mononoke/derived_data/inferred_copy_from/mapping.rs
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This software may be used and distributed according to the terms of the
+ * GNU General Public License version 2.
+ */
+
+use std::collections::HashMap;
+
+use anyhow::Error;
+use anyhow::Result;
+use anyhow::anyhow;
+use async_trait::async_trait;
+use blobstore::BlobstoreGetData;
+use context::CoreContext;
+use derived_data_manager::BonsaiDerivable;
+use derived_data_manager::DerivableType;
+use derived_data_manager::DerivationContext;
+use derived_data_manager::dependencies;
+use derived_data_service_if as thrift;
+use mononoke_types::BlobstoreBytes;
+use mononoke_types::BonsaiChangeset;
+use mononoke_types::ChangesetId;
+use mononoke_types::InferredCopyFromId;
+use mononoke_types::ThriftConvert;
+
+#[derive(Debug, Clone, Eq, PartialEq, Hash)]
+pub struct RootInferredCopyFromId(pub(crate) InferredCopyFromId);
+
+pub fn format_key(derivation_ctx: &DerivationContext, changeset_id: ChangesetId) -> String {
+    let root_prefix = "derived_root_icf.";
+    let key_prefix = derivation_ctx.mapping_key_prefix::<RootInferredCopyFromId>();
+    format!("{}{}{}", root_prefix, key_prefix, changeset_id)
+}
+
+impl TryFrom<BlobstoreBytes> for RootInferredCopyFromId {
+    type Error = Error;
+    fn try_from(blob_bytes: BlobstoreBytes) -> Result<Self> {
+        InferredCopyFromId::from_bytes(blob_bytes.into_bytes()).map(RootInferredCopyFromId)
+    }
+}
+
+impl TryFrom<BlobstoreGetData> for RootInferredCopyFromId {
+    type Error = Error;
+    fn try_from(blob_val: BlobstoreGetData) -> Result<Self> {
+        blob_val.into_bytes().try_into()
+    }
+}
+
+impl From<RootInferredCopyFromId> for BlobstoreBytes {
+    fn from(root_id: RootInferredCopyFromId) -> Self {
+        BlobstoreBytes::from_bytes(root_id.0.into_bytes())
+    }
+}
+
+impl RootInferredCopyFromId {
+    pub fn into_inner_id(self) -> InferredCopyFromId {
+        self.0
+    }
+    pub fn inner_id(&self) -> &InferredCopyFromId {
+        &self.0
+    }
+}
+
+#[async_trait]
+impl BonsaiDerivable for RootInferredCopyFromId {
+    const VARIANT: DerivableType = DerivableType::InferredCopyFrom;
+
+    type Dependencies = dependencies![];
+    type PredecessorDependencies = dependencies![];
+
+    async fn derive_single(
+        _ctx: &CoreContext,
+        _derivation_ctx: &DerivationContext,
+        _bonsai: BonsaiChangeset,
+        _parents: Vec<Self>,
+        _known: Option<&HashMap<ChangesetId, Self>>,
+    ) -> Result<Self> {
+        unimplemented!("InferredCopyFrom derivation is not implemented")
+    }
+
+    async fn store_mapping(
+        self,
+        ctx: &CoreContext,
+        derivation_ctx: &DerivationContext,
+        changeset_id: ChangesetId,
+    ) -> Result<()> {
+        let key = format_key(derivation_ctx, changeset_id);
+        derivation_ctx.blobstore().put(ctx, key, self.into()).await
+    }
+
+    async fn fetch(
+        ctx: &CoreContext,
+        derivation_ctx: &DerivationContext,
+        changeset_id: ChangesetId,
+    ) -> Result<Option<Self>> {
+        let key = format_key(derivation_ctx, changeset_id);
+        derivation_ctx
+            .blobstore()
+            .get(ctx, &key)
+            .await?
+            .map(TryInto::try_into)
+            .transpose()
+    }
+
+    fn from_thrift(data: thrift::DerivedData) -> Result<Self> {
+        if let thrift::DerivedData::inferred_copy_from(
+            thrift::DerivedDataInferredCopyFrom::root_inferred_copy_from_id(id),
+        ) = data
+        {
+            InferredCopyFromId::from_thrift(id).map(Self)
+        } else {
+            Err(anyhow!(
+                "Can't convert {} from provided thrift::DerivedData",
+                Self::NAME.to_string(),
+            ))
+        }
+    }
+
+    fn into_thrift(data: Self) -> Result<thrift::DerivedData> {
+        Ok(thrift::DerivedData::inferred_copy_from(
+            thrift::DerivedDataInferredCopyFrom::root_inferred_copy_from_id(data.0.into_thrift()),
+        ))
+    }
+}
diff --git a/eden/mononoke/derived_data/remote/if/derived_data_service.thrift b/eden/mononoke/derived_data/remote/if/derived_data_service.thrift
@@ -89,6 +89,7 @@ union DerivedData {
   20: DerivedDataSkeletonManifestV2 skeleton_manifest_v2;
   21: DerivedDataCcsm ccsm;
   22: DerivedDataContentManifest content_manifest;
+  23: DerivedDataInferredCopyFrom inferred_copy_from;
 }
 
 union DerivedDataFsnode {
@@ -179,6 +180,10 @@ union DerivedDataContentManifest {
   1: id.ContentManifestId root_content_manifest_id;
 }
 
+union DerivedDataInferredCopyFrom {
+  1: id.InferredCopyFromId root_inferred_copy_from_id;
+}
+
 @rust.Exhaustive
 struct DerivedDataTypeNotEnabled {
   1: string reason;
diff --git a/eden/mononoke/facebook/derived_data_service/BUCK b/eden/mononoke/facebook/derived_data_service/BUCK
@@ -46,6 +46,7 @@ rust_binary(
         "//eden/mononoke/derived_data:derived_data_manager",
         "//eden/mononoke/derived_data:fastlog",
         "//eden/mononoke/derived_data:fsnodes",
+        "//eden/mononoke/derived_data:inferred_copy_from",
         "//eden/mononoke/derived_data:skeleton_manifest",
         "//eden/mononoke/derived_data:skeleton_manifest_v2",
         "//eden/mononoke/derived_data:unodes",
diff --git a/eden/mononoke/mononoke_types/src/derivable_type.rs b/eden/mononoke/mononoke_types/src/derivable_type.rs
@@ -38,6 +38,7 @@ pub enum DerivableType {
     HgAugmentedManifests,
     GitCommits,
     GitDeltaManifestsV2,
+    InferredCopyFrom,
     SkeletonManifests,
     SkeletonManifestsV2,
     TestManifests,
@@ -63,6 +64,7 @@ impl DerivableType {
             "hg_augmented_manifests" => DerivableType::HgAugmentedManifests,
             "git_commits" => DerivableType::GitCommits,
             "git_delta_manifests_v2" => DerivableType::GitDeltaManifestsV2,
+            "inferred_copy_from" => DerivableType::InferredCopyFrom,
             "skeleton_manifests" => DerivableType::SkeletonManifests,
             "skeleton_manifests_v2" => DerivableType::SkeletonManifestsV2,
             "test_manifests" => DerivableType::TestManifests,
@@ -88,6 +90,7 @@ impl DerivableType {
             DerivableType::HgAugmentedManifests => "hg_augmented_manifests",
             DerivableType::GitCommits => "git_commits",
             DerivableType::GitDeltaManifestsV2 => "git_delta_manifests_v2",
+            DerivableType::InferredCopyFrom => "inferred_copy_from",
             DerivableType::SkeletonManifests => "skeleton_manifests",
             DerivableType::SkeletonManifestsV2 => "skeleton_manifests_v2",
             DerivableType::TestManifests => "test_manifests",
@@ -110,6 +113,7 @@ impl DerivableType {
             thrift::DerivedDataType::HG_AUGMENTED_MANIFEST => Self::HgAugmentedManifests,
             thrift::DerivedDataType::COMMIT_HANDLE => Self::GitCommits,
             thrift::DerivedDataType::GIT_DELTA_MANIFEST_V2 => Self::GitDeltaManifestsV2,
+            thrift::DerivedDataType::INFERRED_COPY_FROM => Self::InferredCopyFrom,
             thrift::DerivedDataType::SKELETON_MANIFEST => Self::SkeletonManifests,
             thrift::DerivedDataType::SKELETON_MANIFEST_V2 => Self::SkeletonManifestsV2,
             thrift::DerivedDataType::TEST_MANIFEST => Self::TestManifests,
@@ -133,6 +137,7 @@ impl DerivableType {
             Self::HgAugmentedManifests => thrift::DerivedDataType::HG_AUGMENTED_MANIFEST,
             Self::GitCommits => thrift::DerivedDataType::COMMIT_HANDLE,
             Self::GitDeltaManifestsV2 => thrift::DerivedDataType::GIT_DELTA_MANIFEST_V2,
+            Self::InferredCopyFrom => thrift::DerivedDataType::INFERRED_COPY_FROM,
             Self::SkeletonManifests => thrift::DerivedDataType::SKELETON_MANIFEST,
             Self::SkeletonManifestsV2 => thrift::DerivedDataType::SKELETON_MANIFEST_V2,
             Self::TestManifests => thrift::DerivedDataType::TEST_MANIFEST,
diff --git a/eden/mononoke/repo_factory/test_repo_factory/src/lib.rs b/eden/mononoke/repo_factory/test_repo_factory/src/lib.rs
@@ -176,7 +176,10 @@ pub struct TestRepoFactory {
 /// This configuration enables all derived data types at the latest version.
 pub fn default_test_repo_derived_data_types_config() -> DerivedDataTypesConfig {
     DerivedDataTypesConfig {
-        types: DerivableType::iter().collect(),
+        types: DerivableType::iter()
+            // TODO(lyang) Remove once the new type impl is ready
+            .filter(|t| *t != DerivableType::InferredCopyFrom)
+            .collect(),
         unode_version: UnodeVersion::V2,
         blame_version: BlameVersion::V2,
         git_delta_manifest_v2_config: Some(GitDeltaManifestV2Config {
diff --git a/eden/mononoke/walker/src/detail/graph.rs b/eden/mononoke/walker/src/detail/graph.rs
@@ -1203,6 +1203,7 @@ mod tests {
             DerivableType::HgAugmentedManifests,
             DerivableType::SkeletonManifestsV2,
             DerivableType::ContentManifests,
+            DerivableType::InferredCopyFrom,
         ]);
         let mut missing = HashSet::new();
         for t in a {

Original file line number	Diff line number	Diff line change
`@@ -551,6 +551,8 @@ pub(crate) fn submodule_repo_derived_data_types_config() -> HashMap<String, Deri`
`551`	`551`	`DerivableType::HgChangesets,`
`552`	`552`	`DerivableType::HgAugmentedManifests,`
`553`	`553`	`DerivableType::FileNodes,`
	`554`	`+ // TODO(lyang) Remove once the new type impl is ready`
	`555`	`+ DerivableType::InferredCopyFrom,`
`554`	`556`	`]`
`555`	`557`	`.contains(t)`
`556`	`558`	`})`
Original file line number	Diff line number	Diff line change
`@@ -36,4 +36,5 @@ enum DerivedDataType {`
`36`	`36`	`SKELETON_MANIFEST_V2 = 20,`
`37`	`37`	`CCSM = 21,`
`38`	`38`	`CONTENT_MANIFEST = 22,`
	`39`	`+ INFERRED_COPY_FROM = 23,`
`39`	`40`	`}`