summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Momjian2007-03-03 20:08:41 +0000
committerBruce Momjian2007-03-03 20:08:41 +0000
commit95d115c7b4b047c5443fd110b29959dc021d771e (patch)
tree6adf89f634d8219da6af1a6bd9ed365ca8331168
parent863e65564c24bfc0ca1eafca8a137d60eb54709c (diff)
Fix for COPY-after-truncate feature.
Simon Riggs
-rw-r--r--src/backend/catalog/index.c1
-rw-r--r--src/backend/utils/cache/relcache.c28
-rw-r--r--src/include/utils/relcache.h2
3 files changed, 25 insertions, 6 deletions
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 5be09e85a1..d8f971bda1 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -1250,6 +1250,7 @@ setNewRelfilenode(Relation relation)
/* Remember we did this in current transaction, to allow later optimisations */
relation->rd_newRelfilenodeSubid = GetCurrentSubTransactionId();
+ RelationCacheResetAtEOXact();
/* Make sure the relfilenode change is visible */
CommandCounterIncrement();
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 0420ef10c0..b765065506 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -1915,9 +1915,6 @@ RelationCacheInvalidateEntry(Oid relationId)
* so we do not touch new-in-transaction relations; they cannot be targets
* of cross-backend SI updates (and our own updates now go through a
* separate linked list that isn't limited by the SI message buffer size).
- * We don't do anything special for newRelfilenode-in-transaction relations,
- * though since we have a lock on the relation nobody else should be
- * generating cache invalidation messages for it anyhow.
*
* We do this in two phases: the first pass deletes deletable items, and
* the second one rebuilds the rebuildable items. This is essential for
@@ -1960,6 +1957,14 @@ RelationCacheInvalidate(void)
if (relation->rd_createSubid != InvalidSubTransactionId)
continue;
+ /*
+ * Reset newRelfilenode hint. It is never used for correctness, only
+ * for performance optimization. An incorrectly set hint can lead
+ * to data loss in some circumstances, so play safe.
+ */
+ if (relation->rd_newRelfilenodeSubid != InvalidSubTransactionId)
+ relation->rd_newRelfilenodeSubid = InvalidSubTransactionId;
+
relcacheInvalsReceived++;
if (RelationHasReferenceCountZero(relation))
@@ -2012,6 +2017,17 @@ RelationCacheInvalidate(void)
}
/*
+ * RelationCacheResetAtEOXact
+ *
+ * Register that work will be required at main-transaction commit or abort
+ */
+void
+RelationCacheResetAtEOXact(void)
+{
+ need_eoxact_work = true;
+}
+
+/*
* AtEOXact_RelationCache
*
* Clean up the relcache at main-transaction commit or abort.
@@ -2161,7 +2177,7 @@ AtEOSubXact_RelationCache(bool isCommit, SubTransactionId mySubid,
if (isCommit)
relation->rd_newRelfilenodeSubid = parentSubid;
else
- relation->rd_newRelfilenodeSubid = InvalidSubTransactionId;
+ relation->rd_newRelfilenodeSubid = InvalidSubTransactionId;
}
/*
@@ -2255,7 +2271,7 @@ RelationBuildLocalRelation(const char *relname,
rel->rd_newRelfilenodeSubid = InvalidSubTransactionId;
/* must flag that we have rels created in this transaction */
- need_eoxact_work = true;
+ RelationCacheResetAtEOXact();
/* is it a temporary relation? */
rel->rd_istemp = isTempNamespace(relnamespace);
@@ -2911,7 +2927,7 @@ RelationSetIndexList(Relation relation, List *indexIds, Oid oidIndex)
relation->rd_oidindex = oidIndex;
relation->rd_indexvalid = 2; /* mark list as forced */
/* must flag that we have a forced index list */
- need_eoxact_work = true;
+ RelationCacheResetAtEOXact();
}
/*
diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h
index fe74728634..0bc7f1391e 100644
--- a/src/include/utils/relcache.h
+++ b/src/include/utils/relcache.h
@@ -60,6 +60,8 @@ extern void RelationCacheInvalidateEntry(Oid relationId);
extern void RelationCacheInvalidate(void);
+extern void RelationCacheResetAtEOXact(void);
+
extern void AtEOXact_RelationCache(bool isCommit);
extern void AtEOSubXact_RelationCache(bool isCommit, SubTransactionId mySubid,
SubTransactionId parentSubid);