Rename injection point for invalidation messages at end of transaction

This injection point was named "AtEOXact_Inval-with-transInvalInfo", not
respecting the implied naming convention that injection points should
use lower-case characters, with terms separated by dashes.  All the
other points defined in the tree follow this style, so let's be more
consistent.

Author: Hayato Kuroda <[email protected]>
Reviewed-by: Aleksander Alekseev <[email protected]>
Discussion: https://postgr.es/m/OSCPR01MB14966E14C1378DEE51FB7B7C5F5B32@OSCPR01MB14966.jpnprd01.prod.outlook.com
Backpatch-through: 17

diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index 3ce4775b829b3101ed8b78c8ad429bf807e60ad7..66e04f973f67565138c835092a8ecdbd3a999436 100644 (file)
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -1032,7 +1032,7 @@ AtEOXact_Inval(bool isCommit)
    /* Must be at top of stack */
    Assert(transInvalInfo->my_level == 1 && transInvalInfo->parent == NULL);
 
-   INJECTION_POINT("AtEOXact_Inval-with-transInvalInfo");
+   INJECTION_POINT("transaction-end-process-inval");
 
    if (isCommit)
    {

diff --git a/src/test/modules/injection_points/expected/syscache-update-pruned.out b/src/test/modules/injection_points/expected/syscache-update-pruned.out
index 9a9683bb4962570ab7f3dccd76e811a3601e55be..a6a4e8db996b15fce2d4bd58892d84ed56639ed3 100644 (file)
--- a/src/test/modules/injection_points/expected/syscache-update-pruned.out
+++ b/src/test/modules/injection_points/expected/syscache-update-pruned.out
@@ -10,8 +10,8 @@ step waitprunable4: CALL vactest.wait_prunable();
 step vac4: VACUUM (FREEZE, DISABLE_PAGE_SKIPPING) pg_class;
 step grant1: GRANT SELECT ON vactest.orig50 TO PUBLIC; <waiting ...>
 step wakeinval4: 
-   SELECT FROM injection_points_detach('AtEOXact_Inval-with-transInvalInfo');
-   SELECT FROM injection_points_wakeup('AtEOXact_Inval-with-transInvalInfo');
+   SELECT FROM injection_points_detach('transaction-end-process-inval');
+   SELECT FROM injection_points_wakeup('transaction-end-process-inval');
  <waiting ...>
 step at2: <... completed>
 step wakeinval4: <... completed>
@@ -33,8 +33,8 @@ step waitprunable4: CALL vactest.wait_prunable();
 step vac4: VACUUM (FREEZE, DISABLE_PAGE_SKIPPING) pg_class;
 step grant1: GRANT SELECT ON vactest.orig50 TO PUBLIC; <waiting ...>
 step wakeinval4: 
-   SELECT FROM injection_points_detach('AtEOXact_Inval-with-transInvalInfo');
-   SELECT FROM injection_points_wakeup('AtEOXact_Inval-with-transInvalInfo');
+   SELECT FROM injection_points_detach('transaction-end-process-inval');
+   SELECT FROM injection_points_wakeup('transaction-end-process-inval');
  <waiting ...>
 step at2: <... completed>
 step wakeinval4: <... completed>
@@ -64,8 +64,8 @@ step waitprunable4: CALL vactest.wait_prunable();
 step vac4: VACUUM (FREEZE, DISABLE_PAGE_SKIPPING) pg_class;
 step grant1: GRANT SELECT ON vactest.orig50 TO PUBLIC; <waiting ...>
 step wakeinval4: 
-   SELECT FROM injection_points_detach('AtEOXact_Inval-with-transInvalInfo');
-   SELECT FROM injection_points_wakeup('AtEOXact_Inval-with-transInvalInfo');
+   SELECT FROM injection_points_detach('transaction-end-process-inval');
+   SELECT FROM injection_points_wakeup('transaction-end-process-inval');
  <waiting ...>
 step at2: <... completed>
 step wakeinval4: <... completed>

diff --git a/src/test/modules/injection_points/expected/syscache-update-pruned_1.out b/src/test/modules/injection_points/expected/syscache-update-pruned_1.out
index 64c39d708bd5fedae34ad2126bd2fc1f6d91aacd..4dca2b86bc888af8260ef2fb1e49bb609b86f90a 100644 (file)
--- a/src/test/modules/injection_points/expected/syscache-update-pruned_1.out
+++ b/src/test/modules/injection_points/expected/syscache-update-pruned_1.out
@@ -10,8 +10,8 @@ step waitprunable4: CALL vactest.wait_prunable();
 step vac4: VACUUM (FREEZE, DISABLE_PAGE_SKIPPING) pg_class;
 step grant1: GRANT SELECT ON vactest.orig50 TO PUBLIC; <waiting ...>
 step wakeinval4: 
-   SELECT FROM injection_points_detach('AtEOXact_Inval-with-transInvalInfo');
-   SELECT FROM injection_points_wakeup('AtEOXact_Inval-with-transInvalInfo');
+   SELECT FROM injection_points_detach('transaction-end-process-inval');
+   SELECT FROM injection_points_wakeup('transaction-end-process-inval');
  <waiting ...>
 step at2: <... completed>
 step wakeinval4: <... completed>
@@ -32,8 +32,8 @@ step waitprunable4: CALL vactest.wait_prunable();
 step vac4: VACUUM (FREEZE, DISABLE_PAGE_SKIPPING) pg_class;
 step grant1: GRANT SELECT ON vactest.orig50 TO PUBLIC; <waiting ...>
 step wakeinval4: 
-   SELECT FROM injection_points_detach('AtEOXact_Inval-with-transInvalInfo');
-   SELECT FROM injection_points_wakeup('AtEOXact_Inval-with-transInvalInfo');
+   SELECT FROM injection_points_detach('transaction-end-process-inval');
+   SELECT FROM injection_points_wakeup('transaction-end-process-inval');
  <waiting ...>
 step at2: <... completed>
 step wakeinval4: <... completed>
@@ -62,8 +62,8 @@ step waitprunable4: CALL vactest.wait_prunable();
 step vac4: VACUUM (FREEZE, DISABLE_PAGE_SKIPPING) pg_class;
 step grant1: GRANT SELECT ON vactest.orig50 TO PUBLIC; <waiting ...>
 step wakeinval4: 
-   SELECT FROM injection_points_detach('AtEOXact_Inval-with-transInvalInfo');
-   SELECT FROM injection_points_wakeup('AtEOXact_Inval-with-transInvalInfo');
+   SELECT FROM injection_points_detach('transaction-end-process-inval');
+   SELECT FROM injection_points_wakeup('transaction-end-process-inval');
  <waiting ...>
 step at2: <... completed>
 step wakeinval4: <... completed>

diff --git a/src/test/modules/injection_points/specs/syscache-update-pruned.spec b/src/test/modules/injection_points/specs/syscache-update-pruned.spec
index 086d084de2577b8b0d9eadc934658260f415b252..e3a4295bd12e8a739a23fb4d0308286663fc3c32 100644 (file)
--- a/src/test/modules/injection_points/specs/syscache-update-pruned.spec
+++ b/src/test/modules/injection_points/specs/syscache-update-pruned.spec
@@ -117,7 +117,7 @@ session s2
 setup  {
    SELECT FROM injection_points_set_local();
    SELECT FROM
-       injection_points_attach('AtEOXact_Inval-with-transInvalInfo', 'wait');
+       injection_points_attach('transaction-end-process-inval', 'wait');
 }
 step at2   {
    CREATE TRIGGER to_set_relhastriggers BEFORE UPDATE ON vactest.orig50
@@ -145,8 +145,8 @@ step wakegrant4 {
 }
 step at4   { ALTER TABLE vactest.child50 INHERIT vactest.orig50; }
 step wakeinval4    {
-   SELECT FROM injection_points_detach('AtEOXact_Inval-with-transInvalInfo');
-   SELECT FROM injection_points_wakeup('AtEOXact_Inval-with-transInvalInfo');
+   SELECT FROM injection_points_detach('transaction-end-process-inval');
+   SELECT FROM injection_points_wakeup('transaction-end-process-inval');
 }
 # Witness effects of steps at2 and/or at4.
 step inspect4  {