]> granicus.if.org Git - postgresql/commitdiff
Use errdetail_internal() for SSI transaction cancellation details.
authorTom Lane <tgl@sss.pgh.pa.us>
Sat, 16 Jul 2011 17:49:44 +0000 (13:49 -0400)
committerTom Lane <tgl@sss.pgh.pa.us>
Sat, 16 Jul 2011 18:22:33 +0000 (14:22 -0400)
Per discussion, these seem too technical to be worth translating.

Kevin Grittner

src/backend/storage/lmgr/predicate.c

index 35fbc8f5a2d6c7e278385e5d789fc93d4d9b2e4f..91052d30f086287cff3db098a8bf99bc231af2af 100644 (file)
@@ -3776,7 +3776,7 @@ CheckForSerializableConflictOut(bool visible, Relation relation,
                ereport(ERROR,
                                (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
                                 errmsg("could not serialize access due to read/write dependencies among transactions"),
-                                errdetail("Canceled on identification as a pivot, during conflict out checking."),
+                                errdetail_internal("Canceled on identification as a pivot, during conflict out checking."),
                                 errhint("The transaction might succeed if retried.")));
        }
 
@@ -3865,7 +3865,7 @@ CheckForSerializableConflictOut(bool visible, Relation relation,
                                ereport(ERROR,
                                                (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
                                                 errmsg("could not serialize access due to read/write dependencies among transactions"),
-                               errdetail("Canceled on conflict out to old pivot %u.", xid),
+                                                errdetail_internal("Canceled on conflict out to old pivot %u.", xid),
                                          errhint("The transaction might succeed if retried.")));
 
                        if (SxactHasSummaryConflictIn(MySerializableXact)
@@ -3873,7 +3873,7 @@ CheckForSerializableConflictOut(bool visible, Relation relation,
                                ereport(ERROR,
                                                (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
                                                 errmsg("could not serialize access due to read/write dependencies among transactions"),
-                                                errdetail("Canceled on identification as a pivot, with conflict out to old committed transaction %u.", xid),
+                                                errdetail_internal("Canceled on identification as a pivot, with conflict out to old committed transaction %u.", xid),
                                          errhint("The transaction might succeed if retried.")));
 
                        MySerializableXact->flags |= SXACT_FLAG_SUMMARY_CONFLICT_OUT;
@@ -3912,7 +3912,7 @@ CheckForSerializableConflictOut(bool visible, Relation relation,
                        ereport(ERROR,
                                        (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
                                         errmsg("could not serialize access due to read/write dependencies among transactions"),
-                                        errdetail("Canceled on conflict out to old pivot."),
+                               errdetail_internal("Canceled on conflict out to old pivot."),
                                         errhint("The transaction might succeed if retried.")));
                }
        }
@@ -4151,7 +4151,7 @@ CheckForSerializableConflictIn(Relation relation, HeapTuple tuple,
                ereport(ERROR,
                                (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
                                 errmsg("could not serialize access due to read/write dependencies among transactions"),
-                                errdetail("Canceled on identification as a pivot, during conflict in checking."),
+                                errdetail_internal("Canceled on identification as a pivot, during conflict in checking."),
                                 errhint("The transaction might succeed if retried.")));
 
        /*
@@ -4489,7 +4489,7 @@ OnConflict_CheckForSerializationFailure(const SERIALIZABLEXACT *reader,
                        ereport(ERROR,
                                        (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
                                         errmsg("could not serialize access due to read/write dependencies among transactions"),
-                                        errdetail("Canceled on identification as a pivot, during write."),
+                                        errdetail_internal("Canceled on identification as a pivot, during write."),
                                         errhint("The transaction might succeed if retried.")));
                }
                else if (SxactIsPrepared(writer))
@@ -4501,7 +4501,7 @@ OnConflict_CheckForSerializationFailure(const SERIALIZABLEXACT *reader,
                        ereport(ERROR,
                                        (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
                                         errmsg("could not serialize access due to read/write dependencies among transactions"),
-                                        errdetail("Canceled on conflict out to pivot %u, during read.", writer->topXid),
+                                        errdetail_internal("Canceled on conflict out to pivot %u, during read.", writer->topXid),
                                         errhint("The transaction might succeed if retried.")));
                }
                writer->flags |= SXACT_FLAG_DOOMED;
@@ -4543,7 +4543,7 @@ PreCommit_CheckForSerializationFailure(void)
                ereport(ERROR,
                                (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
                                 errmsg("could not serialize access due to read/write dependencies among transactions"),
-                                errdetail("Canceled on identification as a pivot, during commit attempt."),
+                                errdetail_internal("Canceled on identification as a pivot, during commit attempt."),
                                 errhint("The transaction might succeed if retried.")));
        }
 
@@ -4581,7 +4581,7 @@ PreCommit_CheckForSerializationFailure(void)
                                                ereport(ERROR,
                                                                (errcode(ERRCODE_T_R_SERIALIZATION_FAILURE),
                                                                 errmsg("could not serialize access due to read/write dependencies among transactions"),
-                                                                errdetail("Canceled on commit attempt with conflict in from prepared pivot."),
+                                                                errdetail_internal("Canceled on commit attempt with conflict in from prepared pivot."),
                                                                 errhint("The transaction might succeed if retried.")));
                                        }
                                        nearConflict->sxactOut->flags |= SXACT_FLAG_DOOMED;