[PGPRO-7614] Delete hash_seq_search scans on all ATX levels and before heap

Tags: pg_variables, atx

Author: kovdb75

expected/pg_variables_atx_pkg.out

@@ -1,7 +1,7 @@
 --
 -- PGPRO-7614: function pgv_free() inside autonomous transaction
 --
-select pgv_free();
+SELECT pgv_free();
  pgv_free 
 ----------
 
@@ -268,7 +268,53 @@ ERROR:  unrecognized package "vars"
 ROLLBACK;
 --
 --
--- Do not free hash_seq_search scans of parent transaction. 
+-- Test for case: do not free hash_seq_search scans of parent transaction
+-- at end of the autonomous transaction.
+--
+BEGIN;
+	SELECT pgv_insert('test', 'x', row (1::int, 2::int), false);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+	SELECT pgv_insert('test', 'x', row (3::int, 4::int), false);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+	DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+-- (1,2)
+	FETCH 1 IN r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+	BEGIN AUTONOMOUS;
+	ROLLBACK;
+-- (3,4)
+	FETCH 1 IN r1_cur;
+ pgv_select 
+------------
+ (3,4)
+(1 row)
+
+	SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+-- ERROR:  unrecognized package "test"
+	FETCH 1 IN r1_cur;
+ERROR:  unrecognized package "test"
+ROLLBACK;
+--
+--
+-- Test for case: pgv_free() should free hash_seq_search scans of all
+-- (current ATX + parent) transactions.
 --
 BEGIN;
 	SELECT pgv_insert('test', 'x', row (1::int, 2::int), false);
@@ -278,16 +324,26 @@ BEGIN;
 (1 row)
 
 	DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+-- (1,2)
 	FETCH 1 IN r1_cur;
  pgv_select 
 ------------
  (1,2)
 (1 row)
 
 	BEGIN AUTONOMOUS;
+		SELECT pgv_free();
+ pgv_free 
+----------
+ 
+(1 row)
+
 	ROLLBACK;
+-- ERROR:  unrecognized package "test"
+	FETCH 1 IN r1_cur;
+ERROR:  unrecognized package "test"
 ROLLBACK;
-select pgv_free();
+SELECT pgv_free();
  pgv_free 
 ----------
 

expected/pg_variables_atx_pkg_1.out

@@ -1,7 +1,7 @@
 --
 -- PGPRO-7614: function pgv_free() inside autonomous transaction
 --
-select pgv_free();
+SELECT pgv_free();
  pgv_free 
 ----------
 
@@ -300,7 +300,53 @@ ROLLBACK;
 WARNING:  there is no transaction in progress
 --
 --
--- Do not free hash_seq_search scans of parent transaction. 
+-- Test for case: do not free hash_seq_search scans of parent transaction
+-- at end of the autonomous transaction.
+--
+BEGIN;
+	SELECT pgv_insert('test', 'x', row (1::int, 2::int), false);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+	SELECT pgv_insert('test', 'x', row (3::int, 4::int), false);
+ pgv_insert 
+------------
+ 
+(1 row)
+
+	DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+-- (1,2)
+	FETCH 1 IN r1_cur;
+ pgv_select 
+------------
+ (1,2)
+(1 row)
+
+	BEGIN AUTONOMOUS;
+ERROR:  syntax error at or near "AUTONOMOUS"
+LINE 1: BEGIN AUTONOMOUS;
+              ^
+	ROLLBACK;
+-- (3,4)
+	FETCH 1 IN r1_cur;
+ERROR:  cursor "r1_cur" does not exist
+	SELECT pgv_remove('test', 'x');
+ pgv_remove 
+------------
+ 
+(1 row)
+
+-- ERROR:  unrecognized package "test"
+	FETCH 1 IN r1_cur;
+ERROR:  cursor "r1_cur" does not exist
+ROLLBACK;
+WARNING:  there is no transaction in progress
+--
+--
+-- Test for case: pgv_free() should free hash_seq_search scans of all
+-- (current ATX + parent) transactions.
 --
 BEGIN;
 	SELECT pgv_insert('test', 'x', row (1::int, 2::int), false);
@@ -310,6 +356,7 @@ BEGIN;
 (1 row)
 
 	DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+-- (1,2)
 	FETCH 1 IN r1_cur;
  pgv_select 
 ------------
@@ -320,10 +367,15 @@ BEGIN;
 ERROR:  syntax error at or near "AUTONOMOUS"
 LINE 1: BEGIN AUTONOMOUS;
               ^
+		SELECT pgv_free();
+ERROR:  current transaction is aborted, commands ignored until end of transaction block
 	ROLLBACK;
+-- ERROR:  unrecognized package "test"
+	FETCH 1 IN r1_cur;
+ERROR:  cursor "r1_cur" does not exist
 ROLLBACK;
 WARNING:  there is no transaction in progress
-select pgv_free();
+SELECT pgv_free();
  pgv_free 
 ----------
 

pg_variables.c

@@ -310,7 +310,11 @@ list_remove_if(RemoveIfContext ctx)
 			*ctx.list = list_delete_cell(*ctx.list, cell, prev);
 
 			if (ctx.term)
