[GNUnet-SVN] [taler-anastasis] branch master updated: merge conflict

[gnunet]

This is an automated email from the git hooks/post-receive script.

ds-meister pushed a commit to branch master
in repository anastasis.

The following commit(s) were added to refs/heads/master by this push:
     new 27b4bd8  merge conflict
27b4bd8 is described below

commit 27b4bd85fa2b96395a84e325cd55b8d072b0225a
Author: Dominik Meister <address@hidden>
AuthorDate: Tue Oct 22 11:07:23 2019 +0200

    merge conflict
---
 src/backup-db/plugin_anastasis_postgres.c | 67 ++-----------------------------
 1 file changed, 4 insertions(+), 63 deletions(-)

diff --git a/src/backup-db/plugin_anastasis_postgres.c 
b/src/backup-db/plugin_anastasis_postgres.c
index 263f2b1..aa330cf 100644
--- a/src/backup-db/plugin_anastasis_postgres.c
+++ b/src/backup-db/plugin_anastasis_postgres.c
@@ -201,10 +201,8 @@ postgres_store_recovery_document (void *cls,
 {
   struct PostgresClosure *pg = cls;
   enum GNUNET_DB_QueryStatus qs;
-<<<<<<< HEAD
 
     check_connection (pg);
-
     if (GNUNET_OK !=
         begin_transaction (pg))
     {
@@ -212,38 +210,8 @@ postgres_store_recovery_document (void *cls,
         return GNUNET_DB_STATUS_HARD_ERROR;
     }
 
-    struct GNUNET_PQ_QueryParam params[] = {
-            GNUNET_PQ_query_param_auto_from_type (anastasis_pub),
-            GNUNET_PQ_query_param_end
-    };
-   /*
-
-    struct GNUNET_PQ_ResultSpec rs[] = {
-            TALER_PQ_result_spec_absolute_time ("paid_until", &paid_until),
-            GNUNET_PQ_result_spec_end
-    };
-
-    */
-
-    qs = GNUNET_PQ_eval_prepared_singleton_select (pg->conn,
-                                                   "user_select",
-                                                   params,
-                                                   rs);
-    
-    struct GNUNET_PQ_QueryParam params[] = {
-=======
   struct GNUNET_TIME_Absolute paid_until;
-  
-  check_connection (pg);
-    if (GNUNET_OK !=
-        begin_transaction (pg))
-    {
-      GNUNET_break (0);
-      return GNUNET_DB_STATUS_HARD_ERROR;
-    }
-
   struct GNUNET_PQ_QueryParam params[] = {
->>>>>>> c733ae84027eb667643aed21dcb94b958926101d
     GNUNET_PQ_query_param_auto_from_type (anastasis_pub),
     GNUNET_PQ_query_param_end
   };
@@ -257,7 +225,6 @@ postgres_store_recovery_document (void *cls,
                                                   "user_select",
                                                   params,
                                                   rs);
-
   switch (qs)
   {
   case GNUNET_DB_STATUS_HARD_ERROR:
@@ -274,26 +241,19 @@ postgres_store_recovery_document (void *cls,
               paid_until);
     break;
   } 
-  
-<<<<<<< HEAD
-  GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
-              "inserting recovery document: user_id: %s, version: %i.\n",
-              GNUNET_p2s (anastasis_pub),
-              version);
-=======
 
   //upload if last payment is still valid
   if (GNUNET_TIME_absolute_get_difference(GNUNET_TIME_absolute_get, paid_until 
!= 0))
   {
     struct GNUNET_PQ_QueryParam params[] = {
       GNUNET_PQ_query_param_auto_from_type (anastasis_pub),
+      GNUNET_PQ_query_param_auto_from_type (version),
       GNUNET_PQ_query_param_fixed_size (data, data_size),
       GNUNET_PQ_query_param_end
     };
 
     qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                              "recovery_document_insert", 
//FIXME: Has to be defined
-                                              params);
+                                              "recovery_document_insert", 
params);
   }
 
   switch (qs)
@@ -317,30 +277,11 @@ postgres_store_recovery_document (void *cls,
   if (qs < 0)
     return qs;
   return GNUNET_DB_STATUS_SUCCESS_ONE_RESULT;
-}
 
->>>>>>> c733ae84027eb667643aed21dcb94b958926101d
-
-  qs = GNUNET_PQ_eval_prepared_non_select (pg->conn,
-                                             "recovery_document_insert",
-                                             params);
-  switch(qs) {
-      case GNUNET_DB_STATUS_HARD_ERROR:
-          rollback (pg);
-          return qs;
-      case GNUNET_DB_STATUS_SOFT_ERROR:
-          // FIXME: or: retry internally?
-          rollback (pg);
-          return qs;
-      case GNUNET_DB_STATUS_SUCCESS_NO_RESULTS:
-          //FIXME ?
-          rollback(pg);
-          return qs;
-      case GNUNET_DB_STATUS_SUCCESS_ONE_RESULT:
-          return commit_transaction(pg);
-  }
 }
 
+
+
 /**
  * FIXME
  * Insert proposal data and its hashcode into db

-- 
To stop receiving notification emails like this one, please contact
address@hidden.