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

Commitfe30e7e

Browse files
committed
Allow ALTER TYPE to change some properties of a base type.
Specifically, this patch allows ALTER TYPE to:* Change the default TOAST strategy for a toastable base type;* Promote a non-toastable type to toastable;* Add/remove binary I/O functions for a type;* Add/remove typmod I/O functions for a type;* Add/remove a custom ANALYZE statistics functions for a type.The first of these can be done by the type's owner; all the othersrequire superuser privilege since misuse could cause problems.The main motivation for this patch is to allow extensions toupgrade the feature sets of their data types, so the set ofalterable properties is biased towards that use-case. Howeverit's also true that changing some other properties would bea lot harder, as they get baked into physical storage and/orstored expressions that depend on the type.Along the way, refactor GenerateTypeDependencies() to make it easierto call, refactor DefineType's volatility checks so they can be sharedby AlterType, and teach typcache.c that it might have to reload datafrom the type's pg_type row, a scenario it never handled before.Also rearrange alter_type.sgml a bit for clarity (put thecomposite-type operations together).Tomas Vondra and Tom LaneDiscussion:https://postgr.es/m/20200228004440.b23ein4qvmxnlpht@development
1 parentaddd034 commitfe30e7e

File tree

17 files changed

+958
-137
lines changed

17 files changed

+958
-137
lines changed

