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

Commit265f904

Browse files
committed
Code review for LIKE ... INCLUDING INDEXES patch. Fix failure to propagate
constraint status of copied indexes (bug #3774), as well as various othersmall bugs such as failure to pstrdup when needed. Allow INCLUDING INDEXESindexes to be merged with identical declared indexes (perhaps not real useful,but the code is there and having it not apply to LIKE indexes seems prettyunorthogonal). Avoid useless work in generateClonedIndexStmt(). Undo somepoorly chosen API changes, and put a couple of routines in modules that seemto be better places for them.
1 parentba9da68 commit265f904

File tree

17 files changed

+359
-283
lines changed

17 files changed

+359
-283
lines changed

‎src/backend/access/common/reloptions.c

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/access/common/reloptions.c,v 1.6 2007/11/15 21:14:31 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/access/common/reloptions.c,v 1.7 2007/12/01 23:44:44 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -18,6 +18,7 @@
1818
#include"access/reloptions.h"
1919
#include"catalog/pg_type.h"
2020
#include"commands/defrem.h"
21+
#include"nodes/makefuncs.h"
2122
#include"utils/array.h"
2223
#include"utils/builtins.h"
2324
#include"utils/rel.h"
@@ -149,6 +150,50 @@ transformRelOptions(Datum oldOptions, List *defList,
149150
}
150151

151152

153+
/*
154+
* Convert the text-array format of reloptions into a List of DefElem.
155+
* This is the inverse of transformRelOptions().
156+
*/
157+
List*
158+
untransformRelOptions(Datumoptions)
159+
{
160+
List*result=NIL;
161+
ArrayType*array;
162+
Datum*optiondatums;
163+
intnoptions;
164+
inti;
165+
166+
/* Nothing to do if no options */
167+
if (options== (Datum)0)
168+
returnresult;
169+
170+
array=DatumGetArrayTypeP(options);
171+
172+
Assert(ARR_ELEMTYPE(array)==TEXTOID);
173+
174+
deconstruct_array(array,TEXTOID,-1, false,'i',
175+
&optiondatums,NULL,&noptions);
176+
177+
for (i=0;i<noptions;i++)
178+
{
179+
char*s;
180+
char*p;
181+
Node*val=NULL;
182+
183+
s=DatumGetCString(DirectFunctionCall1(textout,optiondatums[i]));
184+
p=strchr(s,'=');
185+
if (p)
186+
{
187+
*p++='\0';
188+
val= (Node*)makeString(pstrdup(p));
189+
}
190+
result=lappend(result,makeDefElem(pstrdup(s),val));
191+
}
192+
193+
returnresult;
194+
}
195+
196+
152197
/*
153198
* Interpret reloptions that are given in text-array format.
154199
*

‎src/backend/bootstrap/bootparse.y

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
*
1111
* IDENTIFICATION
12-
* $PostgreSQL: pgsql/src/backend/bootstrap/bootparse.y,v 1.89 2007/07/17 05:02:00 neilc Exp $
12+
* $PostgreSQL: pgsql/src/backend/bootstrap/bootparse.y,v 1.90 2007/12/01 23:44:44 tgl Exp $
1313
*
1414
*-------------------------------------------------------------------------
1515
*/
@@ -252,7 +252,7 @@ Boot_DeclareIndexStmt:
252252
LexIDStr($8),
253253
NULL,
254254
$10,
255-
NULL, NIL,NULL,
255+
NULL, NIL,
256256
false,false,false,
257257
false,false,true,false,false);
258258
do_end();
@@ -270,7 +270,7 @@ Boot_DeclareUniqueIndexStmt:
270270
LexIDStr($9),
271271
NULL,
272272
$11,
273-
NULL, NIL,NULL,
273+
NULL, NIL,
274274
true,false,false,
275275
false,false,true,false,false);
276276
do_end();

‎src/backend/catalog/pg_depend.c

Lines changed: 154 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/catalog/pg_depend.c,v 1.24 2007/01/05 22:19:25 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/catalog/pg_depend.c,v 1.25 2007/12/01 23:44:44 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -18,9 +18,11 @@
1818
#include"access/heapam.h"
1919
#include"catalog/dependency.h"
2020
#include"catalog/indexing.h"
21+
#include"catalog/pg_constraint.h"
2122
#include"catalog/pg_depend.h"
2223
#include"miscadmin.h"
2324
#include"utils/fmgroids.h"
25+
#include"utils/lsyscache.h"
2426

2527

2628
staticboolisObjectPinned(constObjectAddress*object,Relationrel);
@@ -260,6 +262,62 @@ changeDependencyFor(Oid classId, Oid objectId,
260262
returncount;
261263
}
262264

