From 2abe9bf6d7df83f480514dce06005a813503982c Mon Sep 17 00:00:00 2001
From: Marco Boss <bossm8@bfh.ch>
Date: Wed, 2 Mar 2022 10:50:51 +0100
Subject: include partitioning logic in dbinit

---
 src/exchangedb/plugin_exchangedb_postgres.c | 45 +++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

(limited to 'src/exchangedb/plugin_exchangedb_postgres.c')

diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c
index c8c0c296..517792b9 100644
--- a/src/exchangedb/plugin_exchangedb_postgres.c
+++ b/src/exchangedb/plugin_exchangedb_postgres.c
@@ -198,6 +198,50 @@ postgres_create_tables (void *cls)
 }
 
 
+/**
+ * Setup partitions of already existing tables
+ *
+ * @param cls the `struct PostgresClosure` with the plugin-specific state
+ * @param num the number of partitions to create for each partitioned table
+ * @return #GNUNET_OK upon success; #GNUNET_SYSERR upon failure
+ */
+static enum GNUNET_GenericReturnValue
+postgres_setup_partitions (void *cls,
+                           const uint32_t *num)
+{
+  struct PostgresClosure *pg = cls;
+  struct GNUNET_PQ_Context *conn;
+  enum GNUNET_GenericReturnValue ret;
+  struct GNUNET_PQ_QueryParam params[] = {
+    GNUNET_PQ_query_param_uint32 (num),
+    GNUNET_PQ_query_param_end
+  };
+  struct GNUNET_PQ_PreparedStatement ps[] = {
+    GNUNET_PQ_make_prepare ("setup_partitions",
+                            "SELECT"
+                            " create_partitions"
+                            " ($1);",
+                            1),
+    GNUNET_PQ_PREPARED_STATEMENT_END
+  };
+
+  conn = GNUNET_PQ_connect_with_cfg (pg->cfg,
+                                     "exchangedb-postgres",
+                                     "partition-",
+                                     NULL,
+                                     ps);
+  if (NULL == conn)
+    return GNUNET_SYSERR;
+  ret = GNUNET_OK;
+  if (0 > GNUNET_PQ_eval_prepared_non_select (conn,
+                                              "setup_partitions",
+                                              params))
+    ret = GNUNET_SYSERR;
+  GNUNET_PQ_disconnect (conn);
+  return ret;
+}
+
+
 /**
  * Initialize prepared statements for @a pg.
  *
@@ -11717,6 +11761,7 @@ libtaler_plugin_exchangedb_postgres_init (void *cls)
   plugin->cls = pg;
   plugin->drop_tables = &postgres_drop_tables;
   plugin->create_tables = &postgres_create_tables;
+  plugin->setup_partitions = &postgres_setup_partitions;
   plugin->start = &postgres_start;
   plugin->start_read_committed = &postgres_start_read_committed;
   plugin->commit = &postgres_commit;
-- 
cgit v1.2.3


From 7f30609ff0773873df9274bf4a491dd00e623577 Mon Sep 17 00:00:00 2001
From: Marco Boss <bossm8@bfh.ch>
Date: Wed, 2 Mar 2022 17:22:43 +0100
Subject: use plain uint32_t

---
 src/exchange-tools/taler-exchange-dbinit.c  | 2 +-
 src/exchangedb/plugin_exchangedb_postgres.c | 4 ++--
 src/include/taler_exchangedb_plugin.h       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/exchangedb/plugin_exchangedb_postgres.c')

diff --git a/src/exchange-tools/taler-exchange-dbinit.c b/src/exchange-tools/taler-exchange-dbinit.c
index 69b9d1a1..9ec31afc 100644
--- a/src/exchange-tools/taler-exchange-dbinit.c
+++ b/src/exchange-tools/taler-exchange-dbinit.c
@@ -98,7 +98,7 @@ run (void *cls,
   if (1 <
       num_partitions)
   {
-    if (GNUNET_OK != plugin->setup_partitions (plugin->cls, &num_partitions))
+    if (GNUNET_OK != plugin->setup_partitions (plugin->cls, num_partitions))
     {
       GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                   "Could not setup partitions. Dropping default ones again\n");
diff --git a/src/exchangedb/plugin_exchangedb_postgres.c b/src/exchangedb/plugin_exchangedb_postgres.c
index 517792b9..b397728b 100644
--- a/src/exchangedb/plugin_exchangedb_postgres.c
+++ b/src/exchangedb/plugin_exchangedb_postgres.c
@@ -207,13 +207,13 @@ postgres_create_tables (void *cls)
  */
 static enum GNUNET_GenericReturnValue
 postgres_setup_partitions (void *cls,
-                           const uint32_t *num)
+                           const uint32_t num)
 {
   struct PostgresClosure *pg = cls;
   struct GNUNET_PQ_Context *conn;
   enum GNUNET_GenericReturnValue ret;
   struct GNUNET_PQ_QueryParam params[] = {
-    GNUNET_PQ_query_param_uint32 (num),
+    GNUNET_PQ_query_param_uint32 (&num),
     GNUNET_PQ_query_param_end
   };
   struct GNUNET_PQ_PreparedStatement ps[] = {
diff --git a/src/include/taler_exchangedb_plugin.h b/src/include/taler_exchangedb_plugin.h
index a3c2e2ca..9841d45d 100644
--- a/src/include/taler_exchangedb_plugin.h
+++ b/src/include/taler_exchangedb_plugin.h
@@ -2242,7 +2242,7 @@ struct TALER_EXCHANGEDB_Plugin
    */
   enum GNUNET_GenericReturnValue
   (*setup_partitions)(void *cls,
-                      const uint32_t *num);
+                      const uint32_t num);
 
   /**
    * Start a transaction.
-- 
cgit v1.2.3