‎doc/src/sgml/catalogs.sgml

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7828,28 +7828,38 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</replaceable>:<replaceable>&l
78287828
types (those with <structfield>typlen</structfield> = -1) if
78297829
the type is prepared for toasting and what the default strategy
78307830
for attributes of this type should be.
7831-
Possible values are
7831+
Possible values are:
78327832
<itemizedlist>
78337833
<listitem>
7834-
<para><literal>p</literal>: Value must always be stored plain.</para>
7834+
<para>
7835+
<literal>p</literal> (plain): Values must always be stored plain
7836+
(non-varlena types always use this value).
7837+
</para>
78357838
</listitem>
78367839
<listitem>
78377840
<para>
7838-
<literal>e</literal>: Value can be stored in a <quote>secondary</quote>
7839-
relation (if relation has one, see
7841+
<literal>e</literal> (external): Values can be stored in a
7842+
secondary <quote>TOAST</quote>relation (if relation has one, see
78407843
<literal>pg_class.reltoastrelid</literal>).
78417844
</para>
78427845
</listitem>
78437846
<listitem>
7844-
<para><literal>m</literal>: Value can be stored compressed inline.</para>
7847+
<para>
7848+
<literal>m</literal> (main): Values can be compressed and stored
7849+
inline.
7850+
</para>
78457851
</listitem>
78467852
<listitem>
7847-
<para><literal>x</literal>: Value can be stored compressed inline or stored in <quote>secondary</quote> storage.</para>
7853+
<para>
7854+
<literal>x</literal> (extended): Values can be compressed and/or
7855+
moved to a secondary relation.
7856+
</para>
78487857
</listitem>
78497858
</itemizedlist>
7850-
Note that <literal>m</literal> columns can also be moved out to secondary
7851-
storage, but only as a last resort (<literal>e</literal> and <literal>x</literal> columns are
7852-
moved first).
7859+
<literal>x</literal> is the usual choice for toast-able types.
7860+
Note that <literal>m</literal> values can also be moved out to
7861+
secondary storage, but only as a last resort (<literal>e</literal>
7862+
and <literal>x</literal> values are moved first).
78537863
</para></entry>
78547864
</row>
78557865

‎doc/src/sgml/ref/alter_type.sgml

Lines changed: 133 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@ PostgreSQL documentation
2323

2424
<refsynopsisdiv>
2525
<synopsis>
26-
ALTER TYPE <replaceable class="parameter">name</replaceable> <replaceable class="parameter">action</replaceable> [, ... ]
2726
ALTER TYPE <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
28-
ALTER TYPE <replaceable class="parameter">name</replaceable> RENAME ATTRIBUTE <replaceable class="parameter">attribute_name</replaceable> TO <replaceable class="parameter">new_attribute_name</replaceable> [ CASCADE | RESTRICT ]
2927
ALTER TYPE <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable>
3028
ALTER TYPE <replaceable class="parameter">name</replaceable> SET SCHEMA <replaceable class="parameter">new_schema</replaceable>
29+
ALTER TYPE <replaceable class="parameter">name</replaceable> RENAME ATTRIBUTE <replaceable class="parameter">attribute_name</replaceable> TO <replaceable class="parameter">new_attribute_name</replaceable> [ CASCADE | RESTRICT ]
30+
ALTER TYPE <replaceable class="parameter">name</replaceable> <replaceable class="parameter">action</replaceable> [, ... ]
3131
ALTER TYPE <replaceable class="parameter">name</replaceable> ADD VALUE [ IF NOT EXISTS ] <replaceable class="parameter">new_enum_value</replaceable> [ { BEFORE | AFTER } <replaceable class="parameter">neighbor_enum_value</replaceable> ]
3232
ALTER TYPE <replaceable class="parameter">name</replaceable> RENAME VALUE <replaceable class="parameter">existing_enum_value</replaceable> TO <replaceable class="parameter">new_enum_value</replaceable>
33+
ALTER TYPE <replaceable class="parameter">name</replaceable> SET ( <replaceable class="parameter">property</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )
3334

3435
<phrase>where <replaceable class="parameter">action</replaceable> is one of:</phrase>
3536

@@ -48,60 +49,69 @@ ALTER TYPE <replaceable class="parameter">name</replaceable> RENAME VALUE <repla
4849

4950
<variablelist>
5051
<varlistentry>
51-
<term><literal>ADD ATTRIBUTE</literal></term>
52+
<term><literal>OWNER</literal></term>
5253
<listitem>
5354
<para>
54-
This form adds a new attribute to a composite type, using the same syntax as
55-
<xref linkend="sql-createtype"/>.
55+
This form changes the owner of the type.
5656
</para>
5757
</listitem>
5858
</varlistentry>
5959

6060
<varlistentry>
61-
<term><literal>DROP ATTRIBUTE [ IF EXISTS ]</literal></term>
61+
<term><literal>RENAME</literal></term>
6262
<listitem>
6363
<para>
64-
This form drops an attribute from a composite type.
65-
If <literal>IF EXISTS</literal> is specified and the attribute
66-
does not exist, no error is thrown. In this case a notice
67-
is issued instead.
64+
This form changes the name of the type.
6865
</para>
6966
</listitem>
7067
</varlistentry>
7168

7269
<varlistentry>
73-
<term><literal>SETDATA TYPE</literal></term>
70+
<term><literal>SETSCHEMA</literal></term>
7471
<listitem>
7572
<para>
76-
This formchanges the typeof an attribute of a composite type.
73+
This formmoves the typeinto another schema.
7774
</para>
7875
</listitem>
7976
</varlistentry>
8077

8178
<varlistentry>
82-
<term><literal>OWNER</literal></term>
79+
<term><literal>RENAME ATTRIBUTE</literal></term>
8380
<listitem>
8481
<para>
85-
This form changes the owner of the type.
82+
This form is only usable with composite types.
83+
It changes the name of an individual attribute of the type.
8684
</para>
8785
</listitem>
8886
</varlistentry>
8987

9088
<varlistentry>
91-
<term><literal>RENAME</literal></term>
89+
<term><literal>ADD ATTRIBUTE</literal></term>
9290
<listitem>
9391
<para>
94-
This formchanges the name of thetype or thename of an
95-
individual attribute of a composite type.
92+
This formadds a new attribute to a compositetype, using thesame syntax as
93+
<xref linkend="sql-createtype"/>.
9694
</para>
9795
</listitem>
9896
</varlistentry>
9997

10098
<varlistentry>
101-
<term><literal>SET SCHEMA</literal></term>
99+
<term><literal>DROP ATTRIBUTE [ IF EXISTS ]</literal></term>
102100
<listitem>
103101
<para>
104-
This form moves the type into another schema.
102+
This form drops an attribute from a composite type.
103+
If <literal>IF EXISTS</literal> is specified and the attribute
104+
does not exist, no error is thrown. In this case a notice
105+
is issued instead.
106+
</para>
107+
</listitem>
108+
</varlistentry>
109+
110+
<varlistentry>
111+
<term><literal>ALTER ATTRIBUTE ... SET DATA TYPE</literal></term>
112+
<listitem>
113+
<para>
114+
This form changes the type of an attribute of a composite type.
105115
</para>
106116
</listitem>
107117
</varlistentry>
@@ -135,6 +145,84 @@ ALTER TYPE <replaceable class="parameter">name</replaceable> RENAME VALUE <repla
135145
</para>
136146
</listitem>
137147
</varlistentry>
148+
149+
<varlistentry>
150+
<term>
151+
<literal>SET ( <replaceable class="parameter">property</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )</literal>
152+
</term>
153+
<listitem>
154+
<para>
155+
This form is only applicable to base types. It allows adjustment of a
156+
subset of the base-type properties that can be set in <command>CREATE
157+
TYPE</command>. Specifically, these properties can be changed:
158+
<itemizedlist>
159+
<listitem>
160+
<para>
161+
<literal>RECEIVE</literal> can be set to the name of a binary input
162+
function, or <literal>NONE</literal> to remove the type's binary
163+
input function. Using this option requires superuser privilege.
164+
</para>
165+
</listitem>
166+
<listitem>
167+
<para>
168+
<literal>SEND</literal> can be set to the name of a binary output
169+
function, or <literal>NONE</literal> to remove the type's binary
170+
output function. Using this option requires superuser privilege.
171+
</para>
172+
</listitem>
173+
<listitem>
174+
<para>
175+
<literal>TYPMOD_IN</literal> can be set to the name of a type
176+
modifier input function, or <literal>NONE</literal> to remove the
177+
type's type modifier input function. Using this option requires
178+
superuser privilege.
179+
</para>
180+
</listitem>
181+
<listitem>
182+
<para>
183+
<literal>TYPMOD_OUT</literal> can be set to the name of a type
184+
modifier output function, or <literal>NONE</literal> to remove the
185+
type's type modifier output function. Using this option requires
186+
superuser privilege.
187+
</para>
188+
</listitem>
189+
<listitem>
190+
<para>
191+
<literal>ANALYZE</literal> can be set to the name of a type-specific
192+
statistics collection function, or <literal>NONE</literal> to remove
193+
the type's statistics collection function. Using this option
194+
requires superuser privilege.
195+
</para>
196+
</listitem>
197+
<listitem>
198+
<para>
199+
<literal>STORAGE</literal><indexterm>
200+
<primary>TOAST</primary>
201+
<secondary>per-type storage settings</secondary>
202+
</indexterm>
203+
can be set to <literal>plain</literal>,
204+
<literal>extended</literal>, <literal>external</literal>,
205+
or <literal>main</literal> (see <xref linkend="storage-toast"/> for
206+
more information about what these mean). However, changing
207+
from <literal>plain</literal> to another setting requires superuser
208+
privilege (because it requires that the type's C functions all be
209+
TOAST-ready), and changing to <literal>plain</literal> from another
210+
setting is not allowed at all (since the type may already have
211+
TOASTed values present in the database). Note that changing this
212+
option doesn't by itself change any stored data, it just sets the
213+
default TOAST strategy to be used for table columns created in the
214+
future. See <xref linkend="sql-altertable"/> to change the TOAST
215+
strategy for existing table columns.
216+
</para>
217+
</listitem>
218+
</itemizedlist>
219+
See <xref linkend="sql-createtype"/> for more details about these
220+
type properties. Note that where appropriate, a change in these
221+
properties for a base type will be propagated automatically to domains
222+
based on that type.
223+
</para>
224+
</listitem>
225+
</varlistentry>
138226
</variablelist>
139227
</para>
140228

@@ -156,7 +244,7 @@ ALTER TYPE <replaceable class="parameter">name</replaceable> RENAME VALUE <repla
156244
doesn't do anything you couldn't do by dropping and recreating the type.
157245
However, a superuser can alter ownership of any type anyway.)
158246
To add an attribute or alter an attribute type, you must also
159-
have <literal>USAGE</literal> privilege on the data type.
247+
have <literal>USAGE</literal> privilege on theattribute'sdata type.
160248
</para>
161249
</refsect1>
162250

