Merge branch 'PGPROEE10_MULTIMASTER' of https://gitlab.postgrespro.ru/pgpro-dev/postgrespro into PGPROEE10_MULTIMASTER

Author: knizhnik

configure

@@ -2788,7 +2788,7 @@ fi
 
 
 
-PGPRO_VERSION="$PACKAGE_VERSION.1"
+PGPRO_VERSION="$PACKAGE_VERSION.3"
 PGPRO_PACKAGE_NAME="PostgresPro"
 PGPRO_EDITION="enterprise"
 PGPRO_EDN="ent"

configure.in

@@ -39,7 +39,7 @@ PGAC_ARG_REQ(with, extra-version, [STRING], [append STRING to version],
              [PG_VERSION="$PACKAGE_VERSION$withval"],
              [PG_VERSION="$PACKAGE_VERSION"])
 
-PGPRO_VERSION="$PACKAGE_VERSION.1"
+PGPRO_VERSION="$PACKAGE_VERSION.3"
 PGPRO_PACKAGE_NAME="PostgresPro"
 PGPRO_EDITION="enterprise"
 PGPRO_EDN="ent"

contrib/mchar/Makefile

@@ -4,7 +4,10 @@ OBJS = mchar_io.o mchar_proc.o mchar_op.o mchar_recode.o \
 EXTENSION = mchar
 DATA = mchar--1.0.sql
 DOCS = README.mchar
-REGRESS = init mchar mvarchar mm like compat
+REGRESS = init mchar mvarchar like
+ifndef NO_LOCALE
+REGRESS += mm compat
+endif
 PGFIELDDESC = "mchar - mchar type implementation"
 
 ifdef USE_PGXS

contrib/mchar/expected/mm.out

@@ -803,3 +803,44 @@ SELECT * FROM a, c WHERE mvarchar255 = mchar2;
 
 DROP TABLE a;
 DROP TABLE c;
+select * from (values ('е'::mchar),('ё'),('еа'),('еб'),('ее'),('еж'),('ёа'),('ёб'),('ёё'),('ёж'),('ёе'),('её')) z order by 1;
+ column1 
+---------
+ е
+ еа
+ еб
+ ее
+ её
+ еж
+ ё
+ ёа
+ ёб
+ ёе
+ ёё
+ ёж
+(12 rows)
+
+select mvarchar_icase_cmp('ё', 'е');
+ mvarchar_icase_cmp 
+--------------------
+                  1
+(1 row)
+
+select mvarchar_icase_cmp('Ё', 'Е');
+ mvarchar_icase_cmp 
+--------------------
+                  1
+(1 row)
+
+select mvarchar_icase_cmp('й', 'и');
+ mvarchar_icase_cmp 
+--------------------
+                  1
+(1 row)
+
+select mvarchar_icase_cmp('Й', 'И');
+ mvarchar_icase_cmp 
+--------------------
+                  1
+(1 row)
+

contrib/mchar/mchar_recode.c

@@ -31,6 +31,7 @@ createUObjs() {
 			elog(ERROR,"ICU ucol_open returns %d (%s)", err,  u_errorName(err));
 		}
 
+		/* UCOL_PRIMARY doesn't distinguish И & Й, Е & Ё */
 		ucol_setStrength( colCaseInsensitive, UCOL_SECONDARY );
 	}
 
