Merge branch 'PGPROEE10' into PGPROEE10_MULTIMASTER_stable

Author: vbwagner

configure

@@ -2788,7 +2788,7 @@ fi
 
 
 
-PGPRO_VERSION="$PACKAGE_VERSION.1"
+PGPRO_VERSION="$PACKAGE_VERSION.2"
 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.2"
 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/pg_probackup/README.md

@@ -42,6 +42,24 @@ Regardless of the chosen backup type, all backups taken with `pg_probackup` supp
 * Configuration files outside of PostgreSQL data directory are not included into the backup and should be backed up separately.
 
 ## Installation and Setup
+### Linux Installation
+```shell
+#DEB Ubuntu|Debian Packages
+echo "deb [arch=amd64] http://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" > /etc/apt/sources.list.d/pg_probackup.list
+wget -O - http://repo.postgrespro.ru/pg_probackup/keys/GPG-KEY-PG_PROBACKUP | apt-key add - && apt-get update
+apt-get install pg-probackup-(10|9.6|9.5)
+
+#DEB-SRC Packages
+echo "deb-src [arch=amd64] http://repo.postgrespro.ru/pg_probackup/deb/ $(lsb_release -cs) main-$(lsb_release -cs)" >>\
+  /etc/apt/sources.list.d/pg_probackup.list
+
+#RPM Centos Packages
+rpm -ivh http://repo.postgrespro.ru/pg_probackup/keys/pg_probackup-repo-centos.noarch.rpm
+yum install pg_probackup-(10|9.6|9.5)
+
+#SRPM Centos Packages
+yumdownloader --source pg_probackup-(10|9.6|9.5)
+```
 
 To compile `pg_probackup`, you must have a PostgreSQL installation and raw source tree. To install `pg_probackup`, execute this in the module's directory:
 

contrib/pg_probackup/src/archive.c

@@ -63,9 +63,10 @@ do_archive_push(char *wal_file_path, char *wal_file_name, bool overwrite)
 
 	elog(INFO, "pg_probackup archive-push from %s to %s", absolute_wal_file_path, backup_wal_file_path);
 
-#ifdef HAVE_LIBZ
 	if (compress_alg == PGLZ_COMPRESS)
 		elog(ERROR, "pglz compression is not supported");
+
+#ifdef HAVE_LIBZ
 	if (compress_alg == ZLIB_COMPRESS)
 		is_compress = IsXLogFileName(wal_file_name);
 #endif