logos-storage/nim-datastore
1
0
Fork 0
mirror of https://github.com/logos-storage/nim-datastore.git synced 2026-01-04 06:33:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Review comments by Tomasz

Browse Source
This commit is contained in:
Ben 2024-05-14 11:00:32 +02:00
parent d977a86d75
commit 55086ca4b0
No known key found for this signature in database
GPG Key ID: 541B9D8C9F1426A1
2 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
datastore/leveldb/leveldbds.nim
View File

@ -7,6 +7,7 @@ import pkg/leveldbstatic
import pkg/chronos import pkg/chronos
import pkg/questionable import pkg/questionable
import pkg/questionable/results import pkg/questionable/results
import pkg/stew/byteutils
from pkg/stew/results as stewResults import isErr from pkg/stew/results as stewResults import isErr
import pkg/upraises import pkg/upraises
@ -20,60 +21,51 @@ type
db: LevelDb db: LevelDb
locks: TableRef[Key, AsyncLock] locks: TableRef[Key, AsyncLock]
func toByteSeq(str: string): seq[byte] {.inline.} = method has*(self: LevelDbDatastore, key: Key): Future[?!bool] {.async.} =
@(str.toOpenArrayByte(0, str.high))
func toString(bytes: openArray[byte]): string {.inline.} =
let length = bytes.len
if length > 0:
result = newString(length)
copyMem(result.cstring, bytes[0].unsafeAddr, length)
method has*(self: LevelDbDatastore, key: Key): Future[?!bool] {.async, locks: "unknown".} =
try: try:
let str = self.db.get($key) let str = self.db.get($key)
return success(str.isSome) return success(str.isSome)
except LevelDbException as e: except LevelDbException as e:
return failure("LevelDbDatastore.has exception: " & e.msg) return failure("LevelDbDatastore.has exception: " & e.msg)
method delete*(self: LevelDbDatastore, key: Key): Future[?!void] {.async, locks: "unknown".} = method delete*(self: LevelDbDatastore, key: Key): Future[?!void] {.async.} =
try: try:
self.db.delete($key, sync = true) self.db.delete($key, sync = true)
return success() return success()
except LevelDbException as e: except LevelDbException as e:
return failure("LevelDbDatastore.delete exception: " & e.msg) return failure("LevelDbDatastore.delete exception: " & e.msg)
method delete*(self: LevelDbDatastore, keys: seq[Key]): Future[?!void] {.async, locks: "unknown".} = method delete*(self: LevelDbDatastore, keys: seq[Key]): Future[?!void] {.async.} =
for key in keys: for key in keys:
if err =? (await self.delete(key)).errorOption: if err =? (await self.delete(key)).errorOption:
return failure(err.msg) return failure(err.msg)
return success() return success()
method get*(self: LevelDbDatastore, key: Key): Future[?!seq[byte]] {.async, locks: "unknown".} = method get*(self: LevelDbDatastore, key: Key): Future[?!seq[byte]] {.async.} =
try: try:
let str = self.db.get($key) let str = self.db.get($key)
if not str.isSome: if not str.isSome:
return failure(newException(DatastoreKeyNotFound, "LevelDbDatastore.get: key not found " & $key)) return failure(newException(DatastoreKeyNotFound, "LevelDbDatastore.get: key not found " & $key))
let bytes = toByteSeq(str.get()) let bytes = str.get().toBytes()
return success(bytes) return success(bytes)
except LevelDbException as e: except LevelDbException as e:
return failure("LevelDbDatastore.get exception: " & $e.msg) return failure("LevelDbDatastore.get exception: " & $e.msg)
method put*(self: LevelDbDatastore, key: Key, data: seq[byte]): Future[?!void] {.async, locks: "unknown".} = method put*(self: LevelDbDatastore, key: Key, data: seq[byte]): Future[?!void] {.async.} =
try: try:
let str = toString(data) let str = string.fromBytes(data)
self.db.put($key, str) self.db.put($key, str)
return success() return success()
except LevelDbException as e: except LevelDbException as e:
return failure("LevelDbDatastore.put exception: " & $e.msg) return failure("LevelDbDatastore.put exception: " & $e.msg)
method put*(self: LevelDbDatastore, batch: seq[BatchEntry]): Future[?!void] {.async, locks: "unknown".} = method put*(self: LevelDbDatastore, batch: seq[BatchEntry]): Future[?!void] {.async.} =
for entry in batch: for entry in batch:
if err =? (await self.put(entry.key, entry.data)).errorOption: if err =? (await self.put(entry.key, entry.data)).errorOption:
return failure(err.msg) return failure(err.msg)
return success() return success()
method close*(self: LevelDbDatastore): Future[?!void] {.async, locks: "unknown".} = method close*(self: LevelDbDatastore): Future[?!void] {.async.} =
try: try:
self.db.close() self.db.close()
return success() return success()
@ -108,7 +100,7 @@ method query*(
return success (Key.none, EmptyBytes) return success (Key.none, EmptyBytes)
else: else:
let key = Key.init(keyStr).expect("LevelDbDatastore.query (next) Failed to create key.") let key = Key.init(keyStr).expect("LevelDbDatastore.query (next) Failed to create key.")
return success (key.some, valueStr.toByteSeq()) return success (key.some, valueStr.toBytes())
except LevelDbException as e: except LevelDbException as e:
return failure("LevelDbDatastore.query -> next exception: " & $e.msg) return failure("LevelDbDatastore.query -> next exception: " & $e.msg)
except Exception as e: except Exception as e:

11
tests/datastore/leveldb/testleveldbds.nim
View File

@ -15,6 +15,7 @@ import pkg/datastore/leveldb/leveldbds
import ../dscommontests import ../dscommontests
import ../modifycommontests import ../modifycommontests
import ../querycommontests import ../querycommontests
import ../typeddscommontests
suite "Test Basic LevelDbDatastore": suite "Test Basic LevelDbDatastore":
let let
@ -33,6 +34,7 @@ suite "Test Basic LevelDbDatastore":
basicStoreTests(ds, key, bytes, otherBytes) basicStoreTests(ds, key, bytes, otherBytes)
modifyTests(ds, key) modifyTests(ds, key)
typedDsTests(ds, key)
suite "Test LevelDB Query": suite "Test LevelDB Query":
let tempDir = getTempDir() / "testleveldbds" let tempDir = getTempDir() / "testleveldbds"
@ -50,3 +52,12 @@ suite "Test LevelDB Query":
testLimitsAndOffsets = true, testLimitsAndOffsets = true,
testSortOrder = false testSortOrder = false
) )
suite "Test LevelDB Typed Query":
let
ds = SQLiteDatastore.new(Memory).tryGet()
teardownAll:
(await ds.close()).tryGet
typedDsQueryTests(ds)