Test updates and TODO items.

brobey · May 2, 2018 · 8499f13 · 8499f13
1 parent 8831356
commit 8499f13
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 31 deletions.
diff --git a/src/sdsdkv-client.h b/src/sdsdkv-client.h
@@ -19,8 +19,6 @@
 #include "sdskv-client.h"
 #include "ch-placement.h"
 
-#include <unistd.h>
-
 #include <vector>
 #include <utility>
 

diff --git a/src/sdsdkv-server.h b/src/sdsdkv-server.h
@@ -118,6 +118,7 @@ struct sdsdkv_server : public personality {
     {
         int rc = sdskv_provider_add_database(
                      m_provider,
+                     // TODO(skg) make unique for each server.
                      m_config->db_name.c_str(),
                      sdsdkv_iconfig::get_real_db_type(m_config->db_type),
                      // TODO(skg) Make a user param.

diff --git a/tests/trivial.cc b/tests/trivial.cc
@@ -46,35 +46,33 @@ main(int argc, char **argv)
     if (erc != MPI_SUCCESS) ABORT(rank, erc);
     erc = MPI_Comm_size(MPI_COMM_WORLD, &numpe);
     if (erc != MPI_SUCCESS) ABORT(rank, erc);
-//    assert(numpe == 4 && "numpe must equal 4");
 
     sdsdkv_config dkv_config = {
         /* .init_comm = */
         MPI_COMM_WORLD,
         /* .personality = */
-        (rank % 2 == 0) ? SDSDKV_PERSONALITY_SERVER: SDSDKV_PERSONALITY_CLIENT,
+        (rank == 0) ? SDSDKV_PERSONALITY_SERVER: SDSDKV_PERSONALITY_CLIENT,
         /* .hash_be = */
         SDSDKV_HASHING_CH_PLACEMENT,
         /* .db_type = */
-        // TODO(skg) Make leveldb work.
-        SDSDKV_DB_MAP,
+        SDSDKV_DB_LEVELDB,
         /* .group_name = */
-        (char *)"test-group",
+        (char *)"groupname",
         /* .db_name = */
-        (char *)"db/test",
+        (char *)"TEST-DB",
         /* .comm_protocol */
-        (char *)"tcp",
+        (char *)"ofi+tcp",
     };
     //
     erc = sdsdkv_create(&dkvc, &dkv_config);
     if (erc != SDSDKV_SUCCESS) ABORT(rank, erc);
     //
     erc = sdsdkv_open(dkvc);
     if (erc != SDSDKV_SUCCESS) ABORT(rank, erc);
-#if 0
+    static int nkeys = 20;
     //
     if (dkv_config.personality == SDSDKV_PERSONALITY_CLIENT) {
-        for (int i = 0; i < 2; ++i) {
+        for (int i = 0; i < nkeys; ++i) {
             uint64_t key = i + rank;
             int value = key + 1;
             erc = sdsdkv_put(
@@ -87,28 +85,24 @@ main(int argc, char **argv)
             if (erc != SDSDKV_SUCCESS) ABORT(rank, erc);
         }
     }
-    sleep(2);
-    if (rank == 0) {
-        int ranks[2] = {0, 2};
-        for (int r = 0; r < 2; ++r) {
-            //
-            for (int i = 0; i < 2; ++i) {
-                uint64_t key = i + ranks[r];
-                int value = -1;
-                uint64_t value_size = sizeof(int);
-                erc = sdsdkv_get(
-                          dkvc,
-                          (const void *)&key,
-                          sizeof(int),
-                          &value,
-                          &value_size
-                      );
-                if (erc != SDSDKV_SUCCESS) ABORT(rank, erc);
-                printf("rank=%d (key=%lu, val=%d)\n", ranks[r], key, value);
-            }
+    sleep(3);
+    if (dkv_config.personality == SDSDKV_PERSONALITY_CLIENT) {
+        for (int i = 0; i < nkeys; ++i) {
+            uint64_t key = i + rank;
+            int value = -1;
+            uint64_t value_size = sizeof(int);
+            erc = sdsdkv_get(
+                      dkvc,
+                      (const void *)&key,
+                      sizeof(int),
+                      &value,
+                      &value_size
+                  );
+            if (erc != SDSDKV_SUCCESS) ABORT(rank, erc);
+            printf("rank=%d (key=%lu, val=%d)\n", rank, key, value);
         }
     }
-#endif
+    sleep(3);
     //
     erc = sdsdkv_destroy(dkvc);
     if (erc != SDSDKV_SUCCESS) ABORT(rank, erc);