Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit39ebb94

Browse files
committed
Disallow partition key expressions that return pseudo-types.
This wasn't checked originally, but it should have been, becausein general pseudo-types can't be stored to and retrieved from disk.Notably, partition bound values of type "record" would not beinterpretable by another session.In v12 and HEAD, add another flag to CheckAttributeType's repertoireso that it can produce a specific error message for this case. That'sinfeasible in older branches without an ABI break, so fall back toa slightly-less-nicely-worded error message in v10 and v11.Problem noted by Amit Langote, though this patch is not his initialsolution. Back-patch to v10 where partitioning was introduced.Discussion:https://postgr.es/m/CA+HiwqFUzjfj9HEsJtYWcr1SgQ_=iCAvQ=O2Sx6aQxoDu4OiHw@mail.gmail.com
1 parentfc76958 commit39ebb94

File tree

5 files changed

+71
-14
lines changed

5 files changed

+71
-14
lines changed

‎src/backend/catalog/heap.c

Lines changed: 33 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -572,6 +572,10 @@ CheckAttributeNamesTypes(TupleDesc tupdesc, char relkind,
572572
* are reliably identifiable only within a session, since the identity info
573573
* may use a typmod that is only locally assigned. The caller is expected
574574
* to know whether these cases are safe.)
575+
*
576+
* flags can also control the phrasing of the error messages. If
577+
* CHKATYPE_IS_PARTKEY is specified, "attname" should be a partition key
578+
* column number as text, not a real column name.
575579
* --------------------------------
576580
*/
577581
void
@@ -598,10 +602,19 @@ CheckAttributeType(const char *attname,
598602
if (!((atttypid==ANYARRAYOID&& (flags&CHKATYPE_ANYARRAY))||
599603
(atttypid==RECORDOID&& (flags&CHKATYPE_ANYRECORD))||
600604
(atttypid==RECORDARRAYOID&& (flags&CHKATYPE_ANYRECORD))))
601-
ereport(ERROR,
602-
(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
603-
errmsg("column \"%s\" has pseudo-type %s",
604-
attname,format_type_be(atttypid))));
605+
{
606+
if (flags&CHKATYPE_IS_PARTKEY)
607+
ereport(ERROR,
608+
(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
609+
/* translator: first %s is an integer not a name */
610+
errmsg("partition key column %s has pseudo-type %s",
611+
attname,format_type_be(atttypid))));
612+
else
613+
ereport(ERROR,
614+
(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
615+
errmsg("column \"%s\" has pseudo-type %s",
616+
attname,format_type_be(atttypid))));
617+
}
605618
}
606619
elseif (att_typtype==TYPTYPE_DOMAIN)
607620
{
@@ -648,7 +661,7 @@ CheckAttributeType(const char *attname,
648661
CheckAttributeType(NameStr(attr->attname),
649662
attr->atttypid,attr->attcollation,
650663
containing_rowtypes,
651-
flags);
664+
flags& ~CHKATYPE_IS_PARTKEY);
652665
}
653666

654667
relation_close(relation,AccessShareLock);
@@ -679,11 +692,21 @@ CheckAttributeType(const char *attname,
679692
* useless, and it cannot be dumped, so we must disallow it.
680693
*/
681694
if (!OidIsValid(attcollation)&&type_is_collatable(atttypid))
682-
ereport(ERROR,
683-
(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
684-
errmsg("no collation was derived for column \"%s\" with collatable type %s",
685-
attname,format_type_be(atttypid)),
686-
errhint("Use the COLLATE clause to set the collation explicitly.")));
695+
{
696+
if (flags&CHKATYPE_IS_PARTKEY)
697+
ereport(ERROR,
698+
(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
699+
/* translator: first %s is an integer not a name */
700+
errmsg("no collation was derived for partition key column %s with collatable type %s",
701+
attname,format_type_be(atttypid)),
702+
errhint("Use the COLLATE clause to set the collation explicitly.")));
703+
else
704+
ereport(ERROR,
705+
(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
706+
errmsg("no collation was derived for column \"%s\" with collatable type %s",
707+
attname,format_type_be(atttypid)),
708+
errhint("Use the COLLATE clause to set the collation explicitly.")));
709+
}
687710
}
688711

