Draft: Threadpool reorganization

.github/workflows/tests.yml

@@ -134,3 +134,10 @@ jobs:
           nim --version
           echo
           nimble --verbose test
+
+      - name: Build and run tests
+        run: |
+          source "${HOME}/.bash_env"
+          nim --version
+          echo
+          nimble --verbose -d:datastoreUseAsync=false test

.gitignore

@@ -9,3 +9,6 @@ coverage
 datastore.nims
 nimcache
 TODO
+nim.cfg
+nimble.develop
+nimble.paths

config.nims

@@ -3,10 +3,16 @@
 --styleCheck:usages
 --styleCheck:error
 
+# --d:"datastoreUseAsync=false"
+
 when (NimMajor, NimMinor) == (1, 2):
   switch("hint", "Processing:off")
   switch("hint", "XDeclaredButNotUsed:off")
   switch("warning", "ObservableStores:off")
 
 when (NimMajor, NimMinor) > (1, 2):
   switch("hint", "XCannotRaiseY:off")
+# begin Nimble config (version 2)
+when withDir(thisDir(), system.fileExists("nimble.paths")):
+  include "nimble.paths"
+# end Nimble config

datastore.nim

@@ -4,4 +4,4 @@ import ./datastore/sql
 import ./datastore/mountedds
 import ./datastore/tieredds
 
-export datastore, fsds, mountedds, tieredds, sql
+export datastore, fsds, sql, mountedds, tieredds

datastore.nimble

@@ -6,14 +6,18 @@ author        = "Status Research & Development GmbH"
 description   = "Simple, unified API for multiple data stores"
 license       = "Apache License 2.0 or MIT"
 
-requires "nim >= 1.2.0",
+requires "nim >= 1.6.14",
          "asynctest >= 0.3.1 & < 0.4.0",
-         "chronos",
-         "questionable >= 0.10.3 & < 0.11.0",
+         "chronos#0277b65be2c7a365ac13df002fba6e172be55537",
+         "questionable#head",
          "sqlite3_abi",
          "stew",
          "unittest2",
-         "upraises >= 0.1.0 & < 0.2.0"
+         "pretty",
+         "threading#7c033b9135b4baae84e6c89af7548848bba7dc02", # or more recent
+         "taskpools",
+         "upraises >= 0.1.0 & < 0.2.0",
+         "chronicles"
 
 task coverage, "generates code coverage report":
   var (output, exitCode) = gorgeEx("which lcov")

datastore/datastore.nim

@@ -8,37 +8,44 @@ import ./types
 
 export key, query, types
 
+const datastoreUseAsync* {.booldefine.} = true
+
 push: {.upraises: [].}
 
 type
   BatchEntry* = tuple[key: Key, data: seq[byte]]
 
-method has*(self: Datastore, key: Key): Future[?!bool] {.base, locks: "unknown".} =
+method has*(self: Datastore, key: Key): Future[?!bool] {.base, locks: "unknown", raises: [].} =
   raiseAssert("Not implemented!")
 
-method delete*(self: Datastore, key: Key): Future[?!void] {.base, locks: "unknown".} =
+method delete*(self: Datastore, key: Key): Future[?!void] {.base, locks: "unknown", raises: [].} =
   raiseAssert("Not implemented!")
 
-method delete*(self: Datastore, keys: seq[Key]): Future[?!void] {.base, locks: "unknown".} =
+method delete*(self: Datastore, keys: seq[Key]): Future[?!void] {.base, locks: "unknown", raises: [].} =
   raiseAssert("Not implemented!")
 
-method get*(self: Datastore, key: Key): Future[?!seq[byte]] {.base, locks: "unknown".} =
+method get*(self: Datastore, key: Key): Future[?!seq[byte]] {.base, locks: "unknown", raises: [].} =
   raiseAssert("Not implemented!")
 
-method put*(self: Datastore, key: Key, data: seq[byte]): Future[?!void] {.base, locks: "unknown".} =
+method put*(self: Datastore, key: Key, data: seq[byte]): Future[?!void] {.base, locks: "unknown", raises: [].} =
   raiseAssert("Not implemented!")
 
-method put*(self: Datastore, batch: seq[BatchEntry]): Future[?!void] {.base, locks: "unknown".} =
+method put*(self: Datastore, batch: seq[BatchEntry]): Future[?!void] {.base, locks: "unknown", raises: [].} =
   raiseAssert("Not implemented!")
 
-method close*(self: Datastore): Future[?!void] {.base, async, locks: "unknown".} =
+method close*(self: Datastore): Future[?!void] {.base, locks: "unknown", raises: [].} =
   raiseAssert("Not implemented!")
 
-method query*(
-  self: Datastore,
-  query: Query): Future[?!QueryIter] {.base, gcsafe.} =
+method query*(self: Datastore,
+              query: Query
+              ): Future[?!QueryIter] {.base, gcsafe, raises: [].} =
+
+  raiseAssert("Not implemented!")
 
+method queryIter*(self: Datastore,
+              query: Query
+              ): ?!(iterator(): ?!QueryResponse) {.base, gcsafe, raises: [].} =
   raiseAssert("Not implemented!")
 
-proc contains*(self: Datastore, key: Key): Future[bool] {.async.} =
+proc contains*(self: Datastore, key: Key): Future[bool] {.async, raises: [].} =
   return (await self.has(key)) |? false