@@ -262,6 +350,16 @@ ALTER TYPE <replaceable class="parameter">name</replaceable> RENAME VALUE <repla
262350
</listitem>
263351
</varlistentry>
264352

353+
<varlistentry>
354+
<term><replaceable class="parameter">property</replaceable></term>
355+
<listitem>
356+
<para>
357+
The name of a base-type property to be modified; see above for
358+
possible values.
359+
</para>
360+
</listitem>
361+
</varlistentry>
362+
265363
<varlistentry>
266364
<term><literal>CASCADE</literal></term>
267365
<listitem>
@@ -336,7 +434,7 @@ ALTER TYPE email SET SCHEMA customers;
336434
</para>
337435

338436
<para>
339-
To add a new attribute to a type:
437+
To add a new attribute to acompositetype:
340438
<programlisting>
341439
ALTER TYPE compfoo ADD ATTRIBUTE f3 int;
342440
</programlisting>
@@ -353,7 +451,20 @@ ALTER TYPE colors ADD VALUE 'orange' AFTER 'red';
353451
To rename an enum value:
354452
<programlisting>
355453
ALTER TYPE colors RENAME VALUE 'purple' TO 'mauve';
356-
</programlisting></para>
454+
</programlisting>
455+
</para>
456+
457+
<para>
458+
To create binary I/O functions for an existing base type:
459+
<programlisting>
460+
CREATE FUNCTION mytypesend(mytype) RETURNS bytea ...;
461+
CREATE FUNCTION mytyperecv(internal, oid, integer) RETURNS mytype ...;
462+
ALTER TYPE mytype SET (
463+
SEND = mytypesend,
464+
RECEIVE = mytyperecv
465+
);
466+
</programlisting>
467+
</para>
357468
</refsect1>
358469