689712
/*

‎src/backend/commands/tablecmds.c

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4899,8 +4899,8 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
48994899

49004900
/*
49014901
* Set all columns in the new slot to NULL initially, to ensure
4902-
* columns added as part of the rewrite are initialized to
4903-
*NULL.That is necessary as tab->newvals will not contain an
4902+
* columns added as part of the rewrite are initialized to NULL.
4903+
* That is necessary as tab->newvals will not contain an
49044904
* expression for columns with a NULL default, e.g. when adding a
49054905
* column without a default together with a column with a default
49064906
* requiring an actual rewrite.
@@ -15096,11 +15096,23 @@ ComputePartitionAttrs(ParseState *pstate, Relation rel, List *partParams, AttrNu
1509615096
{
1509715097
/* Expression */
1509815098
Node *expr = pelem->expr;
15099+
charpartattname[16];
1509915100

1510015101
Assert(expr != NULL);
1510115102
atttype = exprType(expr);
1510215103
attcollation = exprCollation(expr);
1510315104

15105+
/*
15106+
* The expression must be of a storable type (e.g., not RECORD).
15107+
* The test is the same as for whether a table column is of a safe
15108+
* type (which is why we needn't check for the non-expression
15109+
* case).
15110+
*/
15111+
snprintf(partattname, sizeof(partattname), "%d", attn + 1);
15112+
CheckAttributeType(partattname,
15113+
atttype, attcollation,
15114+
NIL, CHKATYPE_IS_PARTKEY);
15115+
1510415116
/*
1510515117
* Strip any top-level COLLATE clause. This ensures that we treat
1510615118
* "x COLLATE y" and "(x COLLATE y)" alike.

‎src/include/catalog/heap.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
/* flag bits for CheckAttributeType/CheckAttributeNamesTypes */
2323
#defineCHKATYPE_ANYARRAY0x01/* allow ANYARRAY */
2424
#defineCHKATYPE_ANYRECORD0x02/* allow RECORD and RECORD[] */
25+
#defineCHKATYPE_IS_PARTKEY0x04/* attname is part key # not column */
2526

2627
typedefstructRawColumnDefault
2728
{

‎src/test/regress/expected/create_table.out

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ CREATE TABLE partitioned (
375375
ERROR: cannot use subquery in partition key expression
376376
CREATE TABLE partitioned (
377377
a int
378-
) PARTITION BY RANGE (('a'));
378+
) PARTITION BY RANGE ((42));
379379
ERROR: cannot use constant expression as partition key
380380
CREATE FUNCTION const_func () RETURNS int AS $$ SELECT 1; $$ LANGUAGE SQL IMMUTABLE;
381381
CREATE TABLE partitioned (
@@ -402,6 +402,17 @@ CREATE TABLE partitioned (
402402
ERROR: cannot use system column "xmin" in partition key
403403
LINE 3: ) PARTITION BY RANGE (xmin);
404404
^
405+
-- cannot use pseudotypes
406+
CREATE TABLE partitioned (
407+
a int,
408+
b int
409+
) PARTITION BY RANGE (((a, b)));
410+
ERROR: partition key column 1 has pseudo-type record
411+
CREATE TABLE partitioned (
412+
a int,
413+
b int
414+
) PARTITION BY RANGE (a, ('unknown'));
415+
ERROR: partition key column 2 has pseudo-type unknown
405416
-- functions in key must be immutable
406417
CREATE FUNCTION immut_func (a int) RETURNS int AS $$ SELECT a + random()::int; $$ LANGUAGE SQL;
407418
CREATE TABLE partitioned (

‎src/test/regress/sql/create_table.sql

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ CREATE TABLE partitioned (
361361

362362
CREATETABLEpartitioned (
363363
aint
364-
) PARTITION BY RANGE (('a'));
364+
) PARTITION BY RANGE ((42));
365365

366366
CREATEFUNCTIONconst_func () RETURNSintAS $$SELECT1; $$ LANGUAGE SQL IMMUTABLE;
367367
CREATETABLEpartitioned (
@@ -384,6 +384,16 @@ CREATE TABLE partitioned (
384384
aint
385385
) PARTITION BY RANGE (xmin);
386386

387+
-- cannot use pseudotypes
388+
CREATETABLEpartitioned (
389+
aint,
390+
bint
391+
) PARTITION BY RANGE (((a, b)));
392+
CREATETABLEpartitioned (
393+
aint,
394+
bint
395+
) PARTITION BY RANGE (a, ('unknown'));
396+
387397
-- functions in key must be immutable
388398
CREATEFUNCTIONimmut_func (aint) RETURNSintAS $$SELECT a+ random()::int; $$ LANGUAGE SQL;
389399
CREATETABLEpartitioned (

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp