Remove a couple now-disused storage-collections methods

Author: bkirwi

src/compute-client/src/as_of_selection.rs

@@ -867,12 +867,10 @@ mod tests {
     use mz_storage_client::controller::{CollectionDescription, StorageMetadata, StorageTxn};
     use mz_storage_client::storage_collections::{CollectionFrontiers, SnapshotCursor};
     use mz_storage_types::StorageDiff;
-    use mz_storage_types::connections::inline::InlinedConnection;
     use mz_storage_types::controller::{CollectionMetadata, StorageError};
     use mz_storage_types::errors::CollectionMissing;
     use mz_storage_types::parameters::StorageParameters;
-    use mz_storage_types::sources::{GenericSourceConnection, SourceDesc};
-    use mz_storage_types::sources::{SourceData, SourceExportDataConfig};
+    use mz_storage_types::sources::SourceData;
     use mz_storage_types::time_dependence::{TimeDependence, TimeDependenceError};
     use timely::progress::Timestamp as TimelyTimestamp;
 
@@ -1041,28 +1039,6 @@ mod tests {
             unimplemented!()
         }
 
-        async fn alter_ingestion_source_desc(
-            &self,
-            _ingestion_id: GlobalId,
-            _source_desc: SourceDesc,
-        ) -> Result<(), StorageError<Self::Timestamp>> {
-            unimplemented!()
-        }
-
-        async fn alter_ingestion_export_data_configs(
-            &self,
-            _source_exports: BTreeMap<GlobalId, SourceExportDataConfig>,
-        ) -> Result<(), StorageError<Self::Timestamp>> {
-            unimplemented!()
-        }
-
-        async fn alter_ingestion_connections(
-            &self,
-            _source_connections: BTreeMap<GlobalId, GenericSourceConnection<InlinedConnection>>,
-        ) -> Result<(), StorageError<Self::Timestamp>> {
-            unimplemented!()
-        }
-
         async fn alter_table_desc(
             &self,
             _existing_collection: GlobalId,

src/storage-client/src/storage_collections.rs

@@ -42,17 +42,13 @@ use mz_repr::{GlobalId, RelationDesc, RelationVersion, Row, TimestampManipulatio
 use mz_storage_types::StorageDiff;
 use mz_storage_types::configuration::StorageConfiguration;
 use mz_storage_types::connections::ConnectionContext;
-use mz_storage_types::connections::inline::InlinedConnection;
 use mz_storage_types::controller::{CollectionMetadata, StorageError, TxnsCodecRow};
 use mz_storage_types::dyncfgs::STORAGE_DOWNGRADE_SINCE_DURING_FINALIZATION;
 use mz_storage_types::errors::CollectionMissing;
 use mz_storage_types::parameters::StorageParameters;
 use mz_storage_types::read_holds::ReadHold;
 use mz_storage_types::read_policy::ReadPolicy;
-use mz_storage_types::sources::{
-    GenericSourceConnection, SourceData, SourceDesc, SourceEnvelope, SourceExportDataConfig,
-    Timeline,
-};
+use mz_storage_types::sources::{GenericSourceConnection, SourceData, SourceEnvelope, Timeline};
 use mz_storage_types::time_dependence::{TimeDependence, TimeDependenceError};
 use mz_txn_wal::metrics::Metrics as TxnMetrics;
 use mz_txn_wal::txn_read::{DataSnapshot, TxnsRead};
@@ -266,34 +262,6 @@ pub trait StorageCollections: Debug + Sync {
         migrated_storage_collections: &BTreeSet<GlobalId>,
     ) -> Result<(), StorageError<Self::Timestamp>>;
 
-    /// Alters the identified ingestion to use the provided [`SourceDesc`].
-    ///
-    /// NOTE: Ideally, [StorageCollections] would not care about these, but we
-    /// have to learn about changes such that when new subsources are created we
-    /// can correctly determine a since based on its dependencies' sinces. This
-    /// is really only relevant because newly created subsources depend on the
-    /// remap shard, and we can't just have them start at since 0.
-    async fn alter_ingestion_source_desc(
-        &self,
-        ingestion_id: GlobalId,
-        source_desc: SourceDesc,
-    ) -> Result<(), StorageError<Self::Timestamp>>;
-
-    /// Alters the data config for the specified source exports of the specified ingestions.
-    async fn alter_ingestion_export_data_configs(
-        &self,
-        source_exports: BTreeMap<GlobalId, SourceExportDataConfig>,
-    ) -> Result<(), StorageError<Self::Timestamp>>;
-
-    /// Alters each identified collection to use the correlated
-    /// [`GenericSourceConnection`].
-    ///
-    /// See NOTE on [StorageCollections::alter_ingestion_source_desc].
-    async fn alter_ingestion_connections(
-        &self,
-        source_connections: BTreeMap<GlobalId, GenericSourceConnection<InlinedConnection>>,
-    ) -> Result<(), StorageError<Self::Timestamp>>;
-
     /// Updates the [`RelationDesc`] for the specified table.
     async fn alter_table_desc(
         &self,
@@ -2134,28 +2102,6 @@ where
         Ok(())
     }
 
-    async fn alter_ingestion_source_desc(
-        &self,
-        ingestion_id: GlobalId,
-        source_desc: SourceDesc,
-    ) -> Result<(), StorageError<Self::Timestamp>> {
-        Ok(())
-    }
-
-    async fn alter_ingestion_export_data_configs(
-        &self,
-        source_exports: BTreeMap<GlobalId, SourceExportDataConfig>,
-    ) -> Result<(), StorageError<Self::Timestamp>> {
-        Ok(())
-    }
-
-    async fn alter_ingestion_connections(
-        &self,
-        source_connections: BTreeMap<GlobalId, GenericSourceConnection<InlinedConnection>>,
-    ) -> Result<(), StorageError<Self::Timestamp>> {
-        Ok(())
-    }
-
     async fn alter_table_desc(
         &self,
         existing_collection: GlobalId,

src/storage-controller/src/lib.rs

@@ -1252,11 +1252,6 @@ where
         &mut self,
         source_connections: BTreeMap<GlobalId, GenericSourceConnection<InlinedConnection>>,
     ) -> Result<(), StorageError<Self::Timestamp>> {
-        // Also have to let StorageCollections know!
-        self.storage_collections
-            .alter_ingestion_connections(source_connections.clone())
-            .await?;
-
         let mut ingestions_to_run = BTreeSet::new();
 
         for (id, conn) in source_connections {
@@ -1297,11 +1292,6 @@ where
         &mut self,
         source_exports: BTreeMap<GlobalId, SourceExportDataConfig>,
     ) -> Result<(), StorageError<Self::Timestamp>> {
-        // Also have to let StorageCollections know!
-        self.storage_collections
-            .alter_ingestion_export_data_configs(source_exports.clone())
-            .await?;
-
         let mut ingestions_to_run = BTreeSet::new();
 
         for (source_export_id, new_data_config) in source_exports {