[CX-6721] remove ByComponentDefinition namespaces (#26847)

it's confusing and not *that* benefical to have ByComponentDefinition namespaces. It was only applying to `_modules` and `_module_versions` and `_source_packages`, but we can explode those namespaces to be ByComponent.

GitOrigin-RevId: 569673635270f13cdecf37918114806a308e331d

Author: ldanilek

crates/application/src/lib.rs

@@ -42,9 +42,9 @@ use common::{
     components::{
         CanonicalizedComponentFunctionPath,
         CanonicalizedComponentModulePath,
-        ComponentDefinitionId,
         ComponentDefinitionPath,
         ComponentFunctionPath,
+        ComponentId,
         ComponentPath,
     },
     document::{
@@ -802,7 +802,7 @@ impl<RT: Runtime> Application<RT> {
     ) -> anyhow::Result<Option<String>> {
         let mut tx = self.begin(identity).await?;
         let path = CanonicalizedComponentModulePath {
-            component: ComponentDefinitionId::Root,
+            component: ComponentId::Root,
             module_path: path.canonicalize(),
         };
         let Some(metadata) = ModuleModel::new(&mut tx).get_metadata(path.clone()).await? else {
@@ -1639,7 +1639,7 @@ impl<RT: Runtime> Application<RT> {
         tx: &mut Transaction<RT>,
     ) -> anyhow::Result<()> {
         let path = CanonicalizedComponentModulePath {
-            component: ComponentDefinitionId::Root,
+            component: ComponentId::Root,
             module_path: AUTH_CONFIG_FILE_NAME.parse()?,
         };
         let auth_config_metadata = ModuleModel::new(tx).get_metadata(path).await?;
@@ -1967,7 +1967,7 @@ impl<RT: Runtime> Application<RT> {
         ModuleModel::new(&mut tx)
             .put_standalone(
                 CanonicalizedComponentModulePath {
-                    component: ComponentDefinitionId::Root,
+                    component: ComponentId::Root,
                     module_path: module_path.clone(),
                 },
                 module.source,

crates/application/src/tests/source_package.rs

@@ -2,7 +2,7 @@ use std::collections::BTreeMap;
 
 use anyhow::Context;
 use common::{
-    components::ComponentDefinitionId,
+    components::ComponentId,
     runtime::Runtime,
     types::ModuleEnvironment,
 };
@@ -73,7 +73,7 @@ pub async fn assemble_package<RT: Runtime>(
     modifications: BTreeMap<CanonicalizedModulePath, Option<ModuleConfig>>,
 ) -> anyhow::Result<Vec<ModuleConfig>> {
     let existing_modules = ModuleModel::new(tx)
-        .get_application_modules(ComponentDefinitionId::Root, module_loader)
+        .get_application_modules(ComponentId::Root, module_loader)
         .await?;
     let mut modules = BTreeMap::new();
     for (path, module) in existing_modules {

crates/common/src/bootstrap_model/tables.rs

@@ -145,10 +145,6 @@ enum SerializedTableNamespace {
         #[serde(skip_serializing_if = "Option::is_none")]
         id: Option<String>,
     },
-    ByComponentDefinition {
-        #[serde(skip_serializing_if = "Option::is_none")]
-        id: Option<String>,
-    },
 }
 
 fn table_namespace_from_serialized(
@@ -160,12 +156,6 @@ fn table_namespace_from_serialized(
             TableNamespace::ByComponent(id.parse()?)
         },
         Some(SerializedTableNamespace::ByComponent { id: None }) => TableNamespace::RootComponent,
-        Some(SerializedTableNamespace::ByComponentDefinition { id: Some(id) }) => {
-            TableNamespace::ByComponentDefinition(id.parse()?)
-        },
-        Some(SerializedTableNamespace::ByComponentDefinition { id: None }) => {
-            TableNamespace::RootComponentDefinition
-        },
     })
 }
 
@@ -184,16 +174,6 @@ fn table_namespace_to_serialized(
         TableNamespace::RootComponent => {
             Ok(Some(SerializedTableNamespace::ByComponent { id: None }))
         },
-        TableNamespace::ByComponentDefinition(id) => {
-            Ok(Some(SerializedTableNamespace::ByComponentDefinition {
-                id: Some(id.to_string()),
-            }))
-        },
-        TableNamespace::RootComponentDefinition => {
-            Ok(Some(SerializedTableNamespace::ByComponentDefinition {
-                id: None,
-            }))
-        },
     }
 }
 

crates/common/src/components/mod.rs

@@ -110,19 +110,3 @@ impl ComponentDefinitionId {
         matches!(self, ComponentDefinitionId::Root)
     }
 }
-
-impl From<ComponentDefinitionId> for TableNamespace {
-    fn from(value: ComponentDefinitionId) -> Self {
-        if *COMPONENTS_ENABLED {
-            match value {
-                ComponentDefinitionId::Root => TableNamespace::RootComponentDefinition,
-                ComponentDefinitionId::Child(id) => TableNamespace::ByComponentDefinition(id),
-            }
-        } else {
-            match value {
-                ComponentDefinitionId::Root => TableNamespace::Global,
-                ComponentDefinitionId::Child(_id) => TableNamespace::Global,
-            }
-        }
-    }
-}

crates/common/src/components/module_paths.rs

@@ -1,11 +1,11 @@
 use sync_types::CanonicalizedModulePath;
 
-use super::ComponentDefinitionId;
+use super::ComponentId;
 
 #[derive(Debug, Clone, Eq, PartialEq, Ord, PartialOrd, Hash)]
 #[cfg_attr(any(test, feature = "testing"), derive(proptest_derive::Arbitrary))]
 pub struct CanonicalizedComponentModulePath {
-    pub component: ComponentDefinitionId,
+    pub component: ComponentId,
     pub module_path: CanonicalizedModulePath,
 }
 

crates/database/src/bootstrap_model/components/mod.rs

@@ -309,9 +309,9 @@ impl<'a, RT: Runtime> BootstrapComponentsModel<'a, RT> {
         &mut self,
         path: CanonicalizedComponentFunctionPath,
     ) -> anyhow::Result<CanonicalizedComponentModulePath> {
-        let (definition_id, _) = self.component_path_to_ids(path.component).await?;
+        let (_, component) = self.component_path_to_ids(path.component).await?;
         Ok(CanonicalizedComponentModulePath {
-            component: definition_id,
+            component,
             module_path: path.udf_path.module().clone(),
         })
     }

crates/isolate/src/environment/action/phase.rs

@@ -148,14 +148,14 @@ impl<RT: Runtime> ActionPhase<RT> {
             let result = if !*COMPONENTS_ENABLED {
                 anyhow::ensure!(self.component.is_root());
                 ModuleModel::new(&mut tx)
-                    .get_all_metadata(ComponentDefinitionId::Root)
+                    .get_all_metadata(ComponentId::Root)
                     .await?
             } else {
                 let metadata = BootstrapComponentsModel::new(&mut tx)
                     .resolve_path(self.component.clone())
                     .await?
                     .context("Failed to find component")?;
-                let (component_id, definition_id) = if self.component.is_root() {
+                let (component_id, _) = if self.component.is_root() {
                     (ComponentId::Root, ComponentDefinitionId::Root)
                 } else {
                     (
@@ -164,7 +164,7 @@ impl<RT: Runtime> ActionPhase<RT> {
                     )
                 };
                 let module_metadata = ModuleModel::new(&mut tx)
-                    .get_all_metadata(definition_id)
+                    .get_all_metadata(component_id)
                     .await?;
 
                 let loaded_resources = ComponentsModel::new(&mut tx)

crates/isolate/src/environment/helpers/module_loader.rs

@@ -8,7 +8,7 @@ use anyhow::{
     Context,
 };
 use common::{
-    components::ComponentDefinitionId,
+    components::ComponentId,
     document::ParsedDocument,
     knobs::READ_MODULES_FROM_SOURCE_PACKAGE,
     runtime::Runtime,
@@ -109,10 +109,9 @@ async fn download_module_source_from_package<RT: Runtime>(
     let component = match namespace {
         // TODO(lee) global namespace should not have modules, but for existing data this is how
         // it's represented.
-        TableNamespace::Global => ComponentDefinitionId::Root,
-        TableNamespace::RootComponentDefinition => ComponentDefinitionId::Root,
-        TableNamespace::ByComponentDefinition(id) => ComponentDefinitionId::Child(id),
-        _ => anyhow::bail!("_modules table namespace {namespace:?} is not a component definition"),
+        TableNamespace::Global => ComponentId::Root,
+        TableNamespace::RootComponent => ComponentId::Root,
+        TableNamespace::ByComponent(id) => ComponentId::Child(id),
     };
     for module_metadata in ModuleModel::new(tx).get_all_metadata(component).await? {
         match package.remove(&module_metadata.path) {

crates/isolate/src/environment/udf/phase.rs

@@ -13,7 +13,6 @@ use anyhow::Context;
 use common::{
     components::{
         CanonicalizedComponentModulePath,
-        ComponentDefinitionId,
         ComponentId,
         ComponentPath,
     },
@@ -92,7 +91,6 @@ enum UdfPreloaded {
         observed_time_during_execution: AtomicBool,
         env_vars: PreloadedEnvironmentVariables,
         component: ComponentId,
-        component_definition: ComponentDefinitionId,
     },
 }
 
@@ -145,7 +143,7 @@ impl<RT: Runtime> UdfPhase<RT> {
         .await?;
 
         let component_path = self.component_path.clone();
-        let (component_definition, component) = with_release_permit(
+        let (_, component) = with_release_permit(
             timeout,
             permit_slot,
             BootstrapComponentsModel::new(self.tx_mut()?).component_path_to_ids(component_path),
@@ -159,7 +157,6 @@ impl<RT: Runtime> UdfPhase<RT> {
             observed_time_during_execution: AtomicBool::new(false),
             env_vars,
             component,
-            component_definition,
         };
         Ok(())
     }
@@ -183,15 +180,11 @@ impl<RT: Runtime> UdfPhase<RT> {
                 format!("Can't dynamically import {module_path:?} in a query or mutation")
             ));
         }
-        let UdfPreloaded::Ready {
-            component_definition,
-            ..
-        } = &self.preloaded
-        else {
+        let UdfPreloaded::Ready { component, .. } = &self.preloaded else {
             anyhow::bail!("Phase not initialized");
         };
         let path = CanonicalizedComponentModulePath {
-            component: *component_definition,
+            component: *component,
             module_path: module_path.clone().canonicalize(),
         };
         let module = with_release_permit(

crates/isolate/src/isolate2/runner.rs

@@ -9,7 +9,6 @@ use anyhow::Context as AnyhowContext;
 use common::{
     components::{
         CanonicalizedComponentModulePath,
-        ComponentDefinitionId,
         ComponentFunctionPath,
         ComponentId,
         Reference,
@@ -505,7 +504,7 @@ async fn run_request<RT: Runtime>(
         while let Some(module_path) = stack.pop() {
             let module_specifier = module_specifier_from_path(&module_path)?;
             let path = CanonicalizedComponentModulePath {
-                component: ComponentDefinitionId::Root,
+                component: ComponentId::Root,
                 module_path: module_path.clone(),
             };
             let Some(module_metadata) = module_loader.get_module(tx, path).await? else {