bdr: fix: ensure to use the right format by using format constants now

Conflicts:
	contrib/bdr/bdr.c

diff --git a/contrib/bdr/bdr.c b/contrib/bdr/bdr.c
index 3f5dba4c4cca5cf3eef6e8ac7a50903d8d13c0eb..caa09f8ed218b188f75b7c83464241e47cd7a381 100644 (file)
--- a/contrib/bdr/bdr.c
+++ b/contrib/bdr/bdr.c
@@ -340,7 +340,7 @@ bdr_connect(char *conninfo_repl,
     * FIXME: This might truncate the identifier if replication_name is
     * somewhat longer...
     */
-   snprintf(NameStr(*slot_name), NAMEDATALEN, "bdr_%u_%s_%u_%u__%s",
+   snprintf(NameStr(*slot_name), NAMEDATALEN, BDR_SLOT_NAME_FORMAT,
             remote_dboid_i, local_sysid, ThisTimeLineID,
             MyDatabaseId, NameStr(replication_name));
    NameStr(*slot_name)[NAMEDATALEN - 1] = '\0';
@@ -349,7 +349,7 @@ bdr_connect(char *conninfo_repl,
     * Build replication identifier.
     */
    snprintf(remote_ident, remote_ident_length,
-            "bdr_"UINT64_FORMAT"_%u_%u_%u_%s",
+            BDR_NODE_ID_FORMAT,
             *remote_sysid_i, *remote_tlid_i, remote_dboid_i, MyDatabaseId,
             NameStr(replication_name));
 

diff --git a/contrib/bdr/bdr.h b/contrib/bdr/bdr.h
index 2108a02404c91fec9af5a5687f1dcb034ca3ecdc..0b6afd2a6d3a4bd7642035bf04fae6368bce20c9 100644 (file)
--- a/contrib/bdr/bdr.h
+++ b/contrib/bdr/bdr.h
@@ -15,6 +15,8 @@
 #include "utils/resowner.h"
 
 #define BDR_VERSION_NUM 500
+#define BDR_SLOT_NAME_FORMAT "bdr_%u_%s_%u_%u__%s"
+#define BDR_NODE_ID_FORMAT "bdr_"UINT64_FORMAT"_%u_%u_%u_%s"
 
 /*
  * BdrApplyWorker describes a BDR worker connection.

diff --git a/contrib/bdr/bdr_apply.c b/contrib/bdr/bdr_apply.c
index f8c1bcef556b6ca21207b659bc402be4beaa40a9..4c4fe02e102a68365de4cc2cc3e96c733701d01a 100644 (file)
--- a/contrib/bdr/bdr_apply.c
+++ b/contrib/bdr/bdr_apply.c
@@ -665,7 +665,7 @@ fetch_sysid_via_node_id(RepNodeId node_id, uint64 *sysid, TimeLineID *tli)
 
        ident = text_to_cstring(&node_class->riname);
 
-       if (sscanf(ident, "bdr: "UINT64_FORMAT"-%u-%u-%u:%s",
+       if (sscanf(ident, BDR_NODE_ID_FORMAT,
                   &remote_sysid, &remote_tli, &remote_dboid, &local_dboid,
                   NameStr(replication_name)) != 4)
            elog(ERROR, "could not parse sysid: %s", ident);