Ignore CatalogSnapshot when checking COPY FREEZE prerequisites.

This restores the ability, essentially lost in commit
ffaa44cb559db332baeee7d25dedd74a61974203, to use COPY FREEZE under
REPEATABLE READ isolation.  Back-patch to 9.4, like that commit.

Reviewed by Tom Lane.

Discussion: https://postgr.es/m/CA+TgmoahWDm-7fperBxzU9uZ99LPMUmEpSXLTw9TmrOgzwnORw@mail.gmail.com

diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index 8006df32a810c90cc8feab48979af3b1d8ea83c1..1bdd4927d9c16454a4a5f84374d28ea8a0d5b88c 100644 (file)
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -2394,13 +2394,25 @@ CopyFrom(CopyState cstate)
    /*
     * Optimize if new relfilenode was created in this subxact or one of its
     * committed children and we won't see those rows later as part of an
-    * earlier scan or command. This ensures that if this subtransaction
-    * aborts then the frozen rows won't be visible after xact cleanup. Note
+    * earlier scan or command. The subxact test ensures that if this subxact
+    * aborts then the frozen rows won't be visible after xact cleanup.  Note
     * that the stronger test of exactly which subtransaction created it is
-    * crucial for correctness of this optimization.
+    * crucial for correctness of this optimization. The test for an earlier
+    * scan or command tolerates false negatives. FREEZE causes other sessions
+    * to see rows they would not see under MVCC, and a false negative merely
+    * spreads that anomaly to the current session.
     */
    if (cstate->freeze)
    {
+       /*
+        * Tolerate one registration for the benefit of FirstXactSnapshot.
+        * Scan-bearing queries generally create at least two registrations,
+        * though relying on that is fragile, as is ignoring ActiveSnapshot.
+        * Clear CatalogSnapshot to avoid counting its registration.  We'll
+        * still detect ongoing catalog scans, each of which separately
+        * registers the snapshot it uses.
+        */
+       InvalidateCatalogSnapshot();
        if (!ThereAreNoPriorRegisteredSnapshots() || !ThereAreNoReadyPortals())
            ereport(ERROR,
                    (errcode(ERRCODE_INVALID_TRANSACTION_STATE),

diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c
index 294ab705f1d3965deac1074c4fc1e4ccd0abc366..addf87dc3bb61ac1c2be4ea12580f7775c9a7a8f 100644 (file)
--- a/src/backend/utils/time/snapmgr.c
+++ b/src/backend/utils/time/snapmgr.c
@@ -1645,6 +1645,14 @@ DeleteAllExportedSnapshotFiles(void)
    FreeDir(s_dir);
 }
 
+/*
+ * ThereAreNoPriorRegisteredSnapshots
+ *     Is the registered snapshot count less than or equal to one?
+ *
+ * Don't use this to settle important decisions.  While zero registrations and
+ * no ActiveSnapshot would confirm a certain idleness, the system makes no
+ * guarantees about the significance of one registered snapshot.
+ */
 bool
 ThereAreNoPriorRegisteredSnapshots(void)
 {