status-im
/
nim-codex
mirror of https://github.com/status-im/nim-codex.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix block delete by treeCid and index (#623)

This commit is contained in:
Tomasz Bekas 2023-11-20 14:48:56 +01:00 committed by GitHub
parent 374e6b645b
commit 70efd13c73
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
codex/stores/repostore.nim
View File

@ -100,6 +100,12 @@ proc decode(_: type (Cid, MerkleProof), data: seq[byte]): ?!(Cid, MerkleProof) =
proof = ? MerkleProof.decode(data[sizeof(uint64) + n..^1]) proof = ? MerkleProof.decode(data[sizeof(uint64) + n..^1])
success((cid, proof)) success((cid, proof))
proc decodeCid(_: type (Cid, MerkleProof), data: seq[byte]): ?!Cid =
let
n = uint64.fromBytesBE(data[0..<sizeof(uint64)]).int
cid = ? Cid.init(data[sizeof(uint64)..<sizeof(uint64) + n]).mapFailure
success(cid)
method putBlockCidAndProof*( method putBlockCidAndProof*(
self: RepoStore, self: RepoStore,
treeCid: Cid, treeCid: Cid,
@ -133,6 +139,22 @@ proc getCidAndProof(
return (Cid, MerkleProof).decode(value) return (Cid, MerkleProof).decode(value)
proc getCid(
self: RepoStore,
treeCid: Cid,
index: Natural
): Future[?!Cid] {.async.} =
without key =? createBlockCidAndProofMetadataKey(treeCid, index), err:
return failure(err)
without value =? await self.metaDs.get(key), err:
if err of DatastoreKeyNotFound:
return failure(newException(BlockNotFoundError, err.msg))
else:
return failure(err)
return (Cid, MerkleProof).decodeCid(value)
method getBlock*(self: RepoStore, cid: Cid): Future[?!Block] {.async.} = method getBlock*(self: RepoStore, cid: Cid): Future[?!Block] {.async.} =
## Get a block from the blockstore ## Get a block from the blockstore
## ##
@ -171,10 +193,10 @@ method getBlockAndProof*(self: RepoStore, treeCid: Cid, index: Natural): Future[
success((blk, proof)) success((blk, proof))
method getBlock*(self: RepoStore, treeCid: Cid, index: Natural): Future[?!Block] {.async.} = method getBlock*(self: RepoStore, treeCid: Cid, index: Natural): Future[?!Block] {.async.} =
without cidAndProof =? await self.getCidAndProof(treeCid, index), err: without cid =? await self.getCid(treeCid, index), err:
return failure(err) return failure(err)
await self.getBlock(cidAndProof[0]) await self.getBlock(cid)
method getBlock*(self: RepoStore, address: BlockAddress): Future[?!Block] = method getBlock*(self: RepoStore, address: BlockAddress): Future[?!Block] =
## Get a block from the blockstore ## Get a block from the blockstore
@ -379,10 +401,11 @@ method delBlock*(self: RepoStore, treeCid: Cid, index: Natural): Future[?!void]
else: else:
return failure(err) return failure(err)
without cidAndProof =? (Cid, MerkleProof).decode(value), err: without cid =? (Cid, MerkleProof).decodeCid(value), err:
return failure(err) return failure(err)
self.delBlock(cidAndProof[0]) if err =? (await self.delBlock(cid)).errorOption:
return failure(err)
await self.metaDs.delete(key) await self.metaDs.delete(key)
@ -404,13 +427,13 @@ method hasBlock*(self: RepoStore, cid: Cid): Future[?!bool] {.async.} =
return await self.repoDs.has(key) return await self.repoDs.has(key)
method hasBlock*(self: RepoStore, treeCid: Cid, index: Natural): Future[?!bool] {.async.} = method hasBlock*(self: RepoStore, treeCid: Cid, index: Natural): Future[?!bool] {.async.} =
without cidAndProof =? await self.getCidAndProof(treeCid, index), err: without cid =? await self.getCid(treeCid, index), err:
if err of BlockNotFoundError: if err of BlockNotFoundError:
return success(false) return success(false)
else: else:
return failure(err) return failure(err)
await self.hasBlock(cidAndProof[0]) await self.hasBlock(cid)
method listBlocks*( method listBlocks*(
self: RepoStore, self: RepoStore,