Run the migration on this iteration.

Author: ChrisPenner

sql/2025-02-25_causal_depth_migration.sql …rs/2025-02-25_causal_depth_migration.sqlsql/2025-02-25_causal_depth_migration.sql renamed to sql/migration-helpers/2025-02-25_causal_depth_migration.sql sql/2025-02-25_causal_depth_migration.sql renamed to sql/migration-helpers/2025-02-25_causal_depth_migration.sql

@@ -43,3 +43,8 @@ INSERT INTO unfinished_component_depths (id)
       SELECT FROM component_depth cd WHERE cd.component_hash_id = ch.id
     );  
 
+-- Afterwards
+DROP TABLE unfinished_causal_depths;
+DROP TABLE unfinished_namespace_depths;
+DROP TABLE unfinished_patch_depths;
+DROP TABLE unfinished_component_depths;

src/Share/Web/UCM/SyncV2/Impl.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.DependenciesFirst, numEntities = Nothing, rootCausalHash, rootBranchRef}
+streamSettings rootCausalHash rootBranchRef = StreamInitInfo {version = SyncV2.Version 1, entitySorting = SyncV2.Unsorted, numEntities = Nothing, rootCausalHash, rootBranchRef}
 
 server :: Maybe UserId -> SyncV2.Routes WebAppServer
 server mayUserId =

src/Share/Web/UCM/SyncV2/Queries.hs

@@ -50,7 +50,7 @@ allSerializedDependenciesOfCausalCursor cid exceptCausalHashes = do
         JOIN component_hashes ch ON dh.hash = ch.base32
     |]
   cursor <-
-    PGCursor.newRowCursor
+    PGCursor.newRowCursor @(CBORBytes TempEntity, Hash32, Maybe Int32)
       "serialized_entities"
       [sql|
         WITH RECURSIVE transitive_causals(causal_id, causal_hash, causal_namespace_hash_id) AS (
@@ -178,32 +178,44 @@ allSerializedDependenciesOfCausalCursor cid exceptCausalHashes = do
                JOIN serialized_components sc ON sc.user_id = #{ownerUserId} AND tc.component_hash_id = sc.component_hash_id
                JOIN bytes ON sc.bytes_id = bytes.id
                JOIN component_hashes ch ON tc.component_hash_id = ch.id
-               JOIN component_depth cd ON ch.id = cd.component_hash_id
+               LEFT JOIN component_depth cd ON ch.id = cd.component_hash_id
            )
            UNION ALL
            (SELECT bytes.bytes, ap.patch_hash, pd.depth
              FROM all_patches ap
                JOIN serialized_patches sp ON ap.patch_id = sp.patch_id
                JOIN bytes ON sp.bytes_id = bytes.id
-               JOIN patch_depth pd ON ap.patch_id = pd.patch_id
+               LEFT JOIN patch_depth pd ON ap.patch_id = pd.patch_id
            )
            UNION ALL
            (SELECT bytes.bytes, an.namespace_hash, nd.depth
              FROM all_namespaces an
                JOIN serialized_namespaces sn ON an.namespace_hash_id = sn.namespace_hash_id
                JOIN bytes ON sn.bytes_id = bytes.id
-               JOIN namespace_depth nd ON an.namespace_hash_id = nd.namespace_hash_id
+               LEFT JOIN namespace_depth nd ON an.namespace_hash_id = nd.namespace_hash_id
            )
            UNION ALL
            (SELECT bytes.bytes, tc.causal_hash, cd.depth
              FROM transitive_causals tc
                JOIN serialized_causals sc ON tc.causal_id = sc.causal_id
                JOIN bytes ON sc.bytes_id = bytes.id
-               JOIN causal_depth cd ON tc.causal_id = cd.causal_id
+               LEFT JOIN causal_depth cd ON tc.causal_id = cd.causal_id
            )
-           ORDER BY depth ASC
+           -- 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
   |]
-  pure cursor
+  -- 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))
 
 spineAndLibDependenciesOfCausalCursor :: CausalId -> CodebaseM e (PGCursor (Hash32, IsCausalSpine, IsLibRoot))
 spineAndLibDependenciesOfCausalCursor cid = do