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

Fork the pg_repack extension

Browse Source
This commit is contained in:
Daniele Varrazzo
2012-11-10 22:33:57 +00:00
parent 0f8c33f72f
commit b7799c1782
32 changed files with 416 additions and 416 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/.gitignore vendored
View File

@ -1,5 +1,5 @@
/.deps/
/pg_reorg
/pg_repack
/results/
/sql/init.sql
/sql/init-*.*.sql

8
bin/Makefile
View File

@ -1,13 +1,13 @@
#
# pg_reorg: bin/Makefile
# pg_repack: bin/Makefile
#
# Portions Copyright (c) 2008-2012, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
# Portions Copyright (c) 2011, Itagaki Takahiro
#
SRCS = pg_reorg.c pgut/pgut.c pgut/pgut-fe.c
SRCS = pg_repack.c pgut/pgut.c pgut/pgut-fe.c
OBJS = $(SRCS:.c=.o)
PROGRAM = pg_reorg
REGRESS = init reorg
PROGRAM = pg_repack
REGRESS = init repack
EXTRA_CLEAN = sql/init-$(MAJORVERSION).sql sql/init.sql

16
bin/expected/reorg.out → bin/expected/repack.out
View File

@ -111,12 +111,12 @@ SELECT * FROM tbl_with_dropped_toast;
(2 rows)
--
-- do reorg
-- do repack
--
\! pg_reorg --dbname=contrib_regression --no-order
\! pg_repack --dbname=contrib_regression --no-order
WARNING: skipping invalid index: CREATE UNIQUE INDEX idx_badindex_n ON tbl_badindex USING btree (n)
\! pg_reorg --dbname=contrib_regression
\! pg_reorg --dbname=contrib_regression --table=tbl_cluster
\! pg_repack --dbname=contrib_regression
\! pg_repack --dbname=contrib_regression --table=tbl_cluster
--
-- after
--
@ -298,13 +298,13 @@ CREATE TABLE tbl_nn (col1 int NOT NULL, col2 int NOT NULL);
CREATE TABLE tbl_uk (col1 int NOT NULL, col2 int , UNIQUE(col1, col2));
CREATE TABLE tbl_nn_uk (col1 int NOT NULL, col2 int NOT NULL, UNIQUE(col1, col2));
CREATE TABLE tbl_pk_uk (col1 int NOT NULL, col2 int NOT NULL, PRIMARY KEY(col1, col2), UNIQUE(col2, col1));
\! pg_reorg --dbname=contrib_regression --no-order --table=tbl_nn
\! pg_repack --dbname=contrib_regression --no-order --table=tbl_nn
ERROR: relation "tbl_nn" must have a primary key or not-null unique keys
-- => ERROR
\! pg_reorg --dbname=contrib_regression --no-order --table=tbl_uk
\! pg_repack --dbname=contrib_regression --no-order --table=tbl_uk
ERROR: relation "tbl_uk" must have a primary key or not-null unique keys
-- => ERROR
\! pg_reorg --dbname=contrib_regression --no-order --table=tbl_nn_uk
\! pg_repack --dbname=contrib_regression --no-order --table=tbl_nn_uk
-- => OK
\! pg_reorg --dbname=contrib_regression --no-order --table=tbl_pk_uk
\! pg_repack --dbname=contrib_regression --no-order --table=tbl_pk_uk
-- => OK

92
bin/pg_reorg.c → bin/pg_repack.c
View File

