some modifications for batch test

1 files changed, 5 insertions, 43 deletions

diff --git a/src/exchangedb/test_exchangedb_by_j.c b/src/exchangedb/test_exchangedb_by_j.c
index 0f252a097..834373b55 100644
--- a/src/exchangedb/test_exchangedb_by_j.c
+++ b/src/exchangedb/test_exchangedb_by_j.c
@@ -91,9 +91,9 @@ run (void *cls)
     result = 77;
     goto cleanup;
   }
-<<<<<<< HEAD
+
   for (unsigned int i = 0; i< 7; i++)
-=======
+
   if (GNUNET_OK !=
       plugin->setup_partitions (plugin->cls,
                                 num_partitions))
@@ -104,7 +104,7 @@ run (void *cls)
   }
 
   for (unsigned int i = 0; i< 8; i++)
->>>>>>> 26922c6d (batch modifications)
+
   {
     static unsigned int batches[] = {1, 1,0, 2, 4, 16, 64, 256};
     const char *sndr = "payto://x-taler-bank/localhost:8080/1";
@@ -123,15 +123,8 @@ run (void *cls)
     ts = GNUNET_TIME_timestamp_get ();
     for (unsigned int r = 0; r<10; r++)
     {
-<<<<<<< HEAD
-      plugin->start_read_committed (plugin->cls,
-                                    "test_by_j");
-
-=======
-       plugin->start (plugin->cls,
-         "test_by_exchange_j");
->>>>>>> 26922c6d (batch modifications)
-      for (unsigned int k = 0; k<batch_size; k++)
+
+       for (unsigned int k = 0; k<batch_size; k++)
       {
         RND_BLK (&reserves[k].reserve_pub);
         reserves[k].balance = value;
@@ -139,44 +132,13 @@ run (void *cls)
         reserves[k].sender_account_details = sndr;
         reserves[k].exchange_account_name = "name";
         reserves[k].wire_reference = k;
-<<<<<<< HEAD
-
-      }
-      FAILIF (batch_size !=
-              plugin->batch_reserves_in_insert (plugin->cls,
-                                                reserves,
-                                                batch_size,
-                                                results));
-
-      plugin->commit (plugin->cls);
-=======
       }
       FAILIF (batch_size !=
             plugin->batch_reserves_in_insert (plugin->cls,
                                               reserves,
                                               batch_size,
                                               results));
-      /*plugin->commit (plugin->cls);*/
->>>>>>> 26922c6d (batch modifications)
     }
-    /*
-    for (unsigned int s=0;s<10;s++)
-    {
-      for (unsigned int k = 0; k<batch_size; k++)
-      {
-        RND_BLK (&reserves2[k].reserve_pub);
-        reserves2[k].balance = value;
-        reserves2[k].execution_time = ts;
-        reserves2[k].sender_account_details = sndr;
-        reserves2[k].exchange_account_name = "name";
-        reserves2[k].wire_reference = k;
-      }
-      FAILIF (batch_size !=
-            plugin->batch_reserves_in_insert (plugin->cls,
-                                              reserves2,
-                                              batch_size,
-                                              results));
-                                              }*/
 
     duration = GNUNET_TIME_absolute_get_duration (now);
     fprintf (stdout,