Commit7d30e5b

committed

minor bugfix: ensure that tablespace directories are canonicalized

1 parentc3451c5 commit7d30e5bCopy full SHA for 7d30e5b

File tree

-2

lines changed

-2

lines changed

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -3461,8 +3461,8 @@ check_external_for_tablespaces(parray *external_list)`
`3461`	`3461`	`inti=0;`
`3462`	`3462`	`intj=0;`
`3463`	`3463`	`char*tablespace_path=NULL;`
`3464`		`-char*query="SELECT pg_catalog.pg_tablespace_location(oid)\n"`
`3465`		`-"FROM pg_tablespace\n"`
	`3464`	`+char*query="SELECT pg_catalog.pg_tablespace_location(oid)"`
	`3465`	`+"FROMpg_catalog.pg_tablespace"`
`3466`	`3466`	`"WHERE pg_catalog.pg_tablespace_location(oid) <> '';";`
`3467`	`3467`
`3468`	`3468`	`conn=backup_conn;`
`@@ -3476,9 +3476,13 @@ check_external_for_tablespaces(parray *external_list)`
`3476`	`3476`	`{`
`3477`	`3477`	`tablespace_path=PQgetvalue(res,i,0);`
`3478`	`3478`	`Assert (strlen(tablespace_path)>0);`
	`3479`	`+`
	`3480`	`+canonicalize_path(tablespace_path);`
	`3481`	`+`
`3479`	`3482`	`for (j=0;j<parray_num(external_list);j++)`
`3480`	`3483`	`{`
`3481`	`3484`	`char*external_path=parray_get(external_list,j);`
	`3485`	`+`
`3482`	`3486`	`if (path_is_prefix_of_path(external_path,tablespace_path))`
`3483`	`3487`	`elog(ERROR,"External directory path (-E option) \"%s\" "`
`3484`	`3488`	`"contains tablespace \"%s\"",`

Comments

(0)