Merge pull request #1154 from chu11/rfc11-final

kvs: rework internal metadata format to conform to RFC 11 design
flux-framework · Aug 25, 2017 · 1c99b02 · 1c99b02
2 parents 53e3f12 + de398d8
commit 1c99b02
Show file tree

Hide file tree

Showing 25 changed files with 3,129 additions and 1,320 deletions.
diff --git a/src/bindings/lua/flux-lua.c b/src/bindings/lua/flux-lua.c
@@ -315,7 +315,7 @@ static int l_flux_kvs_type (lua_State *L)
         return lua_pusherror (L, "key expected in arg #2");
 
     if ((future = flux_kvs_lookup (f, FLUX_KVS_READLINK, key))
-            && flux_kvs_lookup_get_unpack (future, "s", &target) == 0) {
+            && flux_kvs_lookup_get (future, &target) == 0) {
         lua_pushstring (L, "symlink");
         lua_pushstring (L, target);
         flux_future_destroy (future);

diff --git a/src/cmd/flux-kvs.c b/src/cmd/flux-kvs.c
@@ -480,7 +480,7 @@ int cmd_readlink (optparse_t *p, int argc, char **argv)
 
     for (i = optindex; i < argc; i++) {
         if (!(f = flux_kvs_lookup (h, FLUX_KVS_READLINK, argv[i]))
-                || flux_kvs_lookup_get_unpack (f, "s", &target) < 0)
+                || flux_kvs_lookup_get (f, &target) < 0)
             log_err_exit ("%s", argv[i]);
         else
             printf ("%s\n", target);
@@ -755,7 +755,7 @@ static void dump_kvs_dir (kvsdir_t *dir, bool Ropt, bool dopt)
         if (kvsdir_issymlink (dir, name)) {
             const char *link;
             if (!(f = flux_kvs_lookupat (h, FLUX_KVS_READLINK, key, rootref))
-                    || flux_kvs_lookup_get_unpack (f, "s", &link) < 0)
+                    || flux_kvs_lookup_get (f, &link) < 0)
                 log_err_exit ("%s", key);
             printf ("%s -> %s\n", key, link);
             flux_future_destroy (f);

diff --git a/src/common/libkvs/Makefile.am b/src/common/libkvs/Makefile.am
@@ -17,11 +17,11 @@ libkvs_la_SOURCES = \
 	kvs_dir.c \
 	kvs_classic.c \
 	kvs_watch.c \
-	jansson_dirent.c \
-	jansson_dirent.h \
 	kvs_commit.c \
 	kvs_txn.c \
-	kvs_txn_private.h
+	kvs_txn_private.h \
+	treeobj.h \
+	treeobj.c
 
 fluxcoreinclude_HEADERS = \
 	kvs.h \
@@ -33,10 +33,10 @@ fluxcoreinclude_HEADERS = \
 	kvs_commit.h
 
 TESTS = \
-	test_jansson_dirent.t \
 	test_kvs_txn.t \
 	test_kvs_lookup.t \
-	test_kvs_dir.t
+	test_kvs_dir.t \
+	test_treeobj.t
 
 check_PROGRAMS = \
 	$(TESTS)
@@ -56,10 +56,6 @@ test_cppflags = \
 	$(AM_CPPFLAGS) \
 	-I$(top_srcdir)/src/common/libtap
 
-test_jansson_dirent_t_SOURCES = test/jansson_dirent.c
-test_jansson_dirent_t_CPPFLAGS = $(test_cppflags)
-test_jansson_dirent_t_LDADD = $(test_ldadd)
-
 test_kvs_txn_t_SOURCES = test/kvs_txn.c
 test_kvs_txn_t_CPPFLAGS = $(test_cppflags)
 test_kvs_txn_t_LDADD = $(test_ldadd) $(LIBDL)
@@ -71,3 +67,7 @@ test_kvs_lookup_t_LDADD = $(test_ldadd) $(LIBDL)
 test_kvs_dir_t_SOURCES = test/kvs_dir.c
 test_kvs_dir_t_CPPFLAGS = $(test_cppflags)
 test_kvs_dir_t_LDADD = $(test_ldadd) $(LIBDL)
+
+test_treeobj_t_SOURCES = test/treeobj.c
+test_treeobj_t_CPPFLAGS = $(test_cppflags)
+test_treeobj_t_LDADD = $(test_ldadd) $(LIBDL)
diff --git a/src/common/libkvs/jansson_dirent.c b/src/common/libkvs/jansson_dirent.c
diff --git a/src/common/libkvs/jansson_dirent.h b/src/common/libkvs/jansson_dirent.h
diff --git a/src/common/libkvs/kvs_commit.c b/src/common/libkvs/kvs_commit.c
@@ -29,8 +29,6 @@
 #include <czmq.h>
 #include <flux/core.h>
 
-#include "jansson_dirent.h"
-
 #include "kvs_txn_private.h"
 #include "src/common/libutil/blobref.h"