NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit56e09dd

Hiroshi Inoue

committed

change reindex ERROR/NOTICE message

1 parent282861a commit56e09ddCopy full SHA for 56e09dd

File tree

2 files changed

+19

-16

lines changed

src/backend
- commands
  - indexcmds.c
- tcop
  - utility.c

2 files changed

+19

-16

lines changed

`‎src/backend/commands/indexcmds.c‎`

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.25 2000/04/2502:45:54 tgl Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/indexcmds.c,v 1.26 2000/04/2510:38:38 inoue Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -714,7 +714,8 @@ ReindexIndex(const char name, bool force / currently unused */ )`
`714`	`714`	`((Form_pg_class)GETSTRUCT(tuple))->relkind);`
`715`	`715`	`}`
`716`	`716`
`717`		`-reindex_index(tuple->t_data->t_oid,force);`
	`717`	`+if (!reindex_index(tuple->t_data->t_oid,force))`
	`718`	`+elog(NOTICE,"index '%s' wasn't reindexed",name);`
`718`	`719`	`}`
`719`	`720`
`720`	`721`	`/*`
`@@ -744,7 +745,8 @@ ReindexTable(const char *name, bool force)`
`744`	`745`	`((Form_pg_class)GETSTRUCT(tuple))->relkind);`
`745`	`746`	`}`
`746`	`747`
`747`		`-reindex_relation(tuple->t_data->t_oid,force);`
	`748`	`+if (!reindex_relation(tuple->t_data->t_oid,force))`
	`749`	`+elog(NOTICE,"table '%s' wasn't reindexed",name);`
`748`	`750`	`}`
`749`	`751`
`750`	`752`	`/*`
`@@ -806,7 +808,6 @@ ReindexDatabase(const char *dbname, bool force, bool all)`
`806`	`808`	`elog(ERROR,"REINDEX DATABASE: Can be executed only on the currently open database.");`
`807`	`809`
`808`	`810`	`heap_close(relation,NoLock);`
`809`		`-/ reindex_database(db_id, force, !all); /`
`810`	`811`
`811`	`812`	`CommonSpecialPortalOpen();`
`812`	`813`	`pmem=CommonSpecialPortalGetMemory();`
`@@ -847,7 +848,8 @@ ReindexDatabase(const char *dbname, bool force, bool all)`
`847`	`848`	`for (i=0;i<relcnt;i++)`
`848`	`849`	`{`
`849`	`850`	`StartTransactionCommand();`
`850`		`-reindex_relation(relids[i],force);`
	`851`	`+if (reindex_relation(relids[i],force))`
	`852`	`+elog(NOTICE,"relation %d was reindexed",relids[i]);`
`851`	`853`	`CommitTransactionCommand();`
`852`	`854`	`}`
`853`	`855`	`CommonSpecialPortalClose();`

`‎src/backend/tcop/utility.c‎`

Lines changed: 12 additions & 11 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`*`
`11`	`11`	`*`
`12`	`12`	`* IDENTIFICATION`
`13`		`- * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.86 2000/04/12 17:15:43 momjian Exp $`
	`13`	`+ * $Header: /cvsroot/pgsql/src/backend/tcop/utility.c,v 1.87 2000/04/25 10:38:38 inoue Exp $`
`14`	`14`	`*`
`15`	`15`	`*-------------------------------------------------------------------------`
`16`	`16`	`*/`
`@@ -865,11 +865,11 @@ ProcessUtility(Node *parsetree,`
`865`	`865`	`if (IsSystemRelationName(relname))`
`866`	`866`	`{`
`867`	`867`	`if (!allowSystemTableMods&&IsSystemRelationName(relname))`
`868`		`-elog(ERROR,"class\"%s\" is a systemcatalogindex",`
`869`		`-relname);`
	`868`	`+elog(ERROR,"\"%s\" is a system index. call REINDEX under standalone postgres with -O -P options",`
	`869`	`+relname);`
`870`	`870`	`if (!IsIgnoringSystemIndexes())`
`871`		`-elog(ERROR,"class\"%s\" is a systemcatalogindex",`
`872`		`-relname);`
	`871`	`+elog(ERROR,"\"%s\" is a system index. call REINDEX under standalone postgres with -P -O options",`
	`872`	`+relname);`
`873`	`873`	`}`
`874`	`874`	`#ifndefNO_SECURITY`
`875`	`875`	`if (!pg_ownercheck(userName,relname,RELNAME))`
`@@ -882,11 +882,12 @@ ProcessUtility(Node *parsetree,`
`882`	`882`	`if (IsSystemRelationName(relname))`
`883`	`883`	`{`
`884`	`884`	`if (!allowSystemTableMods&&IsSystemRelationName(relname))`
`885`		`-elog(ERROR,"class\"%s\" is a systemcatalog index",`
`886`		`-relname);`
	`885`	`+elog(ERROR,"\"%s\" is a systemtable. call REINDEX under standalone postgres with -O -P options",`
	`886`	`+relname);`
`887`	`887`	`if (!IsIgnoringSystemIndexes())`
`888`		`-elog(ERROR,"class \"%s\" is a system catalog index",`
`889`		`-relname);`
	`888`	`+elog(ERROR,"\"%s\" is a system table. call REINDEX under standalone postgres with -P -O options",`
	`889`	`+`
	`890`	`+relname);`
`890`	`891`	`}`
`891`	`892`	`#ifndefNO_SECURITY`
`892`	`893`	`if (!pg_ownercheck(userName,relname,RELNAME))`
`@@ -897,9 +898,9 @@ ProcessUtility(Node *parsetree,`
`897`	`898`	`caseDATABASE:`
`898`	`899`	`relname= (char*)stmt->name;`
`899`	`900`	`if (!allowSystemTableMods)`
`900`		`-elog(ERROR,"-Ooption is needed");`
	`901`	`+elog(ERROR,"must be called under standalone postgres with-O-P options");`
`901`	`902`	`if (!IsIgnoringSystemIndexes())`
`902`		`-elog(ERROR,"-Poption is needed");`
	`903`	`+elog(ERROR,"must be called under standalone postgres with-P-O options");`
`903`	`904`	`ReindexDatabase(relname,stmt->force, false);`
`904`	`905`	`break;`
`905`	`906`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit56e09dd

File tree

2 files changed

2 files changed

`‎src/backend/commands/indexcmds.c‎`

`‎src/backend/tcop/utility.c‎`

0 commit comments