cache API: for `read/write` the key is const, really

It might better be passed by value, but let me keep the way for now.

diff --git a/lib/cdb.h b/lib/cdb.h
index 3a30a2bfab6de2ca5d7f71310305b0e612b227f4..d5bce36b2959ef2fc004b33b02e6b555106de12b 100644 (file)
--- a/lib/cdb.h
+++ b/lib/cdb.h
@@ -43,8 +43,10 @@ struct kr_cdb_api {
 
        /* Data access */
 
-       int (*read)(knot_db_t *db, knot_db_val_t *key, knot_db_val_t *val, int maxcount);
-       int (*write)(knot_db_t *db, knot_db_val_t *key, knot_db_val_t *val, int maxcount);
+       int (*read)(knot_db_t *db, const knot_db_val_t *key, knot_db_val_t *val,
+                       int maxcount);
+       int (*write)(knot_db_t *db, const knot_db_val_t *key, knot_db_val_t *val,
+                       int maxcount);
        int (*remove)(knot_db_t *db, knot_db_val_t *key, int maxcount);
 
        /* Specialised operations */

diff --git a/lib/cdb_lmdb.c b/lib/cdb_lmdb.c
index 47f90fc7c1f3441c29a1f1e87a0cd2ab308215bf..ac209dbdec39aedf9200d2f5937ae42cf9b4d416 100644 (file)
--- a/lib/cdb_lmdb.c
+++ b/lib/cdb_lmdb.c
@@ -464,7 +464,8 @@ static int cdb_clear(knot_db_t *db)
        return ret;
 }
 
-static int cdb_readv(knot_db_t *db, knot_db_val_t *key, knot_db_val_t *val, int maxcount)
+static int cdb_readv(knot_db_t *db, const knot_db_val_t *key, knot_db_val_t *val,
+                    int maxcount)
 {
        struct lmdb_env *env = db;
        MDB_txn *txn = NULL;
@@ -487,7 +488,8 @@ static int cdb_readv(knot_db_t *db, knot_db_val_t *key, knot_db_val_t *val, int
        return kr_ok();
 }
 
-static int cdb_write(struct lmdb_env *env, MDB_txn **txn, knot_db_val_t *key, knot_db_val_t *val, unsigned flags)
+static int cdb_write(struct lmdb_env *env, MDB_txn **txn, const knot_db_val_t *key,
+                       knot_db_val_t *val, unsigned flags)
 {
        /* Convert key structs and write */
        MDB_val _key = val_knot2mdb(*key);
@@ -514,7 +516,8 @@ static int cdb_write(struct lmdb_env *env, MDB_txn **txn, knot_db_val_t *key, kn
        return kr_ok();
 }
 
-static int cdb_writev(knot_db_t *db, knot_db_val_t *key, knot_db_val_t *val, int maxcount)
+static int cdb_writev(knot_db_t *db, const knot_db_val_t *key, knot_db_val_t *val,
+                       int maxcount)
 {
        struct lmdb_env *env = db;
        MDB_txn *txn = NULL;

diff --git a/modules/kmemcached/cdb_memcached.c b/modules/kmemcached/cdb_memcached.c
index ffe96be6c28fc33c0bf8b8c835dafbab6f6a3e76..0290a26ad69c05c24c83e35ffb60236b402378cb 100644 (file)
--- a/modules/kmemcached/cdb_memcached.c
+++ b/modules/kmemcached/cdb_memcached.c
@@ -106,7 +106,8 @@ static int cdb_clear(knot_db_t *db)
        return 0;
 }
 
-static int cdb_readv(knot_db_t *db, knot_db_val_t *key, knot_db_val_t *val, int maxcount)
+static int cdb_readv(knot_db_t *db, const knot_db_val_t *key, knot_db_val_t *val,
+                    int maxcount)
 {
        if (!db || !key || !val) {
                return kr_error(EINVAL);
@@ -138,7 +139,8 @@ static int cdb_readv(knot_db_t *db, knot_db_val_t *key, knot_db_val_t *val, int
        return 0;
 }
 
-static int cdb_writev(knot_db_t *db, knot_db_val_t *key, knot_db_val_t *val, int maxcount)
+static int cdb_writev(knot_db_t *db, const knot_db_val_t *key, knot_db_val_t *val,
+                       int maxcount)
 {
        if (!db || !key || !val) {
                return kr_error(EINVAL);

diff --git a/modules/redis/cdb_redis.c b/modules/redis/cdb_redis.c
index 59e346308160e8c8fc14f5204c7c819195dba98d..262c0f93d25919c4f54e2973cb9a97a95e743f68 100644 (file)
--- a/modules/redis/cdb_redis.c
+++ b/modules/redis/cdb_redis.c
@@ -221,7 +221,8 @@ static int cdb_clear(knot_db_t *cache)
        return kr_ok();
 }
 
-static int cdb_readv(knot_db_t *cache, knot_db_val_t *key, knot_db_val_t *val, int maxcount)
+static int cdb_readv(knot_db_t *cache, const knot_db_val_t *key, knot_db_val_t *val,
+                    int maxcount)
 {
        if (!cache || !key || !val) {
                return kr_error(EINVAL);
@@ -256,7 +257,8 @@ static int cdb_readv(knot_db_t *cache, knot_db_val_t *key, knot_db_val_t *val, i
        return kr_ok();
 }
 
-static int cdb_writev(knot_db_t *cache, knot_db_val_t *key, knot_db_val_t *val, int maxcount)
+static int cdb_writev(knot_db_t *cache, const knot_db_val_t *key, knot_db_val_t *val,
+                       int maxcount)
 {
        if (!cache || !key || !val) {
                return kr_error(EINVAL);