Merge branch 'master' of https://github.com/postgrespro/postgres_cluster

Author: knizhnik

.gitignore

@@ -39,6 +39,7 @@ lib*.pc
 /Debug/
 /Release/
 /tmp_install/
+<<<<<<< HEAD
 /contrib/mmts/tests/node*
 /install/
-/.vscode/
+/.vscode/

contrib/mmts/bgwpool.c

@@ -25,7 +25,7 @@ static void BgwPoolMainLoop(Datum arg)
     void* work;
 
     BackgroundWorkerUnblockSignals();
-	BackgroundWorkerInitializeConnection(pool->dbname, NULL);
+	BackgroundWorkerInitializeConnection(pool->dbname, pool->dbuser);
 
     while(true) { 
         PGSemaphoreLock(&pool->available);
@@ -63,7 +63,7 @@ static void BgwPoolMainLoop(Datum arg)
     }
 }
 
-void BgwPoolInit(BgwPool* pool, BgwPoolExecutor executor, char const* dbname, size_t queueSize, size_t nWorkers)
+void BgwPoolInit(BgwPool* pool, BgwPoolExecutor executor, char const* dbname,  char const* dbuser, size_t queueSize, size_t nWorkers)
 {
     pool->queue = (char*)ShmemAlloc(queueSize);
     pool->executor = executor;
@@ -80,7 +80,8 @@ void BgwPoolInit(BgwPool* pool, BgwPoolExecutor executor, char const* dbname, si
     pool->pending = 0;
 	pool->nWorkers = nWorkers;
 	pool->lastPeakTime = 0;
-    strcpy(pool->dbname, dbname);
+	strncpy(pool->dbname, dbname, MAX_DBNAME_LEN);
+	strncpy(pool->dbuser, dbuser, MAX_DBUSER_LEN);
 }
 
 timestamp_t BgwGetLastPeekTime(BgwPool* pool)
@@ -98,7 +99,7 @@ void BgwPoolStart(int nWorkers, BgwPoolConstructor constructor)
 	worker.bgw_start_time = BgWorkerStart_ConsistentState;
 	worker.bgw_main = BgwPoolMainLoop;
 	worker.bgw_restart_time = MULTIMASTER_BGW_RESTART_TIMEOUT;
-    
+
     for (i = 0; i < nWorkers; i++) { 
         BgwPoolExecutorCtx* ctx = (BgwPoolExecutorCtx*)malloc(sizeof(BgwPoolExecutorCtx));
         snprintf(worker.bgw_name, BGW_MAXLEN, "bgw_pool_worker_%d", i+1);

contrib/mmts/bgwpool.h

@@ -10,6 +10,7 @@ typedef void(*BgwPoolExecutor)(int id, void* work, size_t size);
 typedef uint64 timestamp_t;
 
 #define MAX_DBNAME_LEN 30
+#define MAX_DBUSER_LEN 30
 #define MULTIMASTER_BGW_RESTART_TIMEOUT 1 /* seconds */
 
 extern timestamp_t MtmGetSystemTime(void);   /* non-adjusted current system time */
@@ -30,14 +31,15 @@ typedef struct
 	time_t lastPeakTime;
     bool   producerBlocked;
     char   dbname[MAX_DBNAME_LEN];
+	char   dbuser[MAX_DBUSER_LEN];
     char*  queue;
 } BgwPool;
 
 typedef BgwPool*(*BgwPoolConstructor)(void);
 
 extern void BgwPoolStart(int nWorkers, BgwPoolConstructor constructor);
 
-extern void BgwPoolInit(BgwPool* pool, BgwPoolExecutor executor, char const* dbname, size_t queueSize, size_t nWorkers);
+extern void BgwPoolInit(BgwPool* pool, BgwPoolExecutor executor, char const* dbname, char const* dbuser, size_t queueSize, size_t nWorkers);
 
 extern void BgwPoolExecute(BgwPool* pool, void* work, size_t size);
 

contrib/mmts/multimaster--1.0.sql

@@ -13,9 +13,10 @@ CREATE FUNCTION mtm.drop_node(node integer, drop_slot bool default false) RETURN
 AS 'MODULE_PATHNAME','mtm_drop_node'
 LANGUAGE C;
 
-CREATE FUNCTION mtm.add_node(conn_str cstring) RETURNS void
-AS 'MODULE_PATHNAME','mtm_add_node'
-LANGUAGE C;
+-- -- XXX: cstring as an argument breaks sanity check
+-- CREATE FUNCTION mtm.add_node(conn_str cstring) RETURNS void
+-- AS 'MODULE_PATHNAME','mtm_add_node'
+-- LANGUAGE C;
 
 -- Create replication slot for the node which was previously dropped together with it's slot 
 CREATE FUNCTION mtm.recover_node(node integer) RETURNS void
@@ -69,7 +70,7 @@ CREATE FUNCTION mtm.inject_2pc_error(stage integer) RETURNS void
 AS 'MODULE_PATHNAME','mtm_inject_2pc_error'
 LANGUAGE C;
 
-CREATE TABLE IF NOT EXISTS mtm.ddl_log (issued timestamp with time zone not null, query text);
+-- CREATE TABLE IF NOT EXISTS public.ddl_log (issued timestamp with time zone not null, query text);
 
-CREATE TABLE IF NOT EXISTS mtm.local_tables(rel_schema text, rel_name text, primary key(rel_schema, rel_name));
+-- CREATE TABLE IF NOT EXISTS mtm.local_tables(rel_schema text, rel_name text, primary key(rel_schema, rel_name));