diff options
| author | Simon Riggs <simon@2ndQuadrant.com> | 2010-01-14 11:08:02 +0000 |
|---|---|---|
| committer | Simon Riggs <simon@2ndQuadrant.com> | 2010-01-14 11:08:02 +0000 |
| commit | e99767bc28d8ef9ea627cd63336b2b74087c0128 (patch) | |
| tree | 29cae5f633b1ede8d959daec86aa2bb40170326d /src/include | |
| parent | 0fba3bef558036952f59846a7e7b48e1f5b9e479 (diff) | |
| download | postgresql-e99767bc28d8ef9ea627cd63336b2b74087c0128.tar.gz postgresql-e99767bc28d8ef9ea627cd63336b2b74087c0128.zip | |
First part of refactoring of code for ResolveRecoveryConflict. Purposes
of this are to centralise the conflict code to allow further change,
as well as to allow passing through the full reason for the conflict
through to the conflicting backends. Backend state alters how we
can handle different types of conflict so this is now required.
As originally suggested by Heikki, no longer optional.
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/storage/standby.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/include/storage/standby.h b/src/include/storage/standby.h index a58d666f0de..3f2e2c2d855 100644 --- a/src/include/storage/standby.h +++ b/src/include/storage/standby.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2010, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $PostgreSQL: pgsql/src/include/storage/standby.h,v 1.2 2010/01/02 16:58:08 momjian Exp $ + * $PostgreSQL: pgsql/src/include/storage/standby.h,v 1.3 2010/01/14 11:08:02 sriggs Exp $ * *------------------------------------------------------------------------- */ @@ -24,8 +24,9 @@ extern int vacuum_defer_cleanup_age; #define CONFLICT_MODE_ERROR 1 /* Conflict can be resolved by canceling query */ #define CONFLICT_MODE_FATAL 2 /* Conflict can only be resolved by disconnecting session */ -extern void ResolveRecoveryConflictWithVirtualXIDs(VirtualTransactionId *waitlist, - char *reason, int cancel_mode); +extern void ResolveRecoveryConflictWithSnapshot(TransactionId latestRemovedXid); +extern void ResolveRecoveryConflictWithTablespace(Oid tsid); +extern void ResolveRecoveryConflictWithDatabase(Oid dbid); extern void InitRecoveryTransactionEnvironment(void); extern void ShutdownRecoveryTransactionEnvironment(void); |