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

Change trigger name from a_repack_trigger to repack_trigger.

Browse Source 
In AFTER trigger context, since triggered tuple is not changed by
any other triggers we can call it just repack_trigger.
This commit is contained in:
Masahiko Sawada
2017-01-24 14:09:05 +09:00
parent d83ee3d6a0
commit 375f03c0c3
7 changed files with 33 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
bin/pg_repack.c
View File

@ -186,8 +186,8 @@ typedef struct repack_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 a_repack_trigger */
const char *enable_trigger; /* ALTER TABLE ENABLE ALWAYS TRIGGER a_repack_trigger */
const char *create_trigger; /* CREATE TRIGGER repack_trigger */
const char *enable_trigger; /* ALTER TABLE ENABLE ALWAYS TRIGGER 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 */
@ -1024,7 +1024,7 @@ repack_one_table(repack_table *table, const char *orderby)
const char *appname = getenv("PGAPPNAME");
/* Keep track of whether we have gotten through setup to install
* the a_repack_trigger, log table, etc. ourselves. We don't want to
* the repack_trigger, log table, etc. ourselves. We don't want to
* go through repack_cleanup() if we didn't actually set up the
* trigger ourselves, lest we be cleaning up another pg_repack's mess,
* or worse, interfering with a still-running pg_repack.
@ -1126,43 +1126,28 @@ repack_one_table(repack_table *table, const char *orderby)
/*
* Check a_repack_trigger is the after trigger executed first
* so that other before triggers cannot modify triggered tuples.
* Check if repack_trigger is not conflict with existing trigger. We can
* find it out later but we check it in advance and go to cleanup if needed.
* In AFTER trigger context, since triggered tuple is not changed by other
* trigger we don't care about the fire order.
*/
res = execute("SELECT repack.conflicted_triggers($1)", 1, params);
if (PQntuples(res) > 0)
{
if (0 == strcmp("a_repack_trigger", PQgetvalue(res, 0, 0)))
{
ereport(WARNING,
ereport(WARNING,
(errcode(E_PG_COMMAND),
errmsg("the table \"%s\" already has a trigger called \"%s\"",
table->target_name, PQgetvalue(res, 0, 0)),
table->target_name, "repack_trigger"),
errdetail(
"The trigger was probably installed during a previous"
" attempt to run pg_repack on the table which was"
" interrupted and for some reason failed to clean up"
" the temporary objects. Please drop the trigger or drop"
"The trigger was probably installed during a previous"
" attempt to run pg_repack on the table which was"
" interrupted and for some reason failed to clean up"
" the temporary objects. Please drop the trigger or drop"
" and recreate the pg_repack extension altogether"
" to remove all the temporary objects left over.")));
}
else
{
ereport(WARNING,
(errcode(E_PG_COMMAND),
errmsg("trigger \"%s\" conflicting on table \"%s\"",
PQgetvalue(res, 0, 0), table->target_name),
errdetail(
"The trigger \"a_repack_trigger\" must be the first of the"
" AFTER triggers to fire on the table (triggers fire in"
" alphabetical order). Please rename the trigger so that"
" it sorts after \"a_repack_trigger\": you can use"
" \"ALTER TRIGGER %s ON %s RENAME TO newname\".",
PQgetvalue(res, 0, 0), table->target_name)));
}
" to remove all the temporary objects left over.")));
goto cleanup;
}
CLEARPGRES(res);
command(table->create_pktype, 0, NULL);
@ -1232,7 +1217,7 @@ repack_one_table(repack_table *table, const char *orderby)
*/
command("COMMIT", 0, NULL);
/* The main connection has now committed its a_repack_trigger,
/* The main connection has now committed its repack_trigger,
* log table, and temp. table. If any error occurs from this point
* on and we bail out, we should try to clean those up.
*/