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

change to non-closure iterator

Browse Source
This commit is contained in:
Jaremy Creechley 2023-09-25 15:46:03 -07:00
parent 0a86a3466a
commit f8ba1e7684
No known key found for this signature in database
GPG Key ID: 4E66FB67B21D3300
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
datastore/backend.nim
View File

@ -30,6 +30,7 @@ type
sort*: SortOrder # Sort order - not available in all backends sort*: SortOrder # Sort order - not available in all backends
DbQueryHandle*[T] = object DbQueryHandle*[T] = object
query*: DbQuery
cancel*: bool cancel*: bool
env*: T env*: T

9
datastore/sql/sqliteds.nim
View File

@ -116,7 +116,7 @@ proc close*(self: SQLiteBackend): ?!void =
proc query*( proc query*(
self: SQLiteBackend, self: SQLiteBackend,
query: DbQuery query: DbQuery
): Result[DbQueryHandle, ref CatchableError] = ): Result[DbQueryHandle[RawStmtPtr], ref CatchableError] =
var var
queryStr = if query.value: queryStr = if query.value:
@ -161,6 +161,8 @@ proc query*(
if not (v == SQLITE_OK): if not (v == SQLITE_OK):
return failure newException(DatastoreError, $sqlite3_errstr(v)) return failure newException(DatastoreError, $sqlite3_errstr(v))
success DbQueryHandle[RawStmtPtr](query: query, env: s)
proc close*(handle: DbQueryHandle[RawStmtPtr]) = proc close*(handle: DbQueryHandle[RawStmtPtr]) =
echo "sqlite backend: query: finally close" echo "sqlite backend: query: finally close"
discard sqlite3_reset(handle.env) discard sqlite3_reset(handle.env)
@ -168,7 +170,7 @@ proc close*(handle: DbQueryHandle[RawStmtPtr]) =
handle.env.dispose() handle.env.dispose()
return return
iterator iter*(handle: var DbQueryHandle): ?!DbQueryResponse = iterator iter*(handle: var DbQueryHandle[RawStmtPtr]): ?!DbQueryResponse =
let iter = iterator(): ?!DbQueryResponse {.closure.} = let iter = iterator(): ?!DbQueryResponse {.closure.} =
while true: while true:
@ -186,7 +188,7 @@ iterator iter*(handle: var DbQueryHandle): ?!DbQueryResponse =
key = KeyId.new(sqlite3_column_text_not_null(handle.env, QueryStmtIdCol)) key = KeyId.new(sqlite3_column_text_not_null(handle.env, QueryStmtIdCol))
blob: ?pointer = blob: ?pointer =
if query.value: sqlite3_column_blob(handle.env, QueryStmtDataCol).some if handle.query.value: sqlite3_column_blob(handle.env, QueryStmtDataCol).some
else: pointer.none else: pointer.none
# detect out-of-memory error # detect out-of-memory error
@ -222,7 +224,6 @@ iterator iter*(handle: var DbQueryHandle): ?!DbQueryResponse =
handle.close() handle.close()
return failure newException(DatastoreError, $sqlite3_errstr(v)) return failure newException(DatastoreError, $sqlite3_errstr(v))
success (handle, iter)
proc contains*(self: SQLiteBackend, key: DbKey): bool = proc contains*(self: SQLiteBackend, key: DbKey): bool =