@@ -114,29 +115,49 @@ FillWhiteSpace( UChar *dst, int n ) {
 int 
 UCharCaseCompare(UChar * a, int alen, UChar *b, int blen) {
 	int len = Min(alen, blen);
-	int res;
+	int i, res;
 
 	createUObjs();
 
-	res = (int)ucol_strcoll( colCaseInsensitive,
-							  a, len,
-							  b, len);
-	if ( res == 0 && alen != blen )
+	/*
+	 * Preventing any influence of following characters to
+	 * current one, try
+	 * select * from (values ('е'::mchar),('ё'),('еа'),('еб'),('ее'),('еж'),
+	 *						 ('ёа'),('ёб'),('ёё'),('ёж'),('ёе'),('её')) z
+	 * order by 1;
+	 */
+	for (i=0; i<len; i++)
+	{
+		res = (int)ucol_strcoll(colCaseInsensitive,
+								a + i, 1,
+								b + i, 1);
+		if (res)
+			return res;
+	}
+
+	if (alen != blen)
 		return (alen > blen) ? 1 : - 1;
-	return res;
+	return 0;
 }
 
 int 
 UCharCompare(UChar * a, int alen, UChar *b, int blen) {
 	int len = Min(alen, blen);
-	int res;
+	int i, res;
 
 	createUObjs();
 
-	res =  (int)ucol_strcoll( colCaseSensitive,
-							  a, len,
-							  b, len);
-	if ( res == 0 && alen != blen )
+	/* see above */
+	for (i=0; i<len; i++)
+	{
+		res = (int)ucol_strcoll(colCaseSensitive,
+								a + i, 1,
+								b + i, 1);
+		if (res)
+			return res;
+	}
+
+	if (alen != blen)
 		return (alen > blen) ? 1 : - 1;
-	return res;
+	return 0;
 }

contrib/mchar/sql/mm.sql

@@ -183,3 +183,8 @@ SELECT * FROM a, c WHERE mvarchar255 = mchar2;
 DROP TABLE a;
 DROP TABLE c;
 
+select * from (values ('е'::mchar),('ё'),('еа'),('еб'),('ее'),('еж'),('ёа'),('ёб'),('ёё'),('ёж'),('ёе'),('её')) z order by 1;
+select mvarchar_icase_cmp('ё', 'е');
+select mvarchar_icase_cmp('Ё', 'Е');
+select mvarchar_icase_cmp('й', 'и');
+select mvarchar_icase_cmp('Й', 'И');

contrib/mmts/bgwpool.c

@@ -26,7 +26,7 @@ void BgwPoolDynamicWorkerMainLoop(Datum arg);
 
 static void BgwShutdownWorker(int sig)
 {
-	MTM_LOG1("Background worker %d receive shutdown request", MyProcPid);
+	MTM_LOG1("Background worker %d received shutdown request", MyProcPid);
 	if (MtmPool) { 
 		BgwPoolStop(MtmPool);
 	}
@@ -137,16 +137,15 @@ timestamp_t BgwGetLastPeekTime(BgwPool* pool)
 
 void BgwPoolStaticWorkerMainLoop(Datum arg)
 {
-	BgwPoolConstructor constructor = (BgwPoolConstructor)DatumGetPointer(arg);
-    BgwPoolMainLoop(constructor());
+	BgwPoolMainLoop((BgwPool*)DatumGetPointer(arg));
 }
 
 void BgwPoolDynamicWorkerMainLoop(Datum arg)
 {
-    BgwPoolMainLoop((BgwPool*)DatumGetPointer(arg));
+	BgwPoolMainLoop((BgwPool*)DatumGetPointer(arg));
 }
 
-void BgwPoolStart(int nWorkers, BgwPoolConstructor constructor)
+void BgwPoolStart(BgwPool* pool, char *poolName)
 {
     int i;
 	BackgroundWorker worker;
@@ -158,9 +157,12 @@ void BgwPoolStart(int nWorkers, BgwPoolConstructor constructor)
 	sprintf(worker.bgw_function_name, "BgwPoolStaticWorkerMainLoop");
 	worker.bgw_restart_time = MULTIMASTER_BGW_RESTART_TIMEOUT;
 
-    for (i = 0; i < nWorkers; i++) { 
-        snprintf(worker.bgw_name, BGW_MAXLEN, "bgw_pool_worker_%d", i+1);
-        worker.bgw_main_arg = PointerGetDatum(constructor);
+	strncpy(pool->poolName, poolName, MAX_NAME_LEN);
+
+	for (i = 0; i < pool->nWorkers; i++)
+	{
+		snprintf(worker.bgw_name, BGW_MAXLEN, "%s_worker_%d", pool->poolName, i+1);
+		worker.bgw_main_arg = PointerGetDatum(pool);
         RegisterBackgroundWorker(&worker);
     }
 }
@@ -189,7 +191,7 @@ static void BgwStartExtraWorker(BgwPool* pool)
 			sprintf(worker.bgw_library_name, "multimaster");
 			sprintf(worker.bgw_function_name, "BgwPoolDynamicWorkerMainLoop");
 			worker.bgw_restart_time = MULTIMASTER_BGW_RESTART_TIMEOUT;
-			snprintf(worker.bgw_name, BGW_MAXLEN, "bgw_pool_dynworker_%d", (int)++pool->nWorkers);
+			snprintf(worker.bgw_name, BGW_MAXLEN, "%s-dynworker-%d", pool->poolName, (int)++pool->nWorkers);
 			worker.bgw_main_arg = PointerGetDatum(pool);
 			pool->lastDynamicWorkerStartTime = now;
 			if (!RegisterDynamicBackgroundWorker(&worker, &handle)) { 

contrib/mmts/bgwpool.h

@@ -13,6 +13,7 @@ typedef ulong64 timestamp_t;
 
 #define MAX_DBNAME_LEN 30
 #define MAX_DBUSER_LEN 30
+#define MAX_NAME_LEN 30
 #define MULTIMASTER_BGW_RESTART_TIMEOUT BGW_NEVER_RESTART /* seconds */
 
 extern timestamp_t MtmGetSystemTime(void);   /* non-adjusted current system time */
@@ -37,14 +38,15 @@ typedef struct
 	timestamp_t lastDynamicWorkerStartTime;
     bool   producerBlocked;
 	bool   shutdown;
+	char   poolName[MAX_NAME_LEN];
     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 BgwPoolStart(BgwPool* pool, char *poolName);
 
 extern void BgwPoolInit(BgwPool* pool, BgwPoolExecutor executor, char const* dbname, char const* dbuser, size_t queueSize, size_t nWorkers);
 

contrib/mmts/multimaster--1.0.sql

@@ -84,7 +84,7 @@ CREATE FUNCTION mtm.make_table_local(relation regclass) RETURNS void
 AS 'MODULE_PATHNAME','mtm_make_table_local'
 LANGUAGE C;
 
-CREATE FUNCTION mtm.broadcast_table(srcTable regclass, dstNodesMask bigint) RETURNS void
+CREATE FUNCTION mtm.broadcast_table(srcTable regclass) RETURNS void
 AS 'MODULE_PATHNAME','mtm_broadcast_table'
 LANGUAGE C;
 
@@ -112,9 +112,9 @@ CREATE FUNCTION mtm.referee_poll(xid bigint) RETURNS bigint
 AS 'MODULE_PATHNAME','mtm_referee_poll'
 LANGUAGE C;
 
-CREATE LOCAL TABLE IF NOT EXISTS mtm.local_tables(rel_schema name, rel_name name, primary key(rel_schema, rel_name));
+CREATE TABLE IF NOT EXISTS mtm.local_tables(rel_schema name, rel_name name, primary key(rel_schema, rel_name));
 
-CREATE LOCAL TABLE mtm.referee_decision(key text primary key not null, node_id int);
+CREATE TABLE mtm.referee_decision(key text primary key not null, node_id int);
 
 CREATE OR REPLACE FUNCTION mtm.alter_sequences() RETURNS boolean AS
 $$