Move trait impls inline

src/adapter/src/catalog.rs

@@ -3624,7 +3624,7 @@ impl Catalog {
             if !storage.is_read_only() {
                 // IMPORTANT: we durably record the new timestamp before using it.
                 storage
-                    .persist_timestamp(&Timeline::EpochMilliseconds, boot_ts)
+                    .set_timestamp(&Timeline::EpochMilliseconds, boot_ts)
                     .await?;
             }
 
@@ -5336,7 +5336,7 @@ impl Catalog {
     ) -> Result<(), Error> {
         self.storage()
             .await
-            .persist_timestamp(timeline, timestamp)
+            .set_timestamp(timeline, timestamp)
             .await
             .err_into()
     }

src/catalog/src/lib.rs

@@ -183,7 +183,7 @@ pub struct BootstrapArgs {
 #[async_trait]
 pub trait ReadOnlyDurableCatalogState: Debug + Send {
     /// Reports if the catalog state has been initialized.
-    async fn is_initialized(&self) -> Result<bool, Error>;
+    async fn is_initialized(&mut self) -> Result<bool, Error>;
 
     // TODO(jkosh44) add and implement open methods to be implementation agnostic.
     /*   /// Checks to see if opening the catalog would be
@@ -289,8 +289,9 @@ pub trait ReadOnlyDurableCatalogState: Debug + Send {
         self.get_next_id(USER_REPLICA_ID_ALLOC_KEY).await
     }
 
-    /// Dumps the entire catalog contents in human readable JSON.
-    async fn dump(&self) -> Result<String, Error>;
+    // TODO(jkosh44) Implement this for the catalog debug tool.
+    /*    /// Dumps the entire catalog contents in human readable JSON.
+    async fn dump(&self) -> Result<String, Error>;*/
 }
 
 /// A read-write API for the durable catalog state.
@@ -351,7 +352,7 @@ pub trait DurableCatalogState: ReadOnlyDurableCatalogState {
     ) -> Result<(), Error>;
 
     /// Persist new global timestamp for a timeline.
-    async fn persist_timestamp(
+    async fn set_timestamp(
         &mut self,
         timeline: &Timeline,
         timestamp: mz_repr::Timestamp,