+#ifdef PGPRO_EE
+				hash_seq_term_all_levels(ctx.getter(entry));
+#else
 				hash_seq_term(ctx.getter(entry));
+#endif
 
 			pfree(ctx.getter(entry));
 			pfree(entry);
@@ -342,7 +346,11 @@ list_remove_if(RemoveIfContext ctx)
 			*ctx.list = foreach_delete_current(*ctx.list, cell);
 
 			if (ctx.term)
+#ifdef PGPRO_EE
+				hash_seq_term_all_levels(ctx.getter(entry));
+#else
 				hash_seq_term(ctx.getter(entry));
+#endif
 
 			pfree(ctx.getter(entry));
 			pfree(entry);
@@ -1338,12 +1346,17 @@ remove_package(PG_FUNCTION_ARGS)
 	package_name = PG_GETARG_TEXT_PP(0);
 
 	package = getPackage(package_name, true);
+	/*
+	 * Need to remove variables before packages because here calls hash_seq_term()
+	 * which uses "entry->status->hashp->frozen" but memory context of "hashp"
+	 * for regular variables can be deleted in removePackageInternal().
+	 */
+	remove_variables_package(&variables_stats, package);
+
 	removePackageInternal(package);
 
 	resetVariablesCache();
 
-	remove_variables_package(&variables_stats, package);
-
 	PG_FREE_IF_COPY(package_name, 0);
 	PG_RETURN_VOID();
 }
@@ -1430,6 +1443,13 @@ remove_packages(PG_FUNCTION_ARGS)
 	if (packagesHash == NULL)
 		PG_RETURN_VOID();
 
+	/*
+	 * Need to remove variables before packages because here calls hash_seq_term()
+	 * which uses "entry->status->hashp->frozen" but memory context of "hashp"
+	 * for regular variables can be deleted in removePackageInternal().
+	 */
+	remove_variables_all(&variables_stats);
+
 	/* Get packages list */
 	hash_seq_init(&pstat, packagesHash);
 	while ((package = (Package *) hash_seq_search(&pstat)) != NULL)
@@ -1438,7 +1458,6 @@ remove_packages(PG_FUNCTION_ARGS)
 	}
 
 	resetVariablesCache();
-	remove_variables_all(&variables_stats);
 
 	PG_RETURN_VOID();
 }
@@ -2201,14 +2220,19 @@ removeObject(TransObject *object, TransObjectType type)
 			var->package->varHashRegular;
 	}
 
+	/*
+	 * Need to remove variables before state because here calls hash_seq_term()
+	 * which uses "entry->status->hashp->frozen" but memory context of "hashp"
+	 * for regular variables can be deleted in removeState()->freeValue().
+	 */
+	/* Remove object from hash table */
+	hash_search(hash, object->name, HASH_REMOVE, &found);
+	remove_variables_variable(&variables_stats, (Variable*)object);
+
 	/* Remove all object's states */
 	while (!dlist_is_empty(&object->states))
 		removeState(object, type, GetActualState(object));
 
-	/* Remove object from hash table */
-	hash_search(hash, object->name, HASH_REMOVE, &found);
-	remove_variables_variable(&variables_stats, (Variable *) object);
-
 	/* Remove package if it became empty */
 	if (type == TRANS_VARIABLE && isPackageEmpty(package))
 	{

sql/pg_variables_atx_pkg.sql

@@ -1,7 +1,7 @@
 --
 -- PGPRO-7614: function pgv_free() inside autonomous transaction
 --
-select pgv_free();
+SELECT pgv_free();
 --
 --
 -- Functions pgv_free() + pgv_get() inside autonomous transaction; package
@@ -133,14 +133,38 @@ BEGIN;
 ROLLBACK;
 --
 --
--- Do not free hash_seq_search scans of parent transaction. 
+-- Test for case: do not free hash_seq_search scans of parent transaction
+-- at end of the autonomous transaction.
 --
 BEGIN;
 	SELECT pgv_insert('test', 'x', row (1::int, 2::int), false);
+	SELECT pgv_insert('test', 'x', row (3::int, 4::int), false);
 	DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+-- (1,2)
 	FETCH 1 IN r1_cur;
 	BEGIN AUTONOMOUS;
 	ROLLBACK;
+-- (3,4)
+	FETCH 1 IN r1_cur;
+	SELECT pgv_remove('test', 'x');
+-- ERROR:  unrecognized package "test"
+	FETCH 1 IN r1_cur;
+ROLLBACK;
+--
+--
+-- Test for case: pgv_free() should free hash_seq_search scans of all
+-- (current ATX + parent) transactions.
+--
+BEGIN;
+	SELECT pgv_insert('test', 'x', row (1::int, 2::int), false);
+	DECLARE r1_cur CURSOR FOR SELECT pgv_select('test', 'x');
+-- (1,2)
+	FETCH 1 IN r1_cur;
+	BEGIN AUTONOMOUS;
+		SELECT pgv_free();
+	ROLLBACK;
+-- ERROR:  unrecognized package "test"
+	FETCH 1 IN r1_cur;
 ROLLBACK;
 
-select pgv_free();
+SELECT pgv_free();