add index

datastore/backend.nim

@@ -34,7 +34,16 @@ type
 proc `$`*(id: KeyId): string = $(id.data)
 
 proc new*(tp: typedesc[KeyId], id: cstring): KeyId =
-  KeyId(data: DataBuffer.new(id.pointer, 0, id.len()-1))
+  ## copy cstring including null terminator
+  KeyId(data: DataBuffer.new(id.pointer, 0, id.len()))
+
+proc new*(tp: typedesc[KeyId], id: string): KeyId =
+  ## copy cstring including null terminator
+  KeyId(data: DataBuffer.new(id, {dbNullTerminate}))
+
+proc toCString*(key: KeyId): cstring =
+  ## copy cstring including null terminator
+  cast[cstring](baseAddr key.data)
 
 proc toDb*(key: Key): DbKey {.inline, raises: [].} =
   let id: string = key.id()
@@ -42,7 +51,7 @@ proc toDb*(key: Key): DbKey {.inline, raises: [].} =
   db.setData(id)
   DbKey(data: db)
 
-proc toKey*(key: DbKey): Key {.inline, raises: [].} =
+proc toKey*(key: KeyId): Key {.inline, raises: [].} =
   Key.init(key.data).expect("expected valid key here for but got `" & $key.data & "`")
 
 template toOpenArray*(x: DbKey): openArray[char] =

datastore/sql/sqliteds.nim

@@ -82,7 +82,7 @@ proc put*(self: SQLiteDatastore, key: DbKey, data: DbVal): ?!void =
   when DbVal is seq[byte]:
     return self.db.putStmt.exec((key, data, timestamp()))
   elif DbVal is DataBuffer:
-    return self.db.putBufferStmt.exec((key.id, data, timestamp()))
+    return self.db.putBufferStmt.exec((key, data, timestamp()))
   else:
     {.error: "unknown type".}
 

datastore/sql/sqlitedsdb.nim

@@ -21,7 +21,7 @@ type
   DeleteStmt* = SQLiteStmt[(string), void]
   GetStmt* = SQLiteStmt[(string), void]
   PutStmt* = SQLiteStmt[(string, seq[byte], int64), void]
-  PutBufferStmt* = SQLiteStmt[(string, DataBuffer, int64), void]
+  PutBufferStmt* = SQLiteStmt[(KeyId, DataBuffer, int64), void]
   QueryStmt* = SQLiteStmt[(string), void]
   BeginStmt* = NoParamsStmt
   EndStmt* = NoParamsStmt
@@ -36,6 +36,7 @@ type
     getDataCol*: (RawStmtPtr, int)
     getStmt*: GetStmt
     putStmt*: PutStmt
+    putBufferStmt*: PutBufferStmt
     beginStmt*: BeginStmt
     endStmt*: EndStmt
     rollbackStmt*: RollbackStmt
@@ -317,6 +318,7 @@ proc open*(
     getStmt: getStmt,
     getDataCol: getDataCol,
     putStmt: putStmt,
+    putBufferStmt: putBufferStmt,
     beginStmt: beginStmt,
     endStmt: endStmt,
     rollbackStmt: rollbackStmt)

datastore/sql/sqliteutils.nim

@@ -46,7 +46,7 @@ proc bindParam(
   n: int,
   val: auto): cint =
 
-  when val is openArray[byte]|seq[byte]:
+  when val is openArray[byte]|seq[byte]|DataBuffer:
     if val.len > 0:
       # `SQLITE_TRANSIENT` "indicate[s] that the object is to be copied prior
       # to the return from sqlite3_bind_*(). The object and pointer to it
@@ -70,13 +70,13 @@ proc bindParam(
     # remain valid until then. SQLite will then manage the lifetime of its
     # private copy."
     sqlite3_bind_text(s, n.cint, val.cstring, -1.cint, SQLITE_TRANSIENT)
-  elif val is DbKey:
+  elif val is KeyId:
     # `-1` implies string length is num bytes up to first null-terminator;
     # `SQLITE_TRANSIENT` "indicate[s] that the object is to be copied prior
     # to the return from sqlite3_bind_*(). The object and pointer to it must
     # remain valid until then. SQLite will then manage the lifetime of its
     # private copy."
-    sqlite3_bind_text(s, n.cint, val.cstring, -1.cint, SQLITE_TRANSIENT)
+    sqlite3_bind_text(s, n.cint, val.toCString(), -1.cint, SQLITE_TRANSIENT)
   else:
     {.fatal: "Please add support for the '" & $typeof(val) & "' type".}
 

datastore/threads/databuffer.nim

@@ -35,6 +35,11 @@ proc isNil*(a: DataBuffer): bool = smartptrs.isNil(a)
 proc hash*(a: DataBuffer): Hash =
   a[].buf.toOpenArray(0, a[].size-1).hash()
 
+proc `[]`*(db: DataBuffer, idx: int): byte =
+  if idx >= db.len():
+    raise newException(IndexDefect, "index out of bounds")
+  db[].buf[idx]
+
 proc `==`*(a, b: DataBuffer): bool =
   if a.isNil and b.isNil: return true
   elif a.isNil or b.isNil: return false
@@ -71,6 +76,9 @@ proc new*[T: byte | char](tp: type DataBuffer, data: openArray[T], opts: set[Dat
 proc new*(tp: type DataBuffer, data: pointer, first, last: int): DataBuffer =
   DataBuffer.new(toOpenArray(cast[ptr UncheckedArray[byte]](data), first, last))
 
+proc baseAddr*(db: DataBuffer): pointer =
+  db[].buf
+
 proc clear*(db: DataBuffer) =
   zeroMem(db[].buf, db[].cap)
   db[].size = 0

tests/datastore/sql/testsqliteds.nim

@@ -14,11 +14,11 @@ import pkg/datastore/key
 import ../dscommontests
 import ../querycommontests
 
-proc testBasic(
+proc testBasic[K, V](
   ds: SQLiteDatastore,
-  key: string,
+  key: K,
-  bytes: seq[byte],
+  bytes: V,
-  otherBytes: seq[byte],
+  otherBytes: V,
 ) =
 
   test "put":
@@ -84,3 +84,15 @@ suite "Test Basic SQLiteDatastore":
     ds.close().tryGet()
   
   testBasic(ds, key, bytes, otherBytes)
+
+suite "Test DataBuffer SQLiteDatastore":
+  let
+    ds = SQLiteDatastore.new(Memory).tryGet()
+    key = KeyId.new Key.init("a:b/c/d:e").tryGet().id()
+    bytes = DataBuffer.new "some bytes"
+    otherBytes = DataBuffer.new "some other bytes"
+
+  suiteTeardown:
+    ds.close().tryGet()
+  
+  testBasic(ds, key, bytes, otherBytes)

tests/datastore/testdatabuffer.nim

@@ -88,6 +88,12 @@ suite "Share buffer test":
   test "toString":
     check $a == "/a/b"
 
+  test "index":
+    check c[0] == '/'.byte
+    check c[1] == 'a'.byte
+    expect IndexDefect:
+      check c[2] == 'c'.byte
+
   test "hash":
     check a.hash() == b.hash()