Restructure the _rlbk_end() function in order to move the sequences r…

…ollback (which is not transaction safe) a little bit later in the operations. Also remove some obsolete lines of code.
dalibo · Dec 9, 2022 · 70a2aad · 70a2aad
1 parent 325362b
commit 70a2aad
Show file tree

Hide file tree

Showing 14 changed files with 644 additions and 404 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -3,7 +3,7 @@ E-Maj - Change log
 <devel>
 ------
 ###Enhancements:###
-
+  * Minor code changes.
 
 ###Bug fixes:###
 

diff --git a/sql/emaj--4.1.0--devel.sql b/sql/emaj--4.1.0--devel.sql
diff --git a/sql/emaj--devel.sql b/sql/emaj--devel.sql
diff --git a/sql/emaj-devel.sql b/sql/emaj-devel.sql
diff --git a/test/10/expected/rollback.out b/test/10/expected/rollback.out
@@ -620,7 +620,7 @@ SQL statement "SELECT emaj._rlbk_seq(t.*, greatest(v_markTimeId, lower(t.rel_tim
              AND rel_kind = 'S'
            ORDER BY rel_schema, rel_tblseq
         ) as t"
-PL/pgSQL function emaj._rlbk_end(integer,boolean) line 138 at PERFORM
+PL/pgSQL function emaj._rlbk_end(integer,boolean) line 237 at PERFORM
 PL/pgSQL function emaj._rlbk_groups(text[],text,boolean,boolean,boolean) line 34 at RETURN QUERY
 PL/pgSQL function emaj.emaj_rollback_group(text,text,boolean) line 7 at RETURN QUERY
 rollback;

diff --git a/test/11/expected/install_psql.out b/test/11/expected/install_psql.out
diff --git a/test/11/expected/rollback.out b/test/11/expected/rollback.out
@@ -620,7 +620,7 @@ SQL statement "SELECT emaj._rlbk_seq(t.*, greatest(v_markTimeId, lower(t.rel_tim
              AND rel_kind = 'S'
            ORDER BY rel_schema, rel_tblseq
         ) as t"
-PL/pgSQL function emaj._rlbk_end(integer,boolean) line 138 at PERFORM
+PL/pgSQL function emaj._rlbk_end(integer,boolean) line 237 at PERFORM
 PL/pgSQL function emaj._rlbk_groups(text[],text,boolean,boolean,boolean) line 34 at RETURN QUERY
 PL/pgSQL function emaj.emaj_rollback_group(text,text,boolean) line 7 at RETURN QUERY
 rollback;

diff --git a/test/12/expected/rollback.out b/test/12/expected/rollback.out
@@ -620,7 +620,7 @@ SQL statement "SELECT emaj._rlbk_seq(t.*, greatest(v_markTimeId, lower(t.rel_tim
              AND rel_kind = 'S'
            ORDER BY rel_schema, rel_tblseq
         ) as t"
-PL/pgSQL function emaj._rlbk_end(integer,boolean) line 138 at PERFORM
+PL/pgSQL function emaj._rlbk_end(integer,boolean) line 237 at PERFORM
 PL/pgSQL function emaj._rlbk_groups(text[],text,boolean,boolean,boolean) line 34 at RETURN QUERY
 PL/pgSQL function emaj.emaj_rollback_group(text,text,boolean) line 7 at RETURN QUERY
 rollback;

diff --git a/test/13/expected/rollback.out b/test/13/expected/rollback.out
@@ -620,7 +620,7 @@ SQL statement "SELECT emaj._rlbk_seq(t.*, greatest(v_markTimeId, lower(t.rel_tim
              AND rel_kind = 'S'
            ORDER BY rel_schema, rel_tblseq
         ) as t"
-PL/pgSQL function emaj._rlbk_end(integer,boolean) line 138 at PERFORM
+PL/pgSQL function emaj._rlbk_end(integer,boolean) line 237 at PERFORM
 PL/pgSQL function emaj._rlbk_groups(text[],text,boolean,boolean,boolean) line 34 at RETURN QUERY
 PL/pgSQL function emaj.emaj_rollback_group(text,text,boolean) line 7 at RETURN QUERY
 rollback;