265+
/*
266+
* isObjectPinned()
267+
*
268+
* Test if an object is required for basic database functionality.
269+
* Caller must already have opened pg_depend.
270+
*
271+
* The passed subId, if any, is ignored; we assume that only whole objects
272+
* are pinned (and that this implies pinning their components).
273+
*/
274+
staticbool
275+
isObjectPinned(constObjectAddress*object,Relationrel)
276+
{
277+
boolret= false;
278+
SysScanDescscan;
279+
HeapTupletup;
280+
ScanKeyDatakey[2];
281+
282+
ScanKeyInit(&key[0],
283+
Anum_pg_depend_refclassid,
284+
BTEqualStrategyNumber,F_OIDEQ,
285+
ObjectIdGetDatum(object->classId));
286+
287+
ScanKeyInit(&key[1],
288+
Anum_pg_depend_refobjid,
289+
BTEqualStrategyNumber,F_OIDEQ,
290+
ObjectIdGetDatum(object->objectId));
291+
292+
scan=systable_beginscan(rel,DependReferenceIndexId, true,
293+
SnapshotNow,2,key);
294+
295+
/*
296+
* Since we won't generate additional pg_depend entries for pinned
297+
* objects, there can be at most one entry referencing a pinned object.
298+
* Hence, it's sufficient to look at the first returned tuple; we don't
299+
* need to loop.
300+
*/
301+
tup=systable_getnext(scan);
302+
if (HeapTupleIsValid(tup))
303+
{
304+
Form_pg_dependfoundDep= (Form_pg_depend)GETSTRUCT(tup);
305+
306+
if (foundDep->deptype==DEPENDENCY_PIN)
307+
ret= true;
308+
}
309+
310+
systable_endscan(scan);
311+
312+
returnret;
313+
}
314+
315+
316+
/*
317+
* Various special-purpose lookups and manipulations of pg_depend.
318+
*/
319+
320+
263321
/*
264322
* Detect whether a sequence is marked as "owned" by a column
265323
*
@@ -359,52 +417,120 @@ markSequenceUnowned(Oid seqId)
359417
heap_close(depRel,RowExclusiveLock);
360418
}
361419

420+
362421
/*
363-
* isObjectPinned()
364-
*
365-
* Test if an object is required for basic database functionality.
366-
* Caller must already have opened pg_depend.
422+
* get_constraint_index
423+
*Given the OID of a unique or primary-key constraint, return the
424+
*OID of the underlying unique index.
367425
*
368-
*The passed subId,ifany, is ignored; we assume that only whole objects
369-
*are pinned (and that this implies pinning their components).
426+
*Return InvalidOidifthe index couldn't be found; this suggests the
427+
*given OID is bogus, but we leave it to caller to decide what to do.
370428
*/
371-
staticbool
372-
isObjectPinned(constObjectAddress*object,Relationrel)
429+
Oid
430+
get_constraint_index(OidconstraintId)
373431
{
374-
boolret= false;
432+
OidindexId=InvalidOid;
433+
RelationdepRel;
434+
ScanKeyDatakey[3];
375435
SysScanDescscan;
376436
HeapTupletup;
377-
ScanKeyDatakey[2];
437+
438+
/* Search the dependency table for the dependent index */
439+
depRel=heap_open(DependRelationId,AccessShareLock);
378440

379441
ScanKeyInit(&key[0],
380442
Anum_pg_depend_refclassid,
381443
BTEqualStrategyNumber,F_OIDEQ,
382-
ObjectIdGetDatum(object->classId));
383-
444+
ObjectIdGetDatum(ConstraintRelationId));
384445
ScanKeyInit(&key[1],
385446
Anum_pg_depend_refobjid,
386447
BTEqualStrategyNumber,F_OIDEQ,
387-
ObjectIdGetDatum(object->objectId));
448+
ObjectIdGetDatum(constraintId));
449+
ScanKeyInit(&key[2],
450+
Anum_pg_depend_refobjsubid,
451+
BTEqualStrategyNumber,F_INT4EQ,
452+
Int32GetDatum(0));
388453

389-
scan=systable_beginscan(rel,DependReferenceIndexId, true,
390-
SnapshotNow,2,key);
454+
scan=systable_beginscan(depRel,DependReferenceIndexId, true,
455+
SnapshotNow,3,key);
391456

392-
/*
393-
* Since we won't generate additional pg_depend entries for pinned
394-
* objects, there can be at most one entry referencing a pinned object.
395-
* Hence, it's sufficient to look at the first returned tuple; we don't
396-
* need to loop.
397-
*/
398-
tup=systable_getnext(scan);
399-
if (HeapTupleIsValid(tup))
457+
while (HeapTupleIsValid(tup=systable_getnext(scan)))
400458
{
401-
Form_pg_dependfoundDep= (Form_pg_depend)GETSTRUCT(tup);
459+
Form_pg_dependdeprec= (Form_pg_depend)GETSTRUCT(tup);
402460

403-
if (foundDep->deptype==DEPENDENCY_PIN)
404-
ret= true;
461+
/*
462+
* We assume any internal dependency of an index on the constraint
463+
* must be what we are looking for. (The relkind test is just
464+
* paranoia; there shouldn't be any such dependencies otherwise.)
465+
*/
466+
if (deprec->classid==RelationRelationId&&
467+
deprec->objsubid==0&&
468+
deprec->deptype==DEPENDENCY_INTERNAL&&
469+
get_rel_relkind(deprec->objid)==RELKIND_INDEX)
470+
{
471+
indexId=deprec->objid;
472+
break;
473+
}
405474
}
406475

