pg.ddx.io  pgsql-bugs@postgresql.org mailing list archive  
help / color / mirror / Atom feed
From: Dmitry Dolgov <9erthalion6@gmail.com>
To: Michael Paquier <michael@paquier.xyz>
Cc: exclusion@gmail.com
Cc: pgsql-bugs@lists.postgresql.org
Subject: Re: BUG #16325: Assert failure on partitioning by int for a text value with a collation
Date: Fri, 3 Apr 2020 17:29:10 +0200
Message-ID: <20200403152910.rsdc2yg7bisqaltb@localhost> (raw)
In-Reply-To: <20200402020150.GA2803@paquier.xyz>
References: <16325-809194cf742313ab@postgresql.org>
	<20200328125303.4me6vetvzgebobw5@localhost>
	<20200401070842.GD142683@paquier.xyz>
	<20200401120117.qkmjxi3xrumbnd3s@localhost>
	<20200402020150.GA2803@paquier.xyz>

> On Thu, Apr 02, 2020 at 11:01:50AM +0900, Michael Paquier wrote:
>
> > +		/*
> > +		 * No need to check if exprCollOid is invalid, since if it would be,
> > +		 * then transformCollateClause will throw an error earlier
> > +		 */
> > +		if (!type_is_collatable(colType))
> > +			ereport(ERROR,
> > +					(errcode(ERRCODE_DATATYPE_MISMATCH),
> > +					 errmsg("collations are not supported by type %s",
> > +							format_type_be(colType))));
> > +
> >
> >  		if (OidIsValid(exprCollOid) &&
> >  			exprCollOid != DEFAULT_COLLATION_OID &&
> >  			exprCollOid != partCollation)
>
> Another point that could be made is that as we know that we are in the
> presence of a CollateExpr() here, and exprCollOid will never be
> InvalidOid.  So there could be a point in using an assertion instead
> of the check done below making sure that exprCollOid is always valid?

Thanks for the suggestion. It's not strictly related to the fix I guess,
but of course you're right, and we can indeed improve this part and
replace the check with an assert.

Attachments:

part_value_collations_v3.patch (text/x-diff, 2.3K) download diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c index c1911411d0..1468fd2460 100644 --- a/src/backend/parser/parse_utilcmd.c +++ b/src/backend/parser/parse_utilcmd.c @@ -4069,8 +4069,18 @@ transformPartitionBoundValue(ParseState *pstate, Node *val, { Oid exprCollOid = exprCollation(value); - if (OidIsValid(exprCollOid) && - exprCollOid != DEFAULT_COLLATION_OID && + /* + * No need to check if exprCollOid is invalid, since if it would be, + * then transformCollateClause will throw an error earlier + */ + if (!type_is_collatable(colType)) + ereport(ERROR, + (errcode(ERRCODE_DATATYPE_MISMATCH), + errmsg("collations are not supported by type %s", + format_type_be(colType)))); + + Assert(OidIsValid(exprCollOid)); + if (exprCollOid != DEFAULT_COLLATION_OID && exprCollOid != partCollation) ereport(ERROR, (errcode(ERRCODE_DATATYPE_MISMATCH), diff --git a/src/test/regress/expected/create_table.out b/src/test/regress/expected/create_table.out index c5e95edbed..abd1bfe2b9 100644 --- a/src/test/regress/expected/create_table.out +++ b/src/test/regress/expected/create_table.out @@ -594,6 +594,8 @@ CREATE TABLE list_parted ( CREATE TABLE part_p1 PARTITION OF list_parted FOR VALUES IN ('1'); CREATE TABLE part_p2 PARTITION OF list_parted FOR VALUES IN (2); CREATE TABLE part_p3 PARTITION OF list_parted FOR VALUES IN ((2+1)); +CREATE TABLE part_p4 PARTITION OF list_parted FOR VALUES IN ('1' collate "POSIX"); +ERROR: collations are not supported by type integer CREATE TABLE part_null PARTITION OF list_parted FOR VALUES IN (null); \d+ list_parted Partitioned table "public.list_parted" diff --git a/src/test/regress/sql/create_table.sql b/src/test/regress/sql/create_table.sql index 00ef81a685..3fe77a7711 100644 --- a/src/test/regress/sql/create_table.sql +++ b/src/test/regress/sql/create_table.sql @@ -522,6 +522,7 @@ CREATE TABLE list_parted ( CREATE TABLE part_p1 PARTITION OF list_parted FOR VALUES IN ('1'); CREATE TABLE part_p2 PARTITION OF list_parted FOR VALUES IN (2); CREATE TABLE part_p3 PARTITION OF list_parted FOR VALUES IN ((2+1)); +CREATE TABLE part_p4 PARTITION OF list_parted FOR VALUES IN ('1' collate "POSIX"); CREATE TABLE part_null PARTITION OF list_parted FOR VALUES IN (null); \d+ list_parted

view thread (9+ messages)  latest in thread

Message-ID: <20200403152910.rsdc2yg7bisqaltb@localhost>
Permalink:  ../20200403152910.rsdc2yg7bisqaltb@localhost/
Also on:    postgresql.org/message-id/20200403152910.rsdc2yg7bisqaltb@localhost

 ·  · 

reply

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: pgsql-bugs@postgresql.org
  Cc: 9erthalion6@gmail.com, michael@paquier.xyz, exclusion@gmail.com, pgsql-bugs@lists.postgresql.org
  Subject: Re: BUG #16325: Assert failure on partitioning by int for a text value with a collation
  In-Reply-To: <20200403152910.rsdc2yg7bisqaltb@localhost>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox