From e52f7949b95b8db55d64bc7ea0317ba3492cea4f Mon Sep 17 00:00:00 2001
From: Jaremy Creechley <creechley@gmail.com>
Date: Tue, 29 Aug 2023 14:58:33 -0700
Subject: [PATCH] add querybuffer type

---
 datastore/databuffer.nim    | 12 ++++++++++++
 datastore/query.nim         | 13 +++++++++++++
 datastore/threadbackend.nim | 29 +++++++++++++++++++++++++++++
 datastore/threadproxyds.nim |  1 +
 4 files changed, 55 insertions(+)

diff --git a/datastore/databuffer.nim b/datastore/databuffer.nim
index fef4c78..69f4579 100644
--- a/datastore/databuffer.nim
+++ b/datastore/databuffer.nim
@@ -21,6 +21,18 @@ type
   CatchableErrorBuffer* = object
     msg: StringBuffer
 
+  QSortOrder* {.pure.} = enum
+    Ascending,
+    Descending
+
+  QueryBuffer* = object
+    key*: KeyBuffer    # Key to be queried
+    value*: bool       # Flag to indicate if data should be returned
+    limit*: int        # Max items to return - not available in all backends
+    offset*: int       # Offset from which to start querying - not available in all backends
+    sort*: QSortOrder  # Sort order - not available in all backends
+
+
 proc `=destroy`*(x: var DataBufferHolder) =
   ## copy pointer implementation
   if x.buf != nil:
diff --git a/datastore/query.nim b/datastore/query.nim
index 1c51a6e..f3330fc 100644
--- a/datastore/query.nim
+++ b/datastore/query.nim
@@ -5,6 +5,7 @@ import pkg/questionable/results
 
 import ./key
 import ./types
+import ./databuffer
 
 type
   SortOrder* {.pure.} = enum
@@ -52,3 +53,15 @@ proc init*(
     sort: sort,
     offset: offset,
     limit: limit)
+
+proc toBuffer*(q: Query): QueryBuffer =
+  ## convert Query to thread-safe QueryBuffer
+  return QueryBuffer(
+    key: KeyBuffer.new(q.key),
+    value: q.value,
+    offset: q.offset,
+    sort:
+      case q.sort:
+      of SortOrder.Assending: QSortOrder.Ascending
+      of SortOrder.Descending: QSortOrder.Descending
+  )
diff --git a/datastore/threadbackend.nim b/datastore/threadbackend.nim
index dd590f9..75b5000 100644
--- a/datastore/threadbackend.nim
+++ b/datastore/threadbackend.nim
@@ -175,3 +175,32 @@ proc delete*(
 ) =
   let bkey = StringBuffer.new(key.id())
   tds[].tp.spawn deleteTask(ret, tds, bkey)
+
+# proc keyIterator(self: ThreadProxyDatastore,
+#                  queryKey: string
+#                  ): iterator: KeyBuffer {.gcsafe.} =
+#   return iterator(): KeyBuffer {.closure.} =
+#     var keys = self.store.keys().toSeq()
+#     keys.sort(proc (x, y: KeyBuffer): int = cmp(x.toString, y.toString))
+#     for key in keys:
+#       if key.toString().startsWith(queryKey):
+#         yield key 
+
+method queryTask*(
+  ret: TResult[void],
+  tds: ThreadDatastorePtr,
+  query: Query,
+): Future[?!QueryIter] {.async.} =
+
+  without key =? kb.toKey(), err:
+    ret.failure(err)
+
+  let q = Query.init(key1)
+
+  for entry in batch:
+    if err =? (await self.put(entry.key, entry.data)).errorOption:
+      return failure err
+
+
+  iter.next = next
+  return success iter
diff --git a/datastore/threadproxyds.nim b/datastore/threadproxyds.nim
index 158548b..c1c7584 100644
--- a/datastore/threadproxyds.nim
+++ b/datastore/threadproxyds.nim
@@ -134,6 +134,7 @@ method close*(
     ## this can block... how to handle? maybe just leak?
     self.tds[].tp.shutdown()
 
+
 proc newThreadProxyDatastore*(
   ds: Datastore,
 ): ?!ThreadProxyDatastore =