407476
systable_endscan(scan);
477+
heap_close(depRel,AccessShareLock);
408478

409-
returnret;
479+
returnindexId;
480+
}
481+
482+
/*
483+
* get_index_constraint
484+
*Given the OID of an index, return the OID of the owning unique or
485+
*primary-key constraint, or InvalidOid if no such constraint.
486+
*/
487+
Oid
488+
get_index_constraint(OidindexId)
489+
{
490+
OidconstraintId=InvalidOid;
491+
RelationdepRel;
492+
ScanKeyDatakey[3];
493+
SysScanDescscan;
494+
HeapTupletup;
495+
496+
/* Search the dependency table for the index */
497+
depRel=heap_open(DependRelationId,AccessShareLock);
498+
499+
ScanKeyInit(&key[0],
500+
Anum_pg_depend_classid,
501+
BTEqualStrategyNumber,F_OIDEQ,
502+
ObjectIdGetDatum(RelationRelationId));
503+
ScanKeyInit(&key[1],
504+
Anum_pg_depend_objid,
505+
BTEqualStrategyNumber,F_OIDEQ,
506+
ObjectIdGetDatum(indexId));
507+
ScanKeyInit(&key[2],
508+
Anum_pg_depend_objsubid,
509+
BTEqualStrategyNumber,F_INT4EQ,
510+
Int32GetDatum(0));
511+
512+
scan=systable_beginscan(depRel,DependDependerIndexId, true,
513+
SnapshotNow,3,key);
514+
515+
while (HeapTupleIsValid(tup=systable_getnext(scan)))
516+
{
517+
Form_pg_dependdeprec= (Form_pg_depend)GETSTRUCT(tup);
518+
519+
/*
520+
* We assume any internal dependency on a constraint
521+
* must be what we are looking for.
522+
*/
523+
if (deprec->refclassid==ConstraintRelationId&&
524+
deprec->refobjsubid==0&&
525+
deprec->deptype==DEPENDENCY_INTERNAL)
526+
{
527+
constraintId=deprec->refobjid;
528+
break;
529+
}
530+
}
531+
532+
systable_endscan(scan);
533+
heap_close(depRel,AccessShareLock);
534+
535+
returnconstraintId;
410536
}

‎src/backend/commands/indexcmds.c

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.167 2007/11/15 21:14:33 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/indexcmds.c,v 1.168 2007/12/01 23:44:44 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -80,8 +80,6 @@ static bool relationHasPrimaryKey(Relation rel);
8080
*to index on.
8181
* 'predicate': the partial-index condition, or NULL if none.
8282
* 'options': reloptions from WITH (in list-of-DefElem form).
83-
* 'src_options': reloptions from the source index, if this is a cloned
84-
*index produced by CREATE TABLE LIKE ... INCLUDING INDEXES
8583
* 'unique': make the index enforce uniqueness.
8684
* 'primary': mark the index as a primary key in the catalogs.
8785
* 'isconstraint': index is for a PRIMARY KEY or UNIQUE constraint,
@@ -103,7 +101,6 @@ DefineIndex(RangeVar *heapRelation,
103101
List*attributeList,
104102
Expr*predicate,
105103
List*options,
106-
char*src_options,
107104
boolunique,
108105
boolprimary,
109106
boolisconstraint,
@@ -396,16 +393,9 @@ DefineIndex(RangeVar *heapRelation,
396393
}
397394

398395
/*
399-
* Parse AM-specific options, convert to text array form, validate. The
400-
* src_options introduced due to using indexes via the "CREATE LIKE
401-
* INCLUDING INDEXES" statement also need to be merged here
396+
* Parse AM-specific options, convert to text array form, validate.
402397
*/
403-
if (src_options)
404-
reloptions=unflatten_reloptions(src_options);
405-
else
406-
reloptions= (Datum)0;
407-
408-
reloptions=transformRelOptions(reloptions,options, false, false);
398+
reloptions=transformRelOptions((Datum)0,options, false, false);
409399

410400
(void)index_reloptions(amoptions,reloptions, true);
411401

‎src/backend/commands/tablecmds.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.236 2007/11/15 21:14:33 momjian Exp $
11+
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.237 2007/12/01 23:44:44 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -3795,7 +3795,6 @@ ATExecAddIndex(AlteredTableInfo *tab, Relation rel,
37953795
stmt->indexParams,/* parameters */
37963796
(Expr*)stmt->whereClause,
37973797
stmt->options,
3798-
stmt->src_options,
37993798
stmt->unique,
38003799
stmt->primary,
38013800
stmt->isconstraint,

0 commit comments

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