[PGPRO-7614] Fix error caused by changing ATX level of package state at sub-transaction commit

kovdb75 · kovdb75 · commit c7898fce63c0 · 2023-01-17T15:22:55.000+03:00
Tags: pg_variables, atx
diff --git a/expected/pg_variables_atx_pkg.out b/expected/pg_variables_atx_pkg.out
@@ -406,6 +406,30 @@ BEGIN;
 
 	COMMIT;
 ROLLBACK;
+--
+--
+-- Test for case: pgv_set() created a regular variable and package with
+-- (atxlevel=1, level=1). ROLLBACK changes this level to (atxlevel=0, level=0).
+-- But ROLLBACK shouldn't change atxlevel in case rollback of sub-transaction.
+--
+BEGIN;
+	BEGIN AUTONOMOUS;
+		SAVEPOINT sp1;
+		SELECT pgv_set('vars1', 'int1', 0);
+ pgv_set 
+---------
+ 
+(1 row)
+
+		ROLLBACK TO sp1;
+	COMMIT;
+ROLLBACK;
+SELECT pgv_remove('vars1', 'int1');
+ pgv_remove 
+------------
+ 
+(1 row)
+
 SELECT pgv_free();
  pgv_free 
 ----------
diff --git a/expected/pg_variables_atx_pkg_1.out b/expected/pg_variables_atx_pkg_1.out
@@ -446,6 +446,28 @@ LINE 1: BEGIN AUTONOMOUS;
 WARNING:  there is no transaction in progress
 ROLLBACK;
 WARNING:  there is no transaction in progress
+--
+--
+-- Test for case: pgv_set() created a regular variable and package with
+-- (atxlevel=1, level=1). ROLLBACK changes this level to (atxlevel=0, level=0).
+-- But ROLLBACK shouldn't change atxlevel in case rollback of sub-transaction.
+--
+BEGIN;
+	BEGIN AUTONOMOUS;
+ERROR:  syntax error at or near "AUTONOMOUS"
+LINE 1: BEGIN AUTONOMOUS;
+              ^
+		SAVEPOINT sp1;
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
+		SELECT pgv_set('vars1', 'int1', 0);
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
+		ROLLBACK TO sp1;
+ERROR:  savepoint "sp1" does not exist
+	COMMIT;
+ROLLBACK;
+WARNING:  there is no transaction in progress
+SELECT pgv_remove('vars1', 'int1');
+ERROR:  unrecognized package "vars1"
 SELECT pgv_free();
  pgv_free 
 ----------
diff --git a/pg_variables.c b/pg_variables.c
@@ -65,7 +65,7 @@ static void resetVariablesCache(void);
 /* Functions to work with transactional objects */
 static void createSavepoint(TransObject *object, TransObjectType type);
 static void releaseSavepoint(TransObject *object, TransObjectType type, bool sub);
-static void rollbackSavepoint(TransObject *object, TransObjectType type);
+static void rollbackSavepoint(TransObject *object, TransObjectType type, bool sub);
 
 static void copyValue(VarState *src, VarState *dest, Variable *destVar);
 static void freeValue(VarState *varstate, bool is_record);
@@ -2329,7 +2329,7 @@ numOfRegVars(Package *package)
  * Rollback object to its previous state
  */
 static void
-rollbackSavepoint(TransObject *object, TransObjectType type)
+rollbackSavepoint(TransObject *object, TransObjectType type, bool sub)
 {
 	TransState *state;
 
@@ -2359,9 +2359,9 @@ rollbackSavepoint(TransObject *object, TransObjectType type)
 				 * as 'object has been changed in upper level' because in this
 				 * case we will remove state in releaseSavepoint() but this
 				 * state may be used pgvRestoreContext(). So atxlevel should
-				 * be 0.
+				 * be 0 in case rollback of autonomous transaction.
 				 */
-				GetActualState(object)->levels.atxlevel = 0;
+				GetActualState(object)->levels.atxlevel = sub ? getNestLevelATX() : 0;
 #endif
 				GetActualState(object)->levels.level = GetCurrentTransactionNestLevel() - 1;
 				if (!dlist_is_empty(changesStack))
@@ -2677,7 +2677,7 @@ applyAction(Action action, TransObjectType type, dlist_head *list, bool sub)
 		switch (action)
 		{
 			case ROLLBACK_TO_SAVEPOINT:
-				rollbackSavepoint(object, type);
+				rollbackSavepoint(object, type, sub);
 				break;
 			case RELEASE_SAVEPOINT:
 
diff --git a/sql/pg_variables_atx_pkg.sql b/sql/pg_variables_atx_pkg.sql
@@ -199,5 +199,19 @@ BEGIN;
 		SELECT pgv_set('vars', 'int1', 2, true);
 	COMMIT;
 ROLLBACK;
+--
+--
+-- Test for case: pgv_set() created a regular variable and package with
+-- (atxlevel=1, level=1). ROLLBACK changes this level to (atxlevel=0, level=0).
+-- But ROLLBACK shouldn't change atxlevel in case rollback of sub-transaction.
+--
+BEGIN;
+	BEGIN AUTONOMOUS;
+		SAVEPOINT sp1;
+		SELECT pgv_set('vars1', 'int1', 0);
+		ROLLBACK TO sp1;
+	COMMIT;
+ROLLBACK;
+SELECT pgv_remove('vars1', 'int1');
 
 SELECT pgv_free();
