psycstore: add fragment_limit arg for message_get

6 files changed, 37 insertions, 17 deletions

diff --git a/src/psycstore/gnunet-service-psycstore.c b/src/psycstore/gnunet-service-psycstore.c
index 44103c6a0..53e593455 100644
--- a/src/psycstore/gnunet-service-psycstore.c
+++ b/src/psycstore/gnunet-service-psycstore.c
@@ -319,8 +319,10 @@ handle_fragment_get (void *cls,
   const struct FragmentGetRequest *
     req = (const struct FragmentGetRequest *) msg;
   struct SendClosure
-    sc = { .op_id = req->op_id, .client = client,
-           .channel_key = req->channel_key, .slave_key = req->slave_key,
+    sc = { .op_id = req->op_id,
+           .client = client,
+           .channel_key = req->channel_key,
+           .slave_key = req->slave_key,
            .membership_test = req->do_membership_test };
 
   int64_t ret;
@@ -332,10 +334,10 @@ handle_fragment_get (void *cls,
   if (0 == limit)
     ret = db->fragment_get (db->cls, &req->channel_key,
                             first_fragment_id, last_fragment_id,
-                            &ret_frags, &send_fragment, &sc);
+                            &ret_frags, send_fragment, &sc);
   else
     ret = db->fragment_get_latest (db->cls, &req->channel_key, limit,
-                                   &ret_frags, &send_fragment, &sc);
+                                   &ret_frags, send_fragment, &sc);
 
   switch (ret)
   {
@@ -389,24 +391,27 @@ handle_message_get (void *cls,
   }
 
   struct SendClosure
-    sc = { .op_id = req->op_id, .client = client,
-           .channel_key = req->channel_key, .slave_key = req->slave_key,
+    sc = { .op_id = req->op_id,
+           .client = client,
+           .channel_key = req->channel_key,
+           .slave_key = req->slave_key,
            .membership_test = req->do_membership_test };
 
   int64_t ret;
   uint64_t ret_frags = 0;
   uint64_t first_message_id = GNUNET_ntohll (req->first_message_id);
   uint64_t last_message_id = GNUNET_ntohll (req->last_message_id);
-  uint64_t limit = GNUNET_ntohll (req->message_limit);
+  uint64_t msg_limit = GNUNET_ntohll (req->message_limit);
+  uint64_t frag_limit = GNUNET_ntohll (req->fragment_limit);
 
   /** @todo method_prefix */
-  if (0 == limit)
+  if (0 == msg_limit)
     ret = db->message_get (db->cls, &req->channel_key,
-                           first_message_id, last_message_id,
-                           &ret_frags, &send_fragment, &sc);
+                           first_message_id, last_message_id, frag_limit,
+                           &ret_frags, send_fragment, &sc);
   else
-    ret = db->message_get_latest (db->cls, &req->channel_key, limit,
-                                  &ret_frags, &send_fragment, &sc);
+    ret = db->message_get_latest (db->cls, &req->channel_key, msg_limit,
+                                  &ret_frags, send_fragment, &sc);
 
   switch (ret)
   {
@@ -661,7 +666,7 @@ handle_state_modify (void *cls,
   else
   {
     ret = db->message_get (db->cls, &req->channel_key,
-                           message_id, message_id,
+                           message_id, message_id, 0,
                            &ret_frags, recv_state_fragment, &scls);
     if (GNUNET_OK != ret)
     {
diff --git a/src/psycstore/plugin_psycstore_sqlite.c b/src/psycstore/plugin_psycstore_sqlite.c
index 8f9a3ef63..4ad3b1517 100644
--- a/src/psycstore/plugin_psycstore_sqlite.c
+++ b/src/psycstore/plugin_psycstore_sqlite.c
@@ -472,7 +472,8 @@ database_setup (struct Plugin *plugin)
                "       multicast_flags, psycstore_flags, data\n"
                "FROM messages\n"
                "WHERE channel_id = (SELECT id FROM channels WHERE pub_key = ?)\n"
-               "      AND ? <= message_id AND message_id <= ?;",
+               "      AND ? <= message_id AND message_id <= ?"
+               "LIMIT ?;",
                &plugin->select_messages);
 
   sql_prepare (plugin->dbh,
@@ -1195,6 +1196,7 @@ message_get (void *cls,
              const struct GNUNET_CRYPTO_EddsaPublicKey *channel_key,
              uint64_t first_message_id,
              uint64_t last_message_id,
+             uint64_t fragment_limit,
              uint64_t *returned_fragments,
              GNUNET_PSYCSTORE_FragmentCallback cb,
              void *cb_cls)
@@ -1208,7 +1210,11 @@ message_get (void *cls,
                                       sizeof (*channel_key),
                                       SQLITE_STATIC)
       || SQLITE_OK != sqlite3_bind_int64 (stmt, 2, first_message_id)
-      || SQLITE_OK != sqlite3_bind_int64 (stmt, 3, last_message_id))
+      || SQLITE_OK != sqlite3_bind_int64 (stmt, 3, last_message_id)
+      || SQLITE_OK != sqlite3_bind_int64 (stmt, 4,
+                                          (0 != fragment_limit)
+                                          ? fragment_limit
+                                          : -1))
   {
     LOG_SQLITE (plugin, GNUNET_ERROR_TYPE_ERROR | GNUNET_ERROR_TYPE_BULK,
                 "sqlite3_bind");
diff --git a/src/psycstore/psycstore.h b/src/psycstore/psycstore.h
index 67104e8ad..831b5c550 100644
--- a/src/psycstore/psycstore.h
+++ b/src/psycstore/psycstore.h
@@ -345,6 +345,11 @@ struct MessageGetRequest
   uint64_t message_limit GNUNET_PACKED;
 
   /**
+   * Maximum number of fragments to retrieve.
+   */
+  uint64_t fragment_limit GNUNET_PACKED;
+
+  /**
    * Do membership test with @a slave_key before returning fragment?
    * #GNUNET_YES or #GNUNET_NO
    */
diff --git a/src/psycstore/psycstore_api.c b/src/psycstore/psycstore_api.c
index f378be210..8f067b452 100644
--- a/src/psycstore/psycstore_api.c
+++ b/src/psycstore/psycstore_api.c
@@ -965,6 +965,8 @@ GNUNET_PSYCSTORE_fragment_get_latest (struct GNUNET_PSYCSTORE_Handle *h,
  *        First message ID to retrieve.
  * @param last_message_id
  *        Last consecutive message ID to retrieve.
+ * @param fragment_limit
+ *        Maximum number of fragments to retrieve.
  * @param method_prefix
  *        Retrieve only messages with a matching method prefix.
  * @todo Implement method_prefix query.
@@ -983,6 +985,7 @@ GNUNET_PSYCSTORE_message_get (struct GNUNET_PSYCSTORE_Handle *h,
                               const struct GNUNET_CRYPTO_EcdsaPublicKey *slave_key,
                               uint64_t first_message_id,
                               uint64_t last_message_id,
+                              uint64_t fragment_limit,
                               const char *method_prefix,
                               GNUNET_PSYCSTORE_FragmentCallback fragment_cb,
                               GNUNET_PSYCSTORE_ResultCallback rcb,
@@ -1009,6 +1012,7 @@ GNUNET_PSYCSTORE_message_get (struct GNUNET_PSYCSTORE_Handle *h,
   req->channel_key = *channel_key;
   req->first_message_id = GNUNET_htonll (first_message_id);
   req->last_message_id = GNUNET_htonll (last_message_id);
+  req->fragment_limit = GNUNET_htonll (fragment_limit);
   if (NULL != slave_key)
   {
     req->slave_key = *slave_key;
diff --git a/src/psycstore/test_plugin_psycstore.c b/src/psycstore/test_plugin_psycstore.c
index 5a5f970b9..3a022ec52 100644
--- a/src/psycstore/test_plugin_psycstore.c
+++ b/src/psycstore/test_plugin_psycstore.c
@@ -285,7 +285,7 @@ run (void *cls, char *const *args, const char *cfgfile,
 
   GNUNET_assert (
     GNUNET_OK == db->message_get (db->cls, &channel_pub_key,
-                                  message_id, message_id,
+                                  message_id, message_id, 0,
                                   &ret_frags, fragment_cb, &fcls));
   GNUNET_assert (fcls.n == 2 && ret_frags == 2);
 
diff --git a/src/psycstore/test_psycstore.c b/src/psycstore/test_psycstore.c
index 58e6243b7..1e7004021 100644
--- a/src/psycstore/test_psycstore.c
+++ b/src/psycstore/test_psycstore.c
@@ -378,7 +378,7 @@ message_get_fragment_result (void *cls, int64_t result,
   fcls->n_expected = 3;
   uint64_t message_id = GNUNET_ntohll (fcls->msg[0]->message_id);
   op = GNUNET_PSYCSTORE_message_get (h, &channel_pub_key, &slave_pub_key,
-                                     message_id, message_id, "",
+                                     message_id, message_id, 0, "",
                                      &fragment_result,
                                      &message_get_result, fcls);
 }