From f82ea14464f51a89ab629c7d36d65e37df742fff Mon Sep 17 00:00:00 2001
From: Jaremy Creechley <creechley@gmail.com>
Date: Thu, 28 Sep 2023 17:43:29 -0700
Subject: [PATCH] reorg

---
 datastore/fsds.nim              |  6 -----
 datastore/sql.nim               | 42 ++++++++++++---------------------
 datastore/threads/fsbackend.nim |  2 +-
 3 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/datastore/fsds.nim b/datastore/fsds.nim
index a3e1638..8f9c781 100644
--- a/datastore/fsds.nim
+++ b/datastore/fsds.nim
@@ -21,12 +21,6 @@ type
   FSDatastore* = ref object of Datastore
     db: ThreadDatastore[FSBackend[KeyId, DataBuffer]]
 
-proc path*(self: FSDatastore): string =
-  self.db.backend.path()
-
-proc readOnly*(self: FSDatastore): bool =
-  self.db.backend.readOnly()
-
 method has*(self: FSDatastore,
             key: Key): Future[?!bool] {.async.} =
   await self.db.has(key)
diff --git a/datastore/sql.nim b/datastore/sql.nim
index 4611d8e..3650323 100644
--- a/datastore/sql.nim
+++ b/datastore/sql.nim
@@ -1,18 +1,12 @@
-import std/times
-import std/options
 
-import pkg/chronos
+import std/os
+import std/options
+import std/strutils
+
 import pkg/questionable
 import pkg/questionable/results
-import pkg/sqlite3_abi
-from pkg/stew/results as stewResults import isErr
+from pkg/stew/results as stewResults import get, isErr
 import pkg/upraises
-
-import std/sequtils
-import ../datastore
-import ./threads/backend
-import ./threads/sqlbackend
-
 import pkg/chronos
 import pkg/taskpools
 
@@ -36,41 +30,35 @@ proc readOnly*(self: SQLiteDatastore): bool =
 
 method has*(self: SQLiteDatastore,
             key: Key): Future[?!bool] {.async.} =
-  return self.db.has(KeyId.new key.id())
+  await self.db.has(key)
 
 method delete*(self: SQLiteDatastore,
                key: Key): Future[?!void] {.async.} =
-  return self.db.delete(KeyId.new key.id())
+  await self.db.delete(key)
 
 method delete*(self: SQLiteDatastore,
                keys: seq[Key]): Future[?!void] {.async.} =
-  let dkeys = keys.mapIt(KeyId.new it.id())
-  return self.db.delete(dkeys)
+  await self.db.delete(keys)
 
 method get*(self: SQLiteDatastore,
             key: Key): Future[?!seq[byte]] {.async.} =
-  self.db.get(KeyId.new key.id()).map() do(d: DataBuffer) -> seq[byte]:
-    d.toSeq()
+  await self.db.get(key)
 
 method put*(self: SQLiteDatastore,
             key: Key,
             data: seq[byte]): Future[?!void] {.async.} =
-  self.db.put(KeyId.new key.id(), DataBuffer.new data)
+  await self.db.put(key, data)
 
 method put*(self: SQLiteDatastore,
             batch: seq[BatchEntry]): Future[?!void] {.async.} =
-  var dbatch: seq[tuple[key: KeyId, data: DataBuffer]]
-  for entry in batch:
-    dbatch.add((KeyId.new entry.key.id(), DataBuffer.new entry.data))
-  self.db.put(dbatch)
+  await self.db.put(batch)
 
 method close*(self: SQLiteDatastore): Future[?!void] {.async.} =
-  self.db.close()
-
-method queryIter*(self: SQLiteDatastore,
-                  query: Query
-                 ): ?!(iterator(): ?!QueryResponse) =
+  await self.db.close()
 
+method query*(self: SQLiteDatastore,
+              q: Query): Future[?!QueryIter] {.async.} =
+  await self.db.query(q)
 
 proc new*(
   T: type SQLiteDatastore,
diff --git a/datastore/threads/fsbackend.nim b/datastore/threads/fsbackend.nim
index 6cff178..1ad607b 100644
--- a/datastore/threads/fsbackend.nim
+++ b/datastore/threads/fsbackend.nim
@@ -10,7 +10,7 @@ import pkg/upraises
 import ./backend
 import ./datastore
 
-export datastore
+export datastore, backend
 
 push: {.upraises: [].}