logos-storage/nim-datastore
1
0
Fork 0
mirror of https://github.com/logos-storage/nim-datastore.git synced 2026-05-05 17:29:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

initial take at making fsds synchronous

Browse Source
This commit is contained in:
Jaremy Creechley 2023-09-26 21:27:46 -07:00
parent 24ac1a8708
commit 653ec99b53
No known key found for this signature in database
GPG Key ID: 4E66FB67B21D3300
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
datastore/fsds.nim
View File

@ -92,7 +92,7 @@ proc delete*(self: FSDatastore, keys: openArray[KeyId]): ?!void =
return success() return success()
proc readFile*(self: FSDatastore, path: string): ?!seq[byte] = proc readFile*[V](self: FSDatastore, path: string): ?!V =
var var
file: File file: File
@ -104,14 +104,19 @@ proc readFile*(self: FSDatastore, path: string): ?!seq[byte] =
try: try:
let let
size = file.getFileSize size = file.getFileSize().int
when V is seq[byte]:
var bytes = newSeq[byte](size)
elif V is DataBuffer:
var bytes = DataBuffer.new(capacity=size)
else:
{.error: "unhandled result type".}
var var
bytes = newSeq[byte](size)
read = 0 read = 0
while read < size: while read < size:
read += file.readBytes(bytes, read, size) read += file.readBytes(bytes.toOpenArray(), read, size)
if read < size: if read < size:
return failure $read & " bytes were read from " & path & return failure $read & " bytes were read from " & path &
@ -122,7 +127,8 @@ proc readFile*(self: FSDatastore, path: string): ?!seq[byte] =
except CatchableError as e: except CatchableError as e:
return failure e return failure e
proc get*(self: FSDatastore, key: Key): ?!seq[byte] = proc get*(self: FSDatastore, key: KeyId): ?!DataBuffer =
let key = key.toKey()
without path =? self.path(key), error: without path =? self.path(key), error:
return failure error return failure error
@ -130,12 +136,12 @@ proc get*(self: FSDatastore, key: Key): ?!seq[byte] =
return failure( return failure(
newException(DatastoreKeyNotFound, "Key doesn't exist")) newException(DatastoreKeyNotFound, "Key doesn't exist"))
return self.readFile(path) return readFile[DataBuffer](self, path)
proc put*( proc put*(
self: FSDatastore, self: FSDatastore,
key: Key, key: KeyId,
data: seq[byte]): ?!void = data: DataBuffer): ?!void =
without path =? self.path(key), error: without path =? self.path(key), error:
return failure error return failure error
@ -174,7 +180,7 @@ proc close*(self: FSDatastore): ?!void =
proc query*( proc query*(
self: FSDatastore, self: FSDatastore,
query: Query): ?!QueryIter = query: DbQuery[KeyId, DataBuffer]): ?!QueryIter =
without path =? self.path(query.key), error: without path =? self.path(query.key), error:
return failure error return failure error
@ -228,7 +234,7 @@ proc query*(
key = Key.init(keyPath).expect("should not fail") key = Key.init(keyPath).expect("should not fail")
data = data =
if query.value: if query.value:
self.readFile((basePath / path).absolutePath) self.readFile[DataBuffer]((basePath / path).absolutePath)
.expect("Should read file") .expect("Should read file")
else: else:
@[] @[]

9
datastore/threads/databuffer.nim
View File

@ -47,7 +47,7 @@ template `==`*[T: char | byte](a: DataBuffer, b: openArray[T]): bool =
elif a[].size != b.len: false elif a[].size != b.len: false
else: a.hash() == b.hash() else: a.hash() == b.hash()
proc new(tp: type DataBuffer, capacity: int = 0): DataBuffer = proc new*(tp: type DataBuffer, capacity: int = 0): DataBuffer =
## allocate new buffer with given capacity ## allocate new buffer with given capacity
## ##
@ -130,9 +130,12 @@ converter toBuffer*(err: ref CatchableError): DataBuffer =
return DataBuffer.new(err.msg) return DataBuffer.new(err.msg)
template toOpenArray*[T: byte | char](data: DataBuffer, t: typedesc[T]): openArray[T] = template toOpenArray*[T: byte | char](data: var DataBuffer, t: typedesc[T]): var openArray[T] =
## get openArray from DataBuffer as char ## get openArray from DataBuffer as char
## ##
## this is explicit since sqlite treats string differently from openArray[byte] ## this is explicit since sqlite treats string differently from openArray[byte]
let bf = cast[ptr UncheckedArray[T]](data[].buf) var bf = cast[ptr UncheckedArray[T]](data[].buf)
bf.toOpenArray(0, data[].size-1) bf.toOpenArray(0, data[].size-1)
template toOpenArray*(data: var DataBuffer): var openArray[byte] =
toOpenArray(data, byte)