Post-migration deployment

Author: ChrisPenner

share-api.cabal

@@ -30,8 +30,6 @@ library
       Share.BackgroundJobs
       Share.BackgroundJobs.Diffs.ContributionDiffs
       Share.BackgroundJobs.Diffs.Queries
-      Share.BackgroundJobs.EntityDepthMigration.Queries
-      Share.BackgroundJobs.EntityDepthMigration.Worker
       Share.BackgroundJobs.Errors
       Share.BackgroundJobs.Monad
       Share.BackgroundJobs.Search.DefinitionSync

src/Share/BackgroundJobs.hs

@@ -1,15 +1,14 @@
 module Share.BackgroundJobs (startWorkers) where
 
 import Ki.Unlifted qualified as Ki
-import Share.BackgroundJobs.EntityDepthMigration.Worker qualified as EntityDepthMigration
 import Share.BackgroundJobs.Monad (Background)
 import Share.BackgroundJobs.Search.DefinitionSync qualified as DefnSearch
 
 -- | Kicks off all background workers.
 startWorkers :: Ki.Scope -> Background ()
 startWorkers scope = do
   DefnSearch.worker scope
-  -- Temporary disable background diff jobs until the new diffing logic is done.
-  -- ContributionDiffs.worker scope
-  -- SerializedEntitiesMigration.worker scope
-  EntityDepthMigration.worker scope
+
+-- Temporary disable background diff jobs until the new diffing logic is done.
+-- ContributionDiffs.worker scope
+-- SerializedEntitiesMigration.worker scope

src/Share/BackgroundJobs/EntityDepthMigration/Queries.hs

@@ -48,7 +48,7 @@ batchSize :: Int32
 batchSize = 1000
 
 streamSettings :: Hash32 -> Maybe SyncV2.BranchRef -> StreamInitInfo
-streamSettings rootCausalHash rootBranchRef = StreamInitInfo {version = SyncV2.Version 1, entitySorting = SyncV2.Unsorted, numEntities = Nothing, rootCausalHash, rootBranchRef}
+streamSettings rootCausalHash rootBranchRef = StreamInitInfo {version = SyncV2.Version 1, entitySorting = SyncV2.DependenciesFirst, numEntities = Nothing, rootCausalHash, rootBranchRef}
 
 server :: Maybe UserId -> SyncV2.Routes WebAppServer
 server mayUserId =

src/Share/BackgroundJobs/EntityDepthMigration/Worker.hs

@@ -201,21 +201,17 @@ allSerializedDependenciesOfCausalCursor cid exceptCausalHashes = do
                JOIN bytes ON sc.bytes_id = bytes.id
                LEFT JOIN causal_depth cd ON tc.causal_id = cd.causal_id
            )
-           -- Re-add this once the migration is done.
            -- Put them in dependency order, nulls come first because we want to bail and
-           -- report an error
-           -- if we somehow are missing a depth.
-           -- ORDER BY depth ASC NULLS FIRST
+           -- report an error if we are somehow missing a depth.
+           ORDER BY depth ASC NULLS FIRST
   |]
-  -- pure
-  --   ( cursor <&> \(bytes, hash, depth) -> case depth of
-  --       -- This should never happen, but is a sanity check in case we're missing a depth.
-  --       -- Better than silently omitting a required result.
-  --       Nothing -> error $ "allSerializedDependenciesOfCausalCursor: Missing depth for entity: " <> show hash
-  --       Just _ -> (bytes, hash)
-  --   )
   pure
-    (cursor <&> \(bytes, hash, _depth) -> (bytes, hash))
+    ( cursor <&> \(bytes, hash, depth) -> case depth of
+        -- This should never happen, but is a sanity check in case we're missing a depth.
+        -- Better than silently omitting a required result.
+        Nothing -> error $ "allSerializedDependenciesOfCausalCursor: Missing depth for entity: " <> show hash
+        Just _ -> (bytes, hash)
+    )
 
 spineAndLibDependenciesOfCausalCursor :: CausalId -> CodebaseM e (PGCursor (Hash32, IsCausalSpine, IsLibRoot))
 spineAndLibDependenciesOfCausalCursor cid = do