@ -1,5 +1,5 @@
/*
* pg_reorg.c: bin/pg_reorg.c
* pg_repack.c: bin/pg_repack.c
*
* Portions Copyright (c) 2008-2011, NIPPON TELEGRAPH AND TELEPHONE CORPORATION
* Portions Copyright (c) 2011, Itagaki Takahiro
@ -10,8 +10,8 @@
*/
const char *PROGRAM_VERSION = "1.1.7";
const char *PROGRAM_URL = "http://reorg.projects.postgresql.org/";
const char *PROGRAM_EMAIL = "reorg-general@lists.pgfoundry.org";
const char *PROGRAM_URL = "http://repack.projects.postgresql.org/";
const char *PROGRAM_EMAIL = "repack-general@lists.pgfoundry.org";
#include "pgut/pgut-fe.h"
@ -30,7 +30,7 @@ const char *PROGRAM_EMAIL = "reorg-general@lists.pgfoundry.org";
* servers. See GH ticket #1.
*/
#define SQL_XID_SNAPSHOT \
"SELECT reorg.array_accum(virtualtransaction) FROM pg_locks"\
"SELECT repack.array_accum(virtualtransaction) FROM pg_locks"\
" WHERE locktype = 'virtualxid' AND pid <> pg_backend_pid()"\
" AND (virtualxid, virtualtransaction) <> ('1/1', '-1/0')"
@ -41,7 +41,7 @@ const char *PROGRAM_EMAIL = "reorg-general@lists.pgfoundry.org";
/*
* per-table information
*/
typedef struct reorg_table
typedef struct repack_table
{
const char *target_name; /* target: relname */
Oid target_oid; /* target: OID */
@ -51,8 +51,8 @@ typedef struct reorg_table
Oid ckid; /* target: CK OID */
const char *create_pktype; /* CREATE TYPE pk */
const char *create_log; /* CREATE TABLE log */
const char *create_trigger; /* CREATE TRIGGER z_reorg_trigger */
const char *alter_table; /* ALTER TABLE ENABLE ALWAYS TRIGGER z_reorg_trigger */
const char *create_trigger; /* CREATE TRIGGER z_repack_trigger */
const char *alter_table; /* ALTER TABLE ENABLE ALWAYS TRIGGER z_repack_trigger */
const char *create_table; /* CREATE TABLE table AS SELECT */
const char *drop_columns; /* ALTER TABLE DROP COLUMNs */
const char *delete_log; /* DELETE FROM log */
@ -62,21 +62,21 @@ typedef struct reorg_table
const char *sql_delete; /* SQL used in flush */
const char *sql_update; /* SQL used in flush */
const char *sql_pop; /* SQL used in flush */
} reorg_table;
} repack_table;
/*
* per-index information
*/
typedef struct reorg_index
typedef struct repack_index
{
Oid target_oid; /* target: OID */
const char *create_index; /* CREATE INDEX */
} reorg_index;
} repack_index;
static void reorg_all_databases(const char *order_by);
static bool reorg_one_database(const char *order_by, const char *table);
static void reorg_one_table(const reorg_table *table, const char *order_by);
static void reorg_cleanup(bool fatal, void *userdata);
static void repack_all_databases(const char *order_by);
static bool repack_one_database(const char *order_by, const char *table);
static void repack_one_table(const repack_table *table, const char *order_by);
static void repack_cleanup(bool fatal, void *userdata);
static char *getstr(PGresult *res, int row, int col);
static Oid getoid(PGresult *res, int row, int col);
@ -138,12 +138,12 @@ main(int argc, char *argv[])
if (table)
ereport(ERROR,
(errcode(EINVAL),
errmsg("cannot reorg a specific table in all databases")));
reorg_all_databases(orderby);
errmsg("cannot repack a specific table in all databases")));
repack_all_databases(orderby);
}
else
{
if (!reorg_one_database(orderby, table))
if (!repack_one_database(orderby, table))
ereport(ERROR,
(errcode(ENOENT),
errmsg("%s is not installed", PROGRAM_NAME)));
@ -153,10 +153,10 @@ main(int argc, char *argv[])
}
/*
* Call reorg_one_database for each database.
* Call repack_one_database for each database.
*/
static void
reorg_all_databases(const char *orderby)
repack_all_databases(const char *orderby)
{
PGresult *result;
int i;
@ -174,11 +174,11 @@ reorg_all_databases(const char *orderby)
if (pgut_log_level >= INFO)
{
printf("%s: reorg database \"%s\"", PROGRAM_NAME, dbname);
printf("%s: repack database \"%s\"", PROGRAM_NAME, dbname);
fflush(stdout);
}
ret = reorg_one_database(orderby, NULL);
ret = repack_one_database(orderby, NULL);
if (pgut_log_level >= INFO)
{
@ -213,10 +213,10 @@ getoid(PGresult *res, int row, int col)
}
/*
* Call reorg_one_table for the target table or each table in a database.
* Call repack_one_table for the target table or each table in a database.
*/
static bool
reorg_one_database(const char *orderby, const char *table)
repack_one_database(const char *orderby, const char *table)
{
bool ret = true;
PGresult *res;
@ -238,7 +238,7 @@ reorg_one_database(const char *orderby, const char *table)
command("SET client_min_messages = warning", 0, NULL);
/* acquire target tables */
appendStringInfoString(&sql, "SELECT * FROM reorg.tables WHERE ");
appendStringInfoString(&sql, "SELECT * FROM repack.tables WHERE ");
if (table)
{
appendStringInfoString(&sql, "relid = $1::regclass");
@ -256,7 +256,7 @@ reorg_one_database(const char *orderby, const char *table)
{
if (sqlstate_equals(res, SQLSTATE_INVALID_SCHEMA_NAME))
{
/* Schema reorg does not exist. Skip the database. */
/* Schema repack does not exist. Skip the database. */
ret = false;
goto cleanup;
}
@ -273,7 +273,7 @@ reorg_one_database(const char *orderby, const char *table)
for (i = 0; i < num; i++)
{
reorg_table table;
repack_table table;
const char *create_table;
const char *ckey;
int c = 0;
@ -330,7 +330,7 @@ reorg_one_database(const char *orderby, const char *table)
table.sql_update = getstr(res, i, c++);
table.sql_pop = getstr(res, i, c++);
reorg_one_table(&table, orderby);
repack_one_table(&table, orderby);
}
cleanup:
@ -341,7 +341,7 @@ cleanup:
}
static int
apply_log(const reorg_table *table, int count)
apply_log(const repack_table *table, int count)
{
int result;
PGresult *res;
@ -355,7 +355,7 @@ apply_log(const reorg_table *table, int count)
params[4] = table->sql_pop;
params[5] = utoa(count, buffer);
res = execute("SELECT reorg.reorg_apply($1, $2, $3, $4, $5, $6)",
res = execute("SELECT repack.repack_apply($1, $2, $3, $4, $5, $6)",
6, params);
result = atoi(PQgetvalue(res, 0, 0));
PQclear(res);
@ -367,7 +367,7 @@ apply_log(const reorg_table *table, int count)
* Re-organize one table.
*/
static void
reorg_one_table(const reorg_table *table, const char *orderby)
repack_one_table(const repack_table *table, const char *orderby)
{
PGresult *res;
const char *params[1];
@ -380,7 +380,7 @@ reorg_one_table(const reorg_table *table, const char *orderby)
initStringInfo(&sql);
elog(DEBUG2, "---- reorg_one_table ----");
elog(DEBUG2, "---- repack_one_table ----");
elog(DEBUG2, "target_name : %s", table->target_name);
elog(DEBUG2, "target_oid : %u", table->target_oid);
elog(DEBUG2, "target_toast : %u", table->target_toast);
@ -408,12 +408,12 @@ reorg_one_table(const reorg_table *table, const char *orderby)
lock_exclusive(utoa(table->target_oid, buffer), table->lock_table);
/*
* Check z_reorg_trigger is the trigger executed at last so that
* Check z_repack_trigger is the trigger executed at last so that
* other before triggers cannot modify triggered tuples.
*/
params[0] = utoa(table->target_oid, buffer);
res = execute("SELECT reorg.conflicted_triggers($1)", 1, params);
res = execute("SELECT repack.conflicted_triggers($1)", 1, params);
if (PQntuples(res) > 0)
ereport(ERROR,
(errcode(E_PG_COMMAND),
@ -425,7 +425,7 @@ reorg_one_table(const reorg_table *table, const char *orderby)
command(table->create_log, 0, NULL);
command(table->create_trigger, 0, NULL);
command(table->alter_table, 0, NULL);
printfStringInfo(&sql, "SELECT reorg.disable_autovacuum('reorg.log_%u')", table->target_oid);
printfStringInfo(&sql, "SELECT repack.disable_autovacuum('repack.log_%u')", table->target_oid);
command(sql.data, 0, NULL);
command("COMMIT", 0, NULL);
@ -434,7 +434,7 @@ reorg_one_table(const reorg_table *table, const char *orderby)
* an advisory lock. The registration should be done after
* the first command succeeds.
*/
pgut_atexit_push(&reorg_cleanup, (void *) table);
pgut_atexit_push(&repack_cleanup, (void *) table);
/*
* 2. Copy tuples into temp table.
@ -451,7 +451,7 @@ reorg_one_table(const reorg_table *table, const char *orderby)
PQclear(res);
command(table->delete_log, 0, NULL);
command(table->create_table, 0, NULL);
printfStringInfo(&sql, "SELECT reorg.disable_autovacuum('reorg.table_%u')", table->target_oid);
printfStringInfo(&sql, "SELECT repack.disable_autovacuum('repack.table_%u')", table->target_oid);
if (table->drop_columns)
command(table->drop_columns, 0, NULL);
command(sql.data, 0, NULL);
@ -464,7 +464,7 @@ reorg_one_table(const reorg_table *table, const char *orderby)
params[0] = utoa(table->target_oid, buffer);
res = execute("SELECT indexrelid,"
" reorg.reorg_indexdef(indexrelid, indrelid),"
" repack.repack_indexdef(indexrelid, indrelid),"
" indisvalid,"
" pg_get_indexdef(indexrelid)"
" FROM pg_index WHERE indrelid = $1", 1, params);
@ -472,7 +472,7 @@ reorg_one_table(const reorg_table *table, const char *orderby)
num = PQntuples(res);
for (i = 0; i < num; i++)
{
reorg_index index;
repack_index index;
int c = 0;
const char *isvalid;
const char *indexdef;
@ -548,7 +548,7 @@ reorg_one_table(const reorg_table *table, const char *orderby)
lock_exclusive(utoa(table->target_oid, buffer), table->lock_table);
apply_log(table, 0);
params[0] = utoa(table->target_oid, buffer);
command("SELECT reorg.reorg_swap($1)", 1, params);
command("SELECT repack.repack_swap($1)", 1, params);
command("COMMIT", 0, NULL);
/*
@ -558,10 +558,10 @@ reorg_one_table(const reorg_table *table, const char *orderby)
command("BEGIN ISOLATION LEVEL READ COMMITTED", 0, NULL);
params[0] = utoa(table->target_oid, buffer);
command("SELECT reorg.reorg_drop($1)", 1, params);
command("SELECT repack.repack_drop($1)", 1, params);
command("COMMIT", 0, NULL);
pgut_atexit_pop(&reorg_cleanup, (void *) table);
pgut_atexit_pop(&repack_cleanup, (void *) table);
free(vxid);
/*
@ -660,9 +660,9 @@ lock_exclusive(const char *relid, const char *lock_query)
* objects before the program exits.
*/
static void
reorg_cleanup(bool fatal, void *userdata)
repack_cleanup(bool fatal, void *userdata)
{
const reorg_table *table = (const reorg_table *) userdata;
const repack_table *table = (const repack_table *) userdata;
if (fatal)
{
@ -683,7 +683,7 @@ reorg_cleanup(bool fatal, void *userdata)
/* do cleanup */
params[0] = utoa(table->target_oid, buffer);
command("SELECT reorg.reorg_drop($1)", 1, params);
command("SELECT repack.repack_drop($1)", 1, params);
}
}
@ -698,10 +698,10 @@ pgut_help(bool details)
return;
printf("Options:\n");
printf(" -a, --all reorg all databases\n");
printf(" -a, --all repack all databases\n");
printf(" -n, --no-order do vacuum full instead of cluster\n");
printf(" -o, --order-by=columns order by columns instead of cluster keys\n");
printf(" -t, --table=TABLE reorg specific table only\n");
printf(" -t, --table=TABLE repack specific table only\n");
printf(" -T, --wait-timeout=secs timeout to cancel other backends on conflict\n");
printf(" -Z, --no-analyze don't analyze at end\n");
}

2
bin/sql/init-extension.sql
View File

@ -1,5 +1,5 @@
SET client_min_messages = warning;
\set ECHO none
CREATE EXTENSION pg_reorg;
CREATE EXTENSION pg_repack;
\set ECHO all
RESET client_min_messages;

2
bin/sql/init-legacy.sql
View File

@ -1,5 +1,5 @@
SET client_min_messages = warning;
\set ECHO none
\i ../lib/pg_reorg.sql
\i ../lib/pg_repack.sql
\set ECHO all
RESET client_min_messages;

16
bin/sql/reorg.sql → bin/sql/repack.sql
View File

@ -113,12 +113,12 @@ SELECT * FROM view_for_dropped_column;
SELECT * FROM tbl_with_dropped_toast;
--
-- do reorg
-- do repack
--
\! pg_reorg --dbname=contrib_regression --no-order
\! pg_reorg --dbname=contrib_regression
\! pg_reorg --dbname=contrib_regression --table=tbl_cluster
\! pg_repack --dbname=contrib_regression --no-order
\! pg_repack --dbname=contrib_regression
\! pg_repack --dbname=contrib_regression --table=tbl_cluster
--
-- after
@ -171,11 +171,11 @@ CREATE TABLE tbl_nn (col1 int NOT NULL, col2 int NOT NULL);
CREATE TABLE tbl_uk (col1 int NOT NULL, col2 int , UNIQUE(col1, col2));
CREATE TABLE tbl_nn_uk (col1 int NOT NULL, col2 int NOT NULL, UNIQUE(col1, col2));
CREATE TABLE tbl_pk_uk (col1 int NOT NULL, col2 int NOT NULL, PRIMARY KEY(col1, col2), UNIQUE(col2, col1));
\! pg_reorg --dbname=contrib_regression --no-order --table=tbl_nn
\! pg_repack --dbname=contrib_regression --no-order --table=tbl_nn
-- => ERROR
\! pg_reorg --dbname=contrib_regression --no-order --table=tbl_uk
\! pg_repack --dbname=contrib_regression --no-order --table=tbl_uk
-- => ERROR
\! pg_reorg --dbname=contrib_regression --no-order --table=tbl_nn_uk
\! pg_repack --dbname=contrib_regression --no-order --table=tbl_nn_uk
-- => OK
\! pg_reorg --dbname=contrib_regression --no-order --table=tbl_pk_uk
\! pg_repack --dbname=contrib_regression --no-order --table=tbl_pk_uk
-- => OK