diff --git a/test/14/expected/rollback.out b/test/14/expected/rollback.out
@@ -688,7 +688,7 @@ SQL statement "SELECT emaj._rlbk_seq(t.*, greatest(v_markTimeId, lower(t.rel_tim
              AND rel_kind = 'S'
            ORDER BY rel_schema, rel_tblseq
         ) as t"
-PL/pgSQL function emaj._rlbk_end(integer,boolean) line 138 at PERFORM
+PL/pgSQL function emaj._rlbk_end(integer,boolean) line 237 at PERFORM
 SQL statement "SELECT *
         FROM emaj._rlbk_end(v_rlbkId, p_multiGroup)"
 PL/pgSQL function emaj._rlbk_groups(text[],text,boolean,boolean,boolean) line 34 at RETURN QUERY

diff --git a/test/15/expected/check.out b/test/15/expected/check.out
@@ -180,8 +180,8 @@ select funcname, calls from pg_stat_user_functions
  _start_groups                             |    53
  _stop_groups                              |    67
  _truncate_trigger_fnct                    |    16
- _verify_all_groups                        |    47
- _verify_all_schemas                       |    47
+ _verify_all_groups                        |    48
+ _verify_all_schemas                       |    48
  emaj_assign_sequence                      |     6
  emaj_assign_sequences                     |     7
  emaj_assign_sequences                     |    13
@@ -255,14 +255,14 @@ select funcname, calls from pg_stat_user_functions
  emaj_stop_groups                          |    10
  emaj_unprotect_group                      |     7
  emaj_unprotect_mark_group                 |     6
- emaj_verify_all                           |    47
+ emaj_verify_all                           |    48
 (168 rows)
 
 -- count the total number of user-callable function calls (those who failed are not counted)
 select sum(calls) from pg_stat_user_functions where funcname like E'emaj\\_%';
  sum 
 -----
- 997
+ 998
 (1 row)
 
 -----------------------------

diff --git a/test/15/expected/rollback.out b/test/15/expected/rollback.out
@@ -688,7 +688,7 @@ SQL statement "SELECT emaj._rlbk_seq(t.*, greatest(v_markTimeId, lower(t.rel_tim
              AND rel_kind = 'S'
            ORDER BY rel_schema, rel_tblseq
         ) as t"
-PL/pgSQL function emaj._rlbk_end(integer,boolean) line 138 at PERFORM
+PL/pgSQL function emaj._rlbk_end(integer,boolean) line 237 at PERFORM
 SQL statement "SELECT *
         FROM emaj._rlbk_end(v_rlbkId, p_multiGroup)"
 PL/pgSQL function emaj._rlbk_groups(text[],text,boolean,boolean,boolean) line 34 at RETURN QUERY

diff --git a/test/95/expected/rollback.out b/test/95/expected/rollback.out
@@ -591,7 +591,7 @@ CONTEXT:  SQL statement "SELECT emaj._rlbk_seq(t.*, greatest(v_markTimeId, lower
              AND rel_kind = 'S'
            ORDER BY rel_schema, rel_tblseq
         ) as t"
-PL/pgSQL function emaj._rlbk_end(integer,boolean) line 138 at PERFORM
+PL/pgSQL function emaj._rlbk_end(integer,boolean) line 237 at PERFORM
 PL/pgSQL function emaj._rlbk_groups(text[],text,boolean,boolean,boolean) line 34 at RETURN QUERY
 PL/pgSQL function emaj.emaj_rollback_group(text,text,boolean) line 7 at RETURN QUERY
 rollback;

diff --git a/test/96/expected/rollback.out b/test/96/expected/rollback.out
@@ -620,7 +620,7 @@ SQL statement "SELECT emaj._rlbk_seq(t.*, greatest(v_markTimeId, lower(t.rel_tim
              AND rel_kind = 'S'
            ORDER BY rel_schema, rel_tblseq
         ) as t"
-PL/pgSQL function emaj._rlbk_end(integer,boolean) line 138 at PERFORM
+PL/pgSQL function emaj._rlbk_end(integer,boolean) line 237 at PERFORM
 PL/pgSQL function emaj._rlbk_groups(text[],text,boolean,boolean,boolean) line 34 at RETURN QUERY
 PL/pgSQL function emaj.emaj_rollback_group(text,text,boolean) line 7 at RETURN QUERY
 rollback;