Skip to contentSkip to conversation

libchunkd: API changes for arbitrary-length binary keys

PATCH New Jeff Garzik 1 participant 1 message Nov 5, 2009 Library code

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libchunkd: API changes for arbitrary-length binary keys

The last stage in the user-visible conversion. Further changes will likely take place under the hood, such as storing tiny objects in a DBM (Tokyo Cabinet?) rather than the current one-obj-per-file approach.

commit efef1eaf3a81ece54a761478cb8a72780556e97e

Author: Jeff Garzik <[email protected]>
Date:   Thu Nov 5 00:48:07 2009 -0500

libchunkd: API changes to support arbitrary length binary keys

include/chunkc.h +41 -10
index 1cc8cc7..5e9af58 100644
@@ -5,6 +5,7 @@
 #include <openssl/ssl.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <string.h>
 #include <glib.h>
 #include <chunk_msg.h>
 
@@ -44,28 +45,58 @@ extern struct st_client *stc_new(const char *service_host, int port,
 				 const char *user, const char *secret_key,
 				 bool encrypt);
 
-extern bool stc_get(struct st_client *stc, const char *key,
+extern bool stc_get(struct st_client *stc, const void *key, size_t key_len,
 	     size_t (*write_cb)(void *, size_t, size_t, void *),
 	     void *user_data);
 extern void *stc_get_inline(struct st_client *stc,
-			    const char *key, size_t *len);
-extern bool stc_get_start(struct st_client *stc, const char *key, int *pfd,
-			  uint64_t *len);
+			    const void *key, size_t key_len, size_t *len);
+extern bool stc_get_start(struct st_client *stc, const void *key,
+			size_t key_len,int *pfd, uint64_t *len);
 extern size_t stc_get_recv(struct st_client *stc, void *data, size_t len);
