Dept. of second thoughts: regular COMMIT deletes deletable files before

releasing locks, so COMMIT PREPARED should too.

diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index 01cc50a6a4670aa50df53a8eb62ac1392b063f36..388d9352ce962b9ff26e030ecc4ea051a0d77bc1 100644 (file)
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *     $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.1 2005/06/17 22:32:42 tgl Exp $
+ *     $PostgreSQL: pgsql/src/backend/access/transam/twophase.c,v 1.2 2005/06/18 05:21:09 tgl Exp $
  *
  * NOTES
  *     Each global transaction is associated with a global transaction
@@ -1114,13 +1114,11 @@ FinishPreparedTransaction(char *gid, bool isCommit)
     */
    gxact->valid = false;
 
-   if (isCommit)
-       ProcessRecords(bufptr, xid, twophase_postcommit_callbacks);
-   else
-       ProcessRecords(bufptr, xid, twophase_postabort_callbacks);
-
    /*
-    * We also have to remove any files that were supposed to be dropped.
+    * We have to remove any files that were supposed to be dropped.
+    * For consistency with the regular xact.c code paths, must do this
+    * before releasing locks, so do it before running the callbacks.
+    *
     * NB: this code knows that we couldn't be dropping any temp rels ...
     */
    if (isCommit)
@@ -1134,6 +1132,12 @@ FinishPreparedTransaction(char *gid, bool isCommit)
            smgrdounlink(smgropen(abortrels[i]), false, false);
    }
 
+   /* And now do the callbacks */
+   if (isCommit)
+       ProcessRecords(bufptr, xid, twophase_postcommit_callbacks);
+   else
+       ProcessRecords(bufptr, xid, twophase_postabort_callbacks);
+
    pgstat_count_xact_commit();
 
    /*