Fix syntax errors in verify worklist generation queries
authorJakob Cornell <jakob+gpg@jcornell.net>
Mon, 18 Apr 2022 01:49:14 +0000 (20:49 -0500)
committerJakob Cornell <jakob+gpg@jcornell.net>
Mon, 18 Apr 2022 01:54:55 +0000 (20:54 -0500)
disk_jumble/src/disk_jumble/verify.py

index 45a43d5ea502b3b926c8bfe965763a181ae5e196..5f37c16992b9c0446af22e48ec5fe5ca06575714 100644 (file)
@@ -135,7 +135,7 @@ def _get_v1_worklist(conn, disk_id: int, block_ranges: List[NumericRange]) -> Li
                                                                ((piece_num + 1) * %(piece_length)s - entity_offset) / %(block_size)s + lower(disk_blocks)
                                                        ) as use_blocks,
                                                        crypt_key
-                                               from relevant_slab join targeted_piece
+                                               from relevant_slab cross join targeted_piece
                                        )
                                select piece_num, use_blocks, crypt_key from out
                                where not isempty(use_blocks)
@@ -197,8 +197,8 @@ def _get_v2_worklist(conn, disk_id: int, block_ranges: List[NumericRange]) -> Li
                                                entity_id,
                                                entity.length,
                                                entity_blocks,
-                                               slab_plus.disk_blocks
-                                               entity_blocks * elh.block_range as check_erange,
+                                               slab_plus.disk_blocks,
+                                               entity_blocks * elh.block_range as check_erange
                                        from
                                                entityv2_leaf_hashes elh
                                                join slab_plus using (entity_id)