[PGPRO-7856] Correction for object state releasing in case object was not deleted

Tags: atx

Author: kovdb75

expected/pg_variables_atx_pkg.out

@@ -436,3 +436,38 @@ SELECT pgv_free();
 
 (1 row)
 
+--
+--
+-- PGPRO-7856
+-- Test for case: we don't remove the package object without any variables at
+-- the end of autonomous transaction but need to move the state of this object
+-- to upper level.
+--
+BEGIN;
+	BEGIN AUTONOMOUS;
+		SAVEPOINT sp1;
+		SELECT pgv_set('vars2', 'any1', 'variable exists'::text, true);
+ pgv_set 
+---------
+ 
+(1 row)
+
+		SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+		RELEASE sp1;
+	ROLLBACK;
+	BEGIN AUTONOMOUS;
+		SAVEPOINT sp2;
+		SAVEPOINT sp3;
+		SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+	COMMIT;
+ROLLBACK;

expected/pg_variables_atx_pkg_1.out

@@ -474,3 +474,42 @@ SELECT pgv_free();
 
 (1 row)
 
+--
+--
+-- PGPRO-7856
+-- Test for case: we don't remove the package object without any variables at
+-- the end of autonomous transaction but need to move the state of this object
+-- to upper level.
+--
+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('vars2', 'any1', 'variable exists'::text, true);
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
+		SELECT pgv_free();
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
+		RELEASE sp1;
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
+	ROLLBACK;
+	BEGIN AUTONOMOUS;
+ERROR:  syntax error at or near "AUTONOMOUS"
+LINE 1: BEGIN AUTONOMOUS;
+              ^
+		SAVEPOINT sp2;
+ERROR:  SAVEPOINT can only be used in transaction blocks
+		SAVEPOINT sp3;
+ERROR:  SAVEPOINT can only be used in transaction blocks
+		SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
+	COMMIT;
+WARNING:  there is no transaction in progress
+ROLLBACK;
+WARNING:  there is no transaction in progress

pg_variables.c

@@ -2206,7 +2206,7 @@ removeState(TransObject *object, TransObjectType type, TransState *stateToDelete
 }
 
 /* Remove package or variable (either transactional or regular) */
-void
+bool
 removeObject(TransObject *object, TransObjectType type)
 {
 	bool		found;
@@ -2228,7 +2228,7 @@ removeObject(TransObject *object, TransObjectType type)
 		if (getNestLevelATX() > 0 && !dlist_is_empty(&object->states))
 		{
 			GetActualState(object)->is_valid = false;
-			return;
+			return false;
 		}
 #endif
 
@@ -2289,6 +2289,8 @@ removeObject(TransObject *object, TransObjectType type)
 	}
 
 	resetVariablesCache();
+
+	return true;
 }
 
 /*
@@ -2429,8 +2431,8 @@ releaseSavepoint(TransObject *object, TransObjectType type, bool sub)
 		 dlist_is_empty(changesStack))
 		)
 	{
-		removeObject(object, type);
-		return;
+		if (removeObject(object, type))
+			return;
 	}
 
 	/*

pg_variables.h

@@ -193,7 +193,7 @@ extern bool update_record(Variable *variable, HeapTupleHeader tupleHeader);
 extern bool delete_record(Variable *variable, Datum value, bool is_null);
 extern void insert_record_copy(RecordVar *dest_record, Datum src_tuple,
 							   Variable *variable);
-extern void removeObject(TransObject *object, TransObjectType type);
+extern bool removeObject(TransObject *object, TransObjectType type);
 
 #define GetActualState(object) \
 	(dlist_head_element(TransState, node, &((TransObject *) object)->states))

sql/pg_variables_atx_pkg.sql

@@ -215,3 +215,24 @@ ROLLBACK;
 SELECT pgv_remove('vars1', 'int1');
 
 SELECT pgv_free();
+--
+--
+-- PGPRO-7856
+-- Test for case: we don't remove the package object without any variables at
+-- the end of autonomous transaction but need to move the state of this object
+-- to upper level.
+--
+BEGIN;
+	BEGIN AUTONOMOUS;
+		SAVEPOINT sp1;
+		SELECT pgv_set('vars2', 'any1', 'variable exists'::text, true);
+		SELECT pgv_free();
+		RELEASE sp1;
+	ROLLBACK;
+
+	BEGIN AUTONOMOUS;
+		SAVEPOINT sp2;
+		SAVEPOINT sp3;
+		SELECT pgv_free();
+	COMMIT;
+ROLLBACK;