writeable lookups now compile

[chiark-tcl.git] / cdb / writeable.c

diff --git a/cdb/writeable.c b/cdb/writeable.c
index 3205ff0612f870e120ea819fa3d4b48c29d7ea63..1059a104e330d2c56e9d53569be47b25044190fc 100644 (file)
--- a/cdb/writeable.c
+++ b/cdb/writeable.c
@@ -92,6 +92,15 @@ static void ht_maybeupdate(HashTable *ht, const char *key,
   Tcl_SetHashValue(he, val_eat);
 }
 
+static const HashValue *ht_lookup(HashTable *ht, const char *key) {
+  Tcl_HashEntry *he;
+  
+  he= Tcl_FindHashEntry(&ht->t, key);
+  if (!he) return 0;
+  
+  return Tcl_GetHashValue(he);
+}
+
 static int ht_forall(HashTable *ht,
                     int (*fn)(const char *key, HashValue *val,
                               struct ht_forall_ctx *ctx),
@@ -493,6 +502,12 @@ int cht_do_cdbwr_open(ClientData cd, Tcl_Interp *ip, const char *pathb,
   return rc;
 }
 
+int cht_do_cdbwr_open_okjunk(ClientData cd, Tcl_Interp *ip, const char *pathb,
+                     Tcl_Obj *on_info, Tcl_Obj *on_lexminval,
+                     void **result) {
+  return cht_do_cdbwr_open(cd,ip,pathb,on_info,on_lexminval,result);
+}
+
 /*==================== COMPACTION ====================*/
 
 struct ht_forall_ctx {
@@ -823,3 +838,47 @@ int cht_do_cdbwr_update_hb(ClientData cd, Tcl_Interp *ip,
                           void *rw_v, const char *key, HBytes_Value value) {
   return update(ip, rw_v, key, cht_hb_data(&value), cht_hb_len(&value));
 }
+
+int cht_do_cdbwr_delete(ClientData cd, Tcl_Interp *ip, void *rw_v,
+                       const char *key) {
+  return update(ip, rw_v, key, 0, 0);
+}
+
+/*---------- Lookups ----------*/
+
+static int lookup_rw(Tcl_Interp *ip, void *rw_v, const char *key,
+                   const Byte **data_r, int *len_r /* -1 => notfound */) {
+  Rw *rw= rw_v;
+  const HashValue *val;
+  int r;
+
+  val= ht_lookup(&rw->logincore, key);
+  if (val) {
+    if (val->len) { *data_r= val->data; *len_r= val->len; return TCL_OK; }
+    else { *data_r= 0; *len_r= -1; return TCL_OK; }
+  }
+
+  r= cdb_find(&rw->cdb, key, strlen(key));
+  if (!r) { *data_r= 0; *len_r= -1; return TCL_OK; }
+  if (r<0) return cht_posixerr(ip, errno, "cdb_find failed");
+  assert(r==1);
+  *len_r= cdb_datalen(&rw->cdb);
+  assert(*len_r > 0);
+  *data_r= cdb_getdata(&rw->cdb);
+  if (!*data_r) return cht_posixerr(ip, errno, "cdb_getdata failed");
+  return TCL_OK;
+} 
+
+int cht_do_cdbwr_lookup(ClientData cd, Tcl_Interp *ip, void *rw_v,
+                       const char *key, Tcl_Obj *def,
+                       Tcl_Obj **result) {
+  return cht_cdb_dosomelookup(ip, rw_v, key, def, result,
+                             lookup_rw, cht_cdb_storeanswer_string);
+}
+  
+int cht_do_cdbwr_lookup_hb(ClientData cd, Tcl_Interp *ip, void *rw_v,
+                          const char *key, Tcl_Obj *def,
+                          Tcl_Obj **result) {
+  return cht_cdb_dosomelookup(ip, rw_v, key, def, result,
+                             lookup_rw, cht_cdb_storeanswer_hb);
+}