359470
<refsect1>

‎src/backend/catalog/pg_type.c

Lines changed: 35 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,8 @@ TypeShellMake(const char *typeName, Oid typeNamespace, Oid ownerId)
155155
* Create dependencies. We can/must skip this in bootstrap mode.
156156
*/
157157
if (!IsBootstrapProcessingMode())
158-
GenerateTypeDependencies(typoid,
159-
(Form_pg_type)GETSTRUCT(tup),
158+
GenerateTypeDependencies(tup,
159+
pg_type_desc,
160160
NULL,
161161
NULL,
162162
0,
@@ -488,8 +488,8 @@ TypeCreate(Oid newTypeOid,
488488
* Create dependencies. We can/must skip this in bootstrap mode.
489489
*/
490490
if (!IsBootstrapProcessingMode())
491-
GenerateTypeDependencies(typeObjectId,
492-
(Form_pg_type)GETSTRUCT(tup),
491+
GenerateTypeDependencies(tup,
492+
pg_type_desc,
493493
(defaultTypeBin ?
494494
stringToNode(defaultTypeBin) :
495495
NULL),
@@ -516,12 +516,16 @@ TypeCreate(Oid newTypeOid,
516516
* GenerateTypeDependencies: build the dependencies needed for a type
517517
*
518518
* Most of what this function needs to know about the type is passed as the
519-
* new pg_type row, typeForm. But we can't get at the varlena fields through
520-
* that, so defaultExpr and typacl are passed separately. (typacl is really
519+
* new pg_type row, typeTuple. We make callers pass the pg_type Relation
520+
* as well, so that we have easy access to a tuple descriptor for the row.
521+
*
522+
* While this is able to extract the defaultExpr and typacl from the tuple,
523+
* doing so is relatively expensive, and callers may have those values at
524+
* hand already. Pass those if handy, otherwise pass NULL. (typacl is really
521525
* "Acl *", but we declare it "void *" to avoid including acl.h in pg_type.h.)
522526
*
523-
* relationKind and isImplicitArrayaren't visible in the pg_type row either,
524-
* so they'realso passed separately.
527+
* relationKind and isImplicitArrayare likewise somewhat expensive to deduce
528+
*from the tuple,sowe make callers pass those (they'renot optional).
525529
*
526530
* isDependentType is true if this is an implicit array or relation rowtype;
527531
* that means it doesn't need its own dependencies on owner etc.
@@ -535,18 +539,39 @@ TypeCreate(Oid newTypeOid,
535539
* that type will become a member of the extension.)
536540
*/
537541
void
538-
GenerateTypeDependencies(OidtypeObjectId,
539-
Form_pg_typetypeForm,
542+
GenerateTypeDependencies(HeapTupletypeTuple,
543+
RelationtypeCatalog,
540544
Node*defaultExpr,
541545
void*typacl,
542546
charrelationKind,/* only for relation rowtypes */
543547
boolisImplicitArray,
544548
boolisDependentType,
545549
boolrebuild)
546550
{
551+
Form_pg_typetypeForm= (Form_pg_type)GETSTRUCT(typeTuple);
552+
OidtypeObjectId=typeForm->oid;
553+
Datumdatum;
554+
boolisNull;
547555
ObjectAddressmyself,
548556
referenced;
549557

558+
/* Extract defaultExpr if caller didn't pass it */
559+
if (defaultExpr==NULL)
560+
{
561+
datum=heap_getattr(typeTuple,Anum_pg_type_typdefaultbin,
562+
RelationGetDescr(typeCatalog),&isNull);
563+
if (!isNull)
564+
defaultExpr=stringToNode(TextDatumGetCString(datum));
565+
}
566+
/* Extract typacl if caller didn't pass it */
567+
if (typacl==NULL)
568+
{
569+
datum=heap_getattr(typeTuple,Anum_pg_type_typacl,
570+
RelationGetDescr(typeCatalog),&isNull);
571+
if (!isNull)
572+
typacl=DatumGetAclPCopy(datum);
573+
}
574+
550575
/* If rebuild, first flush old dependencies, except extension deps */
551576
if (rebuild)
552577
{

0 commit comments

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