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

introduce option --parent-table (-I, stands for 'inheritance'), fix function repack_one_database(), introduce function repack.get_table_and_inheritors()

Browse Source
This commit is contained in:
Dmitry Ivanov 2017-03-20 23:04:41 +03:00
parent 7c8e272b54
commit 68dc592545
4 changed files with 117 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
bin/pg_repack.c
View File

@ -109,7 +109,7 @@ const char *PROGRAM_VERSION = "unknown";
*/ */
#define SQL_XID_SNAPSHOT_80300 \ #define SQL_XID_SNAPSHOT_80300 \
"SELECT repack.array_accum(l.virtualtransaction) " \ "SELECT repack.array_accum(l.virtualtransaction) " \
" FROM pg_locks AS l" \ " FROM pg_locks AS l" \
" LEFT JOIN pg_stat_activity AS a " \ " LEFT JOIN pg_stat_activity AS a " \
" ON l.pid = a.procpid " \ " ON l.pid = a.procpid " \
" LEFT JOIN pg_database AS d " \ " LEFT JOIN pg_database AS d " \
@ -174,7 +174,7 @@ typedef struct repack_index
{ {
Oid target_oid; /* target: OID */ Oid target_oid; /* target: OID */
const char *create_index; /* CREATE INDEX */ const char *create_index; /* CREATE INDEX */
index_status_t status; /* Track parallel build statuses. */ index_status_t status; /* Track parallel build statuses. */
int worker_idx; /* which worker conn is handling */ int worker_idx; /* which worker conn is handling */
} repack_index; } repack_index;
@ -238,6 +238,7 @@ static bool sqlstate_equals(PGresult *res, const char *state)
static bool analyze = true; static bool analyze = true;
static bool alldb = false; static bool alldb = false;
static bool noorder = false; static bool noorder = false;
static SimpleStringList parent_table_list = {NULL, NULL};
static SimpleStringList table_list = {NULL, NULL}; static SimpleStringList table_list = {NULL, NULL};
static SimpleStringList schema_list = {NULL, NULL}; static SimpleStringList schema_list = {NULL, NULL};
static char *orderby = NULL; static char *orderby = NULL;
@ -265,6 +266,7 @@ static pgut_option options[] =
{ {
{ 'b', 'a', "all", &alldb }, { 'b', 'a', "all", &alldb },
{ 'l', 't', "table", &table_list }, { 'l', 't', "table", &table_list },
{ 'l', 'I', "parent-table", &parent_table_list },
{ 'l', 'c', "schema", &schema_list }, { 'l', 'c', "schema", &schema_list },
{ 'b', 'n', "no-order", &noorder }, { 'b', 'n', "no-order", &noorder },
{ 'b', 'N', "dry-run", &dryrun }, { 'b', 'N', "dry-run", &dryrun },
@ -306,12 +308,16 @@ main(int argc, char *argv[])
if (r_index.head && table_list.head) if (r_index.head && table_list.head)
ereport(ERROR, (errcode(EINVAL), ereport(ERROR, (errcode(EINVAL),
errmsg("cannot specify --index (-i) and --table (-t)"))); errmsg("cannot specify --index (-i) and --table (-t)")));
if (r_index.head && parent_table_list.head)
ereport(ERROR, (errcode(EINVAL),
errmsg("cannot specify --index (-i) and --parent-table (-P)")));
else if (r_index.head && only_indexes) else if (r_index.head && only_indexes)
ereport(ERROR, (errcode(EINVAL), ereport(ERROR, (errcode(EINVAL),
errmsg("cannot specify --index (-i) and --only-indexes (-x)"))); errmsg("cannot specify --index (-i) and --only-indexes (-x)")));
else if (only_indexes && !table_list.head) else if (only_indexes && !(table_list.head || parent_table_list.head))
ereport(ERROR, (errcode(EINVAL), ereport(ERROR, (errcode(EINVAL),
errmsg("cannot repack all indexes of database, specify the table(s) via --table (-t)"))); errmsg("cannot repack all indexes of database, specify the table(s)"
"via --table (-t) or --parent-table (-P)")));
else if (alldb) else if (alldb)
ereport(ERROR, (errcode(EINVAL), ereport(ERROR, (errcode(EINVAL),
errmsg("cannot repack specific index(es) in all databases"))); errmsg("cannot repack specific index(es) in all databases")));
@ -336,7 +342,7 @@ main(int argc, char *argv[])
} }
else else
{ {
if (schema_list.head && table_list.head) if (schema_list.head && (table_list.head || parent_table_list.head))
ereport(ERROR, ereport(ERROR,
(errcode(EINVAL), (errcode(EINVAL),
errmsg("cannot repack specific table(s) in schema, use schema.table notation instead"))); errmsg("cannot repack specific table(s) in schema, use schema.table notation instead")));
@ -346,7 +352,7 @@ main(int argc, char *argv[])
if (alldb) if (alldb)
{ {
if (table_list.head) if (table_list.head || parent_table_list.head)
ereport(ERROR, ereport(ERROR,
(errcode(EINVAL), (errcode(EINVAL),
errmsg("cannot repack specific table(s) in all databases"))); errmsg("cannot repack specific table(s) in all databases")));
@ -602,15 +608,17 @@ repack_one_database(const char *orderby, char *errbuf, size_t errsize)
SimpleStringListCell *cell; SimpleStringListCell *cell;
const char **params = NULL; const char **params = NULL;
int iparam = 0; int iparam = 0;
size_t num_parent_tables;
size_t num_tables; size_t num_tables;
size_t num_schemas; size_t num_schemas;
size_t num_params; size_t num_params;
num_parent_tables = simple_string_list_size(parent_table_list);
num_tables = simple_string_list_size(table_list); num_tables = simple_string_list_size(table_list);
num_schemas = simple_string_list_size(schema_list); num_schemas = simple_string_list_size(schema_list);
/* 1st param is the user-specified tablespace */ /* 1st param is the user-specified tablespace */
num_params = num_tables + num_schemas + 1; num_params = num_parent_tables + num_tables + num_schemas + 1;
params = pgut_malloc(num_params * sizeof(char *)); params = pgut_malloc(num_params * sizeof(char *));
initStringInfo(&sql); initStringInfo(&sql);
@ -633,18 +641,42 @@ repack_one_database(const char *orderby, char *errbuf, size_t errsize)
" WHERE "); " WHERE ");
params[iparam++] = tablespace; params[iparam++] = tablespace;
if (num_tables) if (num_tables || num_parent_tables)
{ {
appendStringInfoString(&sql, "("); /* standalone tables */
for (cell = table_list.head; cell; cell = cell->next) if (num_tables)
{ {
/* Construct table name placeholders to be used by PQexecParams */ appendStringInfoString(&sql, "(");
appendStringInfo(&sql, "relid = $%d::regclass", iparam + 1); for (cell = table_list.head; cell; cell = cell->next)
params[iparam++] = cell->val; {
if (cell->next) /* Construct table name placeholders to be used by PQexecParams */
appendStringInfoString(&sql, " OR "); appendStringInfo(&sql, "relid = $%d::regclass", iparam + 1);
params[iparam++] = cell->val;
if (cell->next)
appendStringInfoString(&sql, " OR ");
}
appendStringInfoString(&sql, ")");
}
if (num_tables && num_parent_tables)
appendStringInfoString(&sql, " OR ");
/* parent tables + inherited children */
if (num_parent_tables)
{
appendStringInfoString(&sql, "(");
for (cell = parent_table_list.head; cell; cell = cell->next)
{
/* Construct table name placeholders to be used by PQexecParams */
appendStringInfo(&sql,
"relid = ANY(repack.get_table_and_inheritors($%d::regclass))",
iparam + 1);
params[iparam++] = cell->val;
if (cell->next)
appendStringInfoString(&sql, " OR ");
}
appendStringInfoString(&sql, ")");
} }
appendStringInfoString(&sql, ")");
} }
else if (num_schemas) else if (num_schemas)
{ {
@ -2008,7 +2040,7 @@ repack_all_indexes(char *errbuf, size_t errsize)
initStringInfo(&sql); initStringInfo(&sql);
reconnect(ERROR); reconnect(ERROR);
assert(r_index.head || table_list.head); assert(r_index.head || table_list.head || parent_table_list.head);
if (!preliminary_checks(errbuf, errsize)) if (!preliminary_checks(errbuf, errsize))
goto cleanup; goto cleanup;
@ -2023,6 +2055,8 @@ repack_all_indexes(char *errbuf, size_t errsize)
cell = r_index.head; cell = r_index.head;
} }
/* TODO: fix this also for parent_table_list */
else if (table_list.head) else if (table_list.head)
{ {
appendStringInfoString(&sql, appendStringInfoString(&sql,
@ -2087,6 +2121,7 @@ pgut_help(bool details)
printf("Options:\n"); printf("Options:\n");
printf(" -a, --all repack all databases\n"); printf(" -a, --all repack all databases\n");
printf(" -t, --table=TABLE repack specific table only\n"); printf(" -t, --table=TABLE repack specific table only\n");
printf(" -I, --parent-table=TABLE repack specific parent table and its inheritors\n");
printf(" -c, --schema=SCHEMA repack tables in specific schema only\n"); printf(" -c, --schema=SCHEMA repack tables in specific schema only\n");
printf(" -s, --tablespace=TBLSPC move repacked tables to a new tablespace\n"); printf(" -s, --tablespace=TBLSPC move repacked tables to a new tablespace\n");
printf(" -S, --moveidx move repacked indexes to TBLSPC too\n"); printf(" -S, --moveidx move repacked indexes to TBLSPC too\n");

40
lib/exports.txt
View File

@ -1,19 +1,21 @@
Pg_magic_func 1 Pg_magic_func 1
pg_finfo_repack_apply 2 pg_finfo_repack_apply 2
pg_finfo_repack_disable_autovacuum 3 pg_finfo_repack_disable_autovacuum 3
pg_finfo_repack_drop 4 pg_finfo_repack_drop 4
pg_finfo_repack_get_order_by 5 pg_finfo_repack_get_order_by 5
pg_finfo_repack_indexdef 6 pg_finfo_repack_indexdef 6
pg_finfo_repack_swap 7 pg_finfo_repack_swap 7
pg_finfo_repack_trigger 8 pg_finfo_repack_trigger 8
pg_finfo_repack_version 9 pg_finfo_repack_version 9
pg_finfo_repack_index_swap 10 pg_finfo_repack_index_swap 10
repack_apply 11 pg_finfo_repack_get_table_and_inheritors 11
repack_disable_autovacuum 12 repack_apply 12
repack_drop 13 repack_disable_autovacuum 13
repack_get_order_by 14 repack_drop 14
repack_indexdef 15 repack_get_order_by 15
repack_swap 16 repack_indexdef 16
repack_trigger 17 repack_swap 17
repack_version 18 repack_trigger 18
repack_index_swap 19 repack_version 19
repack_index_swap 20
repack_get_table_and_inheritors 21

5
lib/pg_repack.sql.in
View File

@ -254,3 +254,8 @@ LANGUAGE C VOLATILE STRICT;
CREATE FUNCTION repack.repack_index_swap(oid) RETURNS void AS CREATE FUNCTION repack.repack_index_swap(oid) RETURNS void AS
'MODULE_PATHNAME', 'repack_index_swap' 'MODULE_PATHNAME', 'repack_index_swap'
LANGUAGE C STABLE STRICT; LANGUAGE C STABLE STRICT;
CREATE FUNCTION repack.get_table_and_inheritors(regclass) RETURNS regclass[] AS
'MODULE_PATHNAME', 'repack_get_table_and_inheritors'
LANGUAGE C STABLE STRICT;

41
lib/repack.c
View File

@ -25,12 +25,14 @@
#include "catalog/pg_am.h" #include "catalog/pg_am.h"
#endif #endif
#include "catalog/pg_inherits_fn.h"
#include "catalog/pg_namespace.h" #include "catalog/pg_namespace.h"
#include "catalog/pg_opclass.h" #include "catalog/pg_opclass.h"
#include "catalog/pg_type.h" #include "catalog/pg_type.h"
#include "commands/tablecmds.h" #include "commands/tablecmds.h"
#include "commands/trigger.h" #include "commands/trigger.h"
#include "miscadmin.h" #include "miscadmin.h"
#include "utils/array.h"
#include "utils/builtins.h" #include "utils/builtins.h"
#include "utils/lsyscache.h" #include "utils/lsyscache.h"
#include "utils/rel.h" #include "utils/rel.h"
@ -61,6 +63,7 @@ extern Datum PGUT_EXPORT repack_swap(PG_FUNCTION_ARGS);
extern Datum PGUT_EXPORT repack_drop(PG_FUNCTION_ARGS); extern Datum PGUT_EXPORT repack_drop(PG_FUNCTION_ARGS);
extern Datum PGUT_EXPORT repack_disable_autovacuum(PG_FUNCTION_ARGS); extern Datum PGUT_EXPORT repack_disable_autovacuum(PG_FUNCTION_ARGS);
extern Datum PGUT_EXPORT repack_index_swap(PG_FUNCTION_ARGS); extern Datum PGUT_EXPORT repack_index_swap(PG_FUNCTION_ARGS);
extern Datum PGUT_EXPORT repack_get_table_and_inheritors(PG_FUNCTION_ARGS);
PG_FUNCTION_INFO_V1(repack_version); PG_FUNCTION_INFO_V1(repack_version);
PG_FUNCTION_INFO_V1(repack_trigger); PG_FUNCTION_INFO_V1(repack_trigger);
@ -71,6 +74,7 @@ PG_FUNCTION_INFO_V1(repack_swap);
PG_FUNCTION_INFO_V1(repack_drop); PG_FUNCTION_INFO_V1(repack_drop);
PG_FUNCTION_INFO_V1(repack_disable_autovacuum); PG_FUNCTION_INFO_V1(repack_disable_autovacuum);
PG_FUNCTION_INFO_V1(repack_index_swap); PG_FUNCTION_INFO_V1(repack_index_swap);
PG_FUNCTION_INFO_V1(repack_get_table_and_inheritors);
static void repack_init(void); static void repack_init(void);
static SPIPlanPtr repack_prepare(const char *src, int nargs, Oid *argtypes); static SPIPlanPtr repack_prepare(const char *src, int nargs, Oid *argtypes);
@ -312,9 +316,9 @@ repack_apply(PG_FUNCTION_ARGS)
* can delete all the rows we have processed at-once. * can delete all the rows we have processed at-once.
*/ */
if (i == 0) if (i == 0)
appendStringInfoString(&sql_pop, pkid); appendStringInfoString(&sql_pop, pkid);
else else
appendStringInfo(&sql_pop, ",%s", pkid); appendStringInfo(&sql_pop, ",%s", pkid);
pfree(pkid); pfree(pkid);
} }
/* i must be > 0 (and hence we must have some rows to delete) /* i must be > 0 (and hence we must have some rows to delete)
@ -1342,3 +1346,36 @@ RenameRelationInternal(Oid myrelid, const char *newrelname, Oid namespaceId)
PG_END_TRY(); PG_END_TRY();
} }
#endif #endif
Datum
repack_get_table_and_inheritors(PG_FUNCTION_ARGS)
{
Oid parent = PG_GETARG_OID(0);
List *relations;
Datum *relations_array;
int relations_array_size;
ArrayType *result;
ListCell *lc;
int i;
relations = find_all_inheritors(parent, NoLock, NULL);
relations_array_size = list_length(relations);
if (relations_array_size == 0)
PG_RETURN_ARRAYTYPE_P(construct_empty_array(OIDOID));
relations_array = palloc(relations_array_size * sizeof(Datum));
i = 0;
foreach (lc, relations)
relations_array[i++] = ObjectIdGetDatum(lfirst_oid(lc));
result = construct_array(relations_array,
relations_array_size,
OIDOID, sizeof(Oid),
true, 'i');
pfree(relations_array);
PG_RETURN_ARRAYTYPE_P(result);
}