Horton
Menu

Re: ICU for global collation

Justin Pryzby <pryzby@telsasoft.com>

View thread
From: Justin Pryzby <pryzby@telsasoft.com>
To: Peter Eisentraut <peter.eisentraut@enterprisedb.com>
Cc: Julien Rouhaud <rjuju123@gmail.com>, pgsql-hackers@postgresql.org, Daniel Verite <daniel@manitou-mail.org>
Date: 2022-06-25T15:19:30Z
Lists: pgsql-hackers 
commit f2553d43060edb210b36c63187d52a632448e1d2 says >=1500 in a few places,
but in pg_upgrade says <=1500, which looks wrong for upgrades from v15.
I think it should say <= 1400.

On Wed, Feb 02, 2022 at 02:01:23PM +0100, Peter Eisentraut wrote:
> --- a/src/bin/pg_dump/pg_dump.c
> +++ b/src/bin/pg_dump/pg_dump.c
> @@ -2792,6 +2794,10 @@ dumpDatabase(Archive *fout)
>  		appendPQExpBuffer(dbQry, "datminmxid, ");
>  	else
>  		appendPQExpBuffer(dbQry, "0 AS datminmxid, ");
> +	if (fout->remoteVersion >= 150000)
> +		appendPQExpBuffer(dbQry, "datcollprovider, ");
> +	else
> +		appendPQExpBuffer(dbQry, "'c' AS datcollprovider, ");
>  	appendPQExpBuffer(dbQry,
>  					  "(SELECT spcname FROM pg_tablespace t WHERE t.oid = dattablespace) AS tablespace, "
>  					  "shobj_description(oid, 'pg_database') AS description "

> diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c
> index 69ef23119f..2a9ca0e389 100644
> --- a/src/bin/pg_upgrade/info.c
> +++ b/src/bin/pg_upgrade/info.c
> @@ -312,11 +312,20 @@ get_db_infos(ClusterInfo *cluster)
>  				i_spclocation;
>  	char		query[QUERY_ALLOC];
>  
>  	snprintf(query, sizeof(query),
> -			 "SELECT d.oid, d.datname, d.encoding, d.datcollate, d.datctype, "
> +			 "SELECT d.oid, d.datname, d.encoding, d.datcollate, d.datctype, ");
> +	if (GET_MAJOR_VERSION(old_cluster.major_version) <= 1500)
> +		snprintf(query + strlen(query), sizeof(query) - strlen(query),
> +				 "'c' AS datcollprovider, NULL AS daticucoll, ");
> +	else
> +		snprintf(query + strlen(query), sizeof(query) - strlen(query),
> +				 "datcollprovider, daticucoll, ");
> +	snprintf(query + strlen(query), sizeof(query) - strlen(query),
>  			 "pg_catalog.pg_tablespace_location(t.oid) AS spclocation "
>  			 "FROM pg_catalog.pg_database d "
>  			 " LEFT OUTER JOIN pg_catalog.pg_tablespace t "

> --- a/src/bin/psql/describe.c
> +++ b/src/bin/psql/describe.c
> @@ -896,6 +896,18 @@ listAllDbs(const char *pattern, bool verbose)
>  					  gettext_noop("Encoding"),
>  					  gettext_noop("Collate"),
>  					  gettext_noop("Ctype"));
> +	if (pset.sversion >= 150000)
> +		appendPQExpBuffer(&buf,
> +						  "       d.daticucoll as \"%s\",\n"
> +						  "       CASE d.datcollprovider WHEN 'c' THEN 'libc' WHEN 'i' THEN 'icu' END AS \"%s\",\n",
> +						  gettext_noop("ICU Collation"),
> +						  gettext_noop("Coll. Provider"));
> +	else
> +		appendPQExpBuffer(&buf,
> +						  "       d.datcollate as \"%s\",\n"
> +						  "       'libc' AS \"%s\",\n",
> +						  gettext_noop("ICU Collation"),
> +						  gettext_noop("Coll. Provider"));
>  	appendPQExpBufferStr(&buf, "       ");
>  	printACLColumn(&buf, "d.datacl");
>  	if (verbose)

> @@ -4617,6 +4629,15 @@ listCollations(const char *pattern, bool verbose, bool showSystem)
>  					  gettext_noop("Collate"),
>  					  gettext_noop("Ctype"));
>  
> +	if (pset.sversion >= 150000)
> +		appendPQExpBuffer(&buf,
> +						  ",\n       c.collicucoll AS \"%s\"",
> +						  gettext_noop("ICU Collation"));
> +	else
> +		appendPQExpBuffer(&buf,
> +						  ",\n       c.collcollate AS \"%s\"",
> +						  gettext_noop("ICU Collation"));
> +
>  	if (pset.sversion >= 100000)
>  		appendPQExpBuffer(&buf,
>  						  ",\n       CASE c.collprovider WHEN 'd' THEN 'default' WHEN 'c' THEN 'libc' WHEN 'i' THEN 'icu' END AS \"%s\"",

Commits

Same data as JSON: GET /api/v1/messages/:b64id/commits the thread's linked commits as JSON, with link sources. API reference →

  1. Add CHECK_FOR_INTERRUPTS while restoring changes during decoding.

  2. Improve ICU option handling in CREATE DATABASE

  3. Don't allow creation of database with ICU locale with unsupported encoding

  4. Make locale option behavior more consistent

  5. pg_dump: Dump colliculocale

  6. Remove further unwanted linker flags from perl_embed_ldflags

  7. Doc: document possible need to raise kernel's somaxconn limit.

  8. Reduce warnings with -Wshadow=compatible-local builds

  9. Remove redundant spaces in _outA_Expr() output

  10. Fix outdated --help message for postgres -f

  11. pg_upgrade: Fix version comparison for global ICU support

  12. Silence -Wmaybe-uninitialized compiler warning in dbcommands.c.

  13. Add option to use ICU as global locale provider

  14. DefineCollation() code cleanup

  15. Change collate and ctype fields to type text

  16. Call pg_newlocale_from_collation() also with default collation

  17. Use libc version as a collation version on glibc systems.

  18. Silence -Wmaybe-uninitialized compiler warnings in dbcommands.c.

  19. Make LC_COLLATE and LC_CTYPE database-level settings. Collation and