Commit4cde879

authored

Merge pull request#555 from postgrespro/revert-498-PBCKP-120

Revert "[PBCKP-120] skip partitioned indexes for checkdb --amcheck"

2 parentsdfb8b1f +79009c6 commit4cde879Copy full SHA for 4cde879

File tree

-16

lines changed

-16

lines changed

Lines changed: 3 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -461,9 +461,7 @@ get_index_list(const char *dbname, bool first_db_with_amcheck,`
`461`	`461`	`"LEFT JOIN pg_catalog.pg_class cls ON idx.indexrelid=cls.oid "`
`462`	`462`	`"LEFT JOIN pg_catalog.pg_namespace nmspc ON cls.relnamespace=nmspc.oid "`
`463`	`463`	`"LEFT JOIN pg_catalog.pg_am am ON cls.relam=am.oid "`
`464`		`-"WHERE am.amname='btree' "`
`465`		`-"AND cls.relpersistence != 't' "`
`466`		`-"AND cls.relkind != 'I' "`
	`464`	`+"WHERE am.amname='btree' AND cls.relpersistence != 't' "`
`467`	`465`	`"ORDER BY nmspc.nspname DESC",`
`468`	`466`	`0,NULL);`
`469`	`467`	`}`
`@@ -475,10 +473,8 @@ get_index_list(const char *dbname, bool first_db_with_amcheck,`
`475`	`473`	`"LEFT JOIN pg_catalog.pg_class cls ON idx.indexrelid=cls.oid "`
`476`	`474`	`"LEFT JOIN pg_catalog.pg_namespace nmspc ON cls.relnamespace=nmspc.oid "`
`477`	`475`	`"LEFT JOIN pg_catalog.pg_am am ON cls.relam=am.oid "`
`478`		`-"WHERE am.amname='btree' "`
`479`		`-"AND cls.relpersistence != 't' "`
`480`		`-"AND cls.relkind != 'I' "`
`481`		`-"AND (cls.reltablespace IN "`
	`476`	`+"WHERE am.amname='btree' AND cls.relpersistence != 't' AND "`
	`477`	`+"(cls.reltablespace IN "`
`482`	`478`	`"(SELECT oid from pg_catalog.pg_tablespace where spcname <> 'pg_global') "`
`483`	`479`	`"OR cls.reltablespace = 0) "`
`484`	`480`	`"ORDER BY nmspc.nspname DESC",`

Lines changed: 0 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,15 +38,6 @@ def test_checkdb_amcheck_only_sanity(self):`
`38`	`38`	`node.safe_psql(`
`39`	`39`	`"postgres",`
`40`	`40`	`"create index on t_heap(id)")`
`41`		`-`
`42`		`-node.safe_psql(`
`43`		`-"postgres",`
`44`		`-"create table idxpart (a int) "`
`45`		`-"partition by range (a)")`
`46`		`-`
`47`		`-node.safe_psql(`
`48`		`-"postgres",`
`49`		`-"create index on idxpart(a)")`
`50`	`41`
`51`	`42`	`try:`
`52`	`43`	`node.safe_psql(`

Comments

(0)