-extern bool stc_put(struct st_client *stc, const char *key,
+extern bool stc_put(struct st_client *stc, const void *key, size_t key_len,
 	     size_t (*read_cb)(void *, size_t, size_t, void *),
 	     uint64_t len, void *user_data);
-extern bool stc_put_start(struct st_client *stc, const char *key,
-	     uint64_t cont_len, int *pfd);
+extern bool stc_put_start(struct st_client *stc, const void *key,
+			  size_t key_len, uint64_t cont_len, int *pfd);
 extern size_t stc_put_send(struct st_client *stc, void *data, size_t len);
 extern bool stc_put_sync(struct st_client *stc);
-extern bool stc_put_inline(struct st_client *stc, const char *key,
-			   void *data, uint64_t len);
-extern bool stc_del(struct st_client *stc, const char *key);
+extern bool stc_put_inline(struct st_client *stc, const void *key,
+			   size_t key_len, void *data, uint64_t len);
+extern bool stc_del(struct st_client *stc, const void *key, size_t key_len);
 extern bool stc_ping(struct st_client *stc);
 
 extern struct st_keylist *stc_keys(struct st_client *stc);
 
 extern int stc_readport(const char *fname);
 
+static inline void *stc_get_inlinez(struct st_client *stc,
+				    const char *key,
+				    size_t *len)
+{
+	return stc_get_inline(stc, key, strlen(key) + 1, len);
+}
+
+static inline bool stc_get_startz(struct st_client *stc, const char *key,
+				  int *pfd, uint64_t *len)
+{
+	return stc_get_start(stc, key, strlen(key) + 1, pfd, len);
+}
+
+static inline bool stc_put_inlinez(struct st_client *stc, const char *key,
+				   void *data, uint64_t len)
+{
+	return stc_put_inline(stc, key, strlen(key) + 1, data, len);
+}
+
+static inline bool stc_put_startz(struct st_client *stc, const char *key,
+				  uint64_t cont_len, int *pfd)
+{
+	return stc_put_start(stc, key, strlen(key) + 1, cont_len, pfd);
+}
+
+static inline bool stc_delz(struct st_client *stc, const char *key)
+{
+	return stc_del(stc, key, strlen(key) + 1);
+}
+
 #endif /* __STC_H__ */
lib/chunkdc.c +23 -22

129 lines not on this page · raw message

test/auth.c +10 -10
index 107b988..f927609 100644
@@ -33,11 +33,11 @@ static void test(bool encrypt)
 	OK(stc2);
 
 	/* store object 1 */
-	rcb = stc_put_inline(stc1, key1, val1, strlen(val1));
+	rcb = stc_put_inlinez(stc1, key1, val1, strlen(val1));
 	OK(rcb);
 
 	/* store object 2 */
-	rcb = stc_put_inline(stc2, key2, val2, strlen(val2));
+	rcb = stc_put_inlinez(stc2, key2, val2, strlen(val2));
 	OK(rcb);
 
 	/* make sure object 1 appears in list of volume keys */
@@ -75,7 +75,7 @@ static void test(bool encrypt)
 	stc_free_keylist(klist);
 
 	/* get object 1 */
-	mem = stc_get_inline(stc1, key1, &len);
+	mem = stc_get_inlinez(stc1, key1, &len);
 	OK(mem);
 	OK(len == strlen(val1));
 	OK(!memcmp(val1, mem, strlen(val1)));
@@ -83,11 +83,11 @@ static void test(bool encrypt)
 	free(mem);
 
 	/* fail to get object 2 */
-	mem = stc_get_inline(stc1, key2, &len);
+	mem = stc_get_inlinez(stc1, key2, &len);
 	OK(mem == NULL);
 
 	/* get object 2 */
-	mem = stc_get_inline(stc2, key2, &len);
+	mem = stc_get_inlinez(stc2, key2, &len);
 	OK(mem);
 	OK(len == strlen(val2));
 	OK(!memcmp(val2, mem, strlen(val2)));
@@ -95,23 +95,23 @@ static void test(bool encrypt)
 	free(mem);
 
 	/* fail to get object 1 */
-	mem = stc_get_inline(stc2, key1, &len);
+	mem = stc_get_inlinez(stc2, key1, &len);
 	OK(mem == NULL);
 
 	/* fail to delete object 2 */
-	rcb = stc_del(stc1, key2);
+	rcb = stc_delz(stc1, key2);
 	OK(rcb == false);
 
 	/* fail to delete object 1 */
-	rcb = stc_del(stc2, key1);
+	rcb = stc_delz(stc2, key1);
 	OK(rcb == false);
 
 	/* delete object 1 */
-	rcb = stc_del(stc1, key1);
+	rcb = stc_delz(stc1, key1);
 	OK(rcb);
 
 	/* delete object 2 */
-	rcb = stc_del(stc2, key2);
+	rcb = stc_delz(stc2, key2);
 	OK(rcb);
 
 	stc_free(stc1);
test/basic-object.c +3 -3
index 7abb1d7..12652d5 100644
@@ -28,7 +28,7 @@ static void test(bool encrypt)
 	OK(stc);
 
 	/* store object */
-	rcb = stc_put_inline(stc, key, val, strlen(val));
+	rcb = stc_put_inlinez(stc, key, val, strlen(val));
 	OK(rcb);
 
 	/* make sure object appears in list of volume keys */
@@ -49,7 +49,7 @@ static void test(bool encrypt)
 	stc_free_keylist(klist);
 
 	/* get object */
-	mem = stc_get_inline(stc, key, &len);
+	mem = stc_get_inlinez(stc, key, &len);
 	OK(mem);
 	OK(len == strlen(val));
 	OK(!memcmp(val, mem, strlen(val)));
@@ -57,7 +57,7 @@ static void test(bool encrypt)
 	free(mem);
 
 	/* delete object */
-	rcb = stc_del(stc, key);
+	rcb = stc_delz(stc, key);
 	OK(rcb);
 
 	stc_free(stc);
test/large-object.c +3 -3
index d97ce21..d9a3a2d 100644
@@ -98,7 +98,7 @@ static void test(bool encrypt)
 	gettimeofday(&ta, NULL);
 
 	/* store object */
-	rcb = stc_put_start(stc, key, N_BUFS * BUFSZ, &sfd);
+	rcb = stc_put_startz(stc, key, N_BUFS * BUFSZ, &sfd);
 	OK(rcb);
 	for (i = 0; i < N_BUFS; i++) {
 		rcb = send_buf(stc, sfd, data, BUFSZ);
@@ -132,7 +132,7 @@ static void test(bool encrypt)
 	gettimeofday(&ta, NULL);
 
 	/* initiate get object */
-	rcb = stc_get_start(stc, key, &rfd, &len);
+	rcb = stc_get_startz(stc, key, &rfd, &len);
 	OK(rcb);
 	OK(len == (N_BUFS * BUFSZ));
 
@@ -149,7 +149,7 @@ static void test(bool encrypt)
 	}
 
 	/* delete object */
-	rcb = stc_del(stc, key);
+	rcb = stc_delz(stc, key);
 	OK(rcb);
 
 	stc_free(stc);
test/lotsa-objects.c +3 -3
index a26ecc0..c3e54c5 100644
@@ -41,7 +41,7 @@ static void test(int n_objects, bool encrypt)
 	/* store object */
 	for (i = 0; i < n_objects; i++) {
 		sprintf(key, "%x000000", i);
-		rcb = stc_put_inline(stc, key, val, strlen(val));
+		rcb = stc_put_inlinez(stc, key, val, strlen(val));
 		OK(rcb);
 
 		keys = g_list_prepend(keys, strdup(key));
@@ -88,7 +88,7 @@ static void test(int n_objects, bool encrypt)
 		k = tmpl->data;
 		len = 0;
 
-		mem = stc_get_inline(stc, k, &len);
+		mem = stc_get_inlinez(stc, k, &len);
 		OK(mem);
 		OK(len == strlen(val));
 		OK(!memcmp(val, mem, strlen(val)));
@@ -106,7 +106,7 @@ static void test(int n_objects, bool encrypt)
 	/* delete object */
 	for (tmpl = keys; tmpl; tmpl = tmpl->next) {
 		k = tmpl->data;
-		rcb = stc_del(stc, k);
+		rcb = stc_delz(stc, k);
 		OK(rcb);
 
 		free(k);