farrokhi/pg_repack
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix the broken behavior made by restricting the search path

Browse Source 
This commit doesn't include the change of regression test files.
This commit is contained in:
Masahiko Sawada 2018-04-06 14:47:53 +09:00
parent 914537edc7
commit 64cc2070ed
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/pg_repack.c
View File

@ -1926,6 +1926,7 @@ repack_table_indexes(PGresult *index_details)
params[1] = utoa(table, buffer[1]); params[1] = utoa(table, buffer[1]);
params[2] = tablespace; params[2] = tablespace;
schema_name = getstr(index_details, 0, 5); schema_name = getstr(index_details, 0, 5);
/* table_name is schema-qualified */
table_name = getstr(index_details, 0, 4); table_name = getstr(index_details, 0, 4);
/* Keep track of which of the table's indexes we have successfully /* Keep track of which of the table's indexes we have successfully
@ -1958,7 +1959,7 @@ repack_table_indexes(PGresult *index_details)
"WHERE pgc.relname = 'index_%u' " "WHERE pgc.relname = 'index_%u' "
"AND nsp.nspname = $1", index); "AND nsp.nspname = $1", index);
params[0] = schema_name; params[0] = schema_name;
elog(INFO, "repacking index \"%s\".\"%s\"", schema_name, idx_name); elog(INFO, "repacking index \"%s\"", idx_name);
res = execute(sql.data, 1, params); res = execute(sql.data, 1, params);
if (PQresultStatus(res) != PGRES_TUPLES_OK) if (PQresultStatus(res) != PGRES_TUPLES_OK)
{ {
@ -1990,8 +1991,8 @@ repack_table_indexes(PGresult *index_details)
if (PQntuples(res) < 1) if (PQntuples(res) < 1)
{ {
elog(WARNING, elog(WARNING,
"unable to generate SQL to CREATE work index for %s.%s", "unable to generate SQL to CREATE work index for %s",
schema_name, getstr(index_details, i, 0)); getstr(index_details, i, 0));
continue; continue;
} }
@ -2121,7 +2122,7 @@ repack_all_indexes(char *errbuf, size_t errsize)
if (r_index.head) if (r_index.head)
{ {
appendStringInfoString(&sql, appendStringInfoString(&sql,
"SELECT i.relname, idx.indexrelid, idx.indisvalid, idx.indrelid, idx.indrelid::regclass, n.nspname" "SELECT repack.oid2text(i.oid), idx.indexrelid, idx.indisvalid, idx.indrelid, repack.oid2text(idx.indrelid), n.nspname"
" FROM pg_index idx JOIN pg_class i ON i.oid = idx.indexrelid" " FROM pg_index idx JOIN pg_class i ON i.oid = idx.indexrelid"
" JOIN pg_namespace n ON n.oid = i.relnamespace" " JOIN pg_namespace n ON n.oid = i.relnamespace"
" WHERE idx.indexrelid = $1::regclass ORDER BY indisvalid DESC, i.relname, n.nspname"); " WHERE idx.indexrelid = $1::regclass ORDER BY indisvalid DESC, i.relname, n.nspname");
@ -2131,7 +2132,7 @@ repack_all_indexes(char *errbuf, size_t errsize)
else if (table_list.head || parent_table_list.head) else if (table_list.head || parent_table_list.head)
{ {
appendStringInfoString(&sql, appendStringInfoString(&sql,
"SELECT i.relname, idx.indexrelid, idx.indisvalid, idx.indrelid, $1::text, n.nspname" "SELECT repack.oid2text(i.oid), idx.indexrelid, idx.indisvalid, idx.indrelid, $1::text, n.nspname"
" FROM pg_index idx JOIN pg_class i ON i.oid = idx.indexrelid" " FROM pg_index idx JOIN pg_class i ON i.oid = idx.indexrelid"
" JOIN pg_namespace n ON n.oid = i.relnamespace" " JOIN pg_namespace n ON n.oid = i.relnamespace"
" WHERE idx.indrelid = $1::regclass ORDER BY indisvalid DESC, i.relname, n.nspname"); " WHERE idx.indrelid = $1::regclass ORDER BY indisvalid DESC, i.relname, n.nspname");

6
lib/pg_repack.sql.in
View File

@ -23,11 +23,13 @@ CREATE AGGREGATE repack.array_accum (
initcond = '{}' initcond = '{}'
); );
-- Always specify search_path to 'pg_catalog' so that we
-- always can get schema-qualified relation name
CREATE FUNCTION repack.oid2text(oid) RETURNS text AS CREATE FUNCTION repack.oid2text(oid) RETURNS text AS
$$ $$
SELECT textin(regclassout($1)); SELECT textin(regclassout($1));
$$ $$
LANGUAGE sql STABLE STRICT; LANGUAGE sql STABLE STRICT SET search_path to 'pg_catalog';
CREATE FUNCTION repack.get_index_columns(oid, text) RETURNS text AS CREATE FUNCTION repack.get_index_columns(oid, text) RETURNS text AS
$$ $$
@ -235,7 +237,7 @@ CREATE VIEW repack.primary_keys AS
GROUP BY indrelid; GROUP BY indrelid;
CREATE VIEW repack.tables AS CREATE VIEW repack.tables AS
SELECT R.oid::regclass AS relname, SELECT repack.oid2text(R.oid) AS relname,
R.oid AS relid, R.oid AS relid,
R.reltoastrelid AS reltoastrelid, R.reltoastrelid AS reltoastrelid,
CASE WHEN R.reltoastrelid = 0 THEN 0 ELSE ( CASE WHEN R.reltoastrelid = 0 THEN 0 ELSE (