Transaction object types clarifying

CherkashinSergey · CherkashinSergey · commit 58ecc51f12b7 · 2018-06-21T14:56:35.000+03:00
diff --git a/README.md b/README.md
@@ -304,7 +304,7 @@ SELECT pgv_get('pack', 'var_text', NULL::text);
  before transaction block
 ```
 
-If you create variable after `BEGIN` or `SAVEPOINT` statements and than rollback
+If you create a transactional variable after `BEGIN` or `SAVEPOINT` statements and than rollback
 to previous state - variable will not be exist:
 
 ```sql
diff --git a/pg_variables.c b/pg_variables.c
@@ -350,8 +350,8 @@ variable_insert(PG_FUNCTION_ARGS)
 		if (variable->is_transactional &&
 			!isObjectChangedInCurrentTrans(transObj))
 		{
-			createSavepoint(transObj, TOP_VARIABLE);
-			addToChangesStack(transObj, TOP_VARIABLE);
+			createSavepoint(transObj, TRANS_VARIABLE);
+			addToChangesStack(transObj, TRANS_VARIABLE);
 		}
 	}
 
@@ -438,8 +438,8 @@ variable_update(PG_FUNCTION_ARGS)
 	if (variable->is_transactional &&
 		!isObjectChangedInCurrentTrans(transObject))
 	{
-		createSavepoint(transObject, TOP_VARIABLE);
-		addToChangesStack(transObject, TOP_VARIABLE);
+		createSavepoint(transObject, TRANS_VARIABLE);
+		addToChangesStack(transObject, TRANS_VARIABLE);
 	}
 
 	/* Update a record */
@@ -518,8 +518,8 @@ variable_delete(PG_FUNCTION_ARGS)
 	if (variable->is_transactional &&
 		!isObjectChangedInCurrentTrans(transObject))
 	{
-		createSavepoint(transObject, TOP_VARIABLE);
-		addToChangesStack(transObject, TOP_VARIABLE);
+		createSavepoint(transObject, TRANS_VARIABLE);
+		addToChangesStack(transObject, TRANS_VARIABLE);
 	}
 
 	/* Delete a record */
@@ -841,7 +841,7 @@ remove_variable(PG_FUNCTION_ARGS)
 	if (found)
 	{
 		/* Regular variable */
-		removeState(&variable->transObject, TOP_VARIABLE,
+		removeState(&variable->transObject, TRANS_VARIABLE,
 					GetActualState(variable));
 	}
 	else
@@ -859,8 +859,8 @@ remove_variable(PG_FUNCTION_ARGS)
 		transObject = &variable->transObject;
 		if (!isObjectChangedInCurrentTrans(transObject))
 		{
-			createSavepoint(transObject, TOP_VARIABLE);
-			addToChangesStack(transObject, TOP_VARIABLE);
+			createSavepoint(transObject, TRANS_VARIABLE);
+			addToChangesStack(transObject, TRANS_VARIABLE);
 		}
 		GetActualState(variable)->is_valid = false;
 	}
@@ -922,8 +922,8 @@ removePackageInternal(Package *package)
 	transObject = &package->transObject;
 	if (!isObjectChangedInCurrentTrans(transObject))
 	{
-		createSavepoint(transObject, TOP_PACKAGE);
-		addToChangesStack(transObject, TOP_PACKAGE);
+		createSavepoint(transObject, TRANS_PACKAGE);
+		addToChangesStack(transObject, TRANS_PACKAGE);
 	}
 	GetActualState(package)->is_valid = false;
 }
@@ -1315,8 +1315,8 @@ getPackageByName(text* name, bool create, bool strict)
 			/* Make new history entry of package */
 			if (!isObjectChangedInCurrentTrans(transObj))
 			{
-				createSavepoint(transObj, TOP_PACKAGE);
-				addToChangesStack(transObj, TOP_PACKAGE);
+				createSavepoint(transObj, TRANS_PACKAGE);
+				addToChangesStack(transObj, TRANS_PACKAGE);
 			}
 
 			GetActualState(package)->is_valid = true;
@@ -1335,8 +1335,8 @@ getPackageByName(text* name, bool create, bool strict)
 
 				if (!isObjectChangedInCurrentTrans(transObj))
 				{
-					createSavepoint(transObj, TOP_VARIABLE);
-					addToChangesStack(transObj, TOP_VARIABLE);
+					createSavepoint(transObj, TRANS_VARIABLE);
+					addToChangesStack(transObj, TRANS_VARIABLE);
 				}
 				GetActualState(variable)->is_valid = false;
 			}
@@ -1375,7 +1375,7 @@ getPackageByName(text* name, bool create, bool strict)
 		packState->state.is_valid = true;
 
 		/* Add to changes list */
-		addToChangesStack(&package->transObject, TOP_PACKAGE);
+		addToChangesStack(&package->transObject, TRANS_PACKAGE);
 
 		return package;
 	}
@@ -1487,7 +1487,7 @@ createVariableInternal(Package *package, text *name, Oid typid,
 		if (is_transactional &&
 			!isObjectChangedInCurrentTrans(transObject))
 		{
-			createSavepoint(transObject, TOP_VARIABLE);
+			createSavepoint(transObject, TRANS_VARIABLE);
 		}
 	}
 	else
@@ -1517,7 +1517,7 @@ createVariableInternal(Package *package, text *name, Oid typid,
 	GetActualState(variable)->is_valid = true;
 	/* If it is necessary, put variable to changedVars */
 	if (is_transactional)
-		addToChangesStack(transObject, TOP_VARIABLE);
+		addToChangesStack(transObject, TRANS_VARIABLE);
 
 	return variable;
 }
@@ -1589,7 +1589,7 @@ freeValue(VarState *varstate, Oid typid)
 static void
 removeState(TransObject *object, TransObjectType type, TransState *stateToDelete)
 {
-	if (type == TOP_VARIABLE)
+	if (type == TRANS_VARIABLE)
 	{
 		Variable *var = (Variable *) object;
 		freeValue((VarState *) stateToDelete, var->typid);
@@ -1604,7 +1604,7 @@ removeObject(TransObject *object, TransObjectType type)
 	bool	found;
 	HTAB   *hash;
 
-	if (type == TOP_PACKAGE)
+	if (type == TRANS_PACKAGE)
 	{
 		Package *package = (Package *) object;
 
@@ -1639,7 +1639,7 @@ createSavepoint(TransObject *transObj, TransObjectType type)
 				   *prevState;
 
 	prevState = GetActualState(transObj);
-	if (type==TOP_PACKAGE)
+	if (type==TRANS_PACKAGE)
 		newState = (TransState *) MemoryContextAllocZero(ModuleContext,
 													sizeof(PackState));
 	else
@@ -1663,7 +1663,7 @@ rollbackSavepoint(TransObject *object, TransObjectType type)
 	TransState *state;
 
 	state = GetActualState(object);
-	if (type == TOP_PACKAGE)
+	if (type == TRANS_PACKAGE)
 	{
 		if (!state->is_valid)
 		{
@@ -1676,11 +1676,11 @@ rollbackSavepoint(TransObject *object, TransObjectType type)
 	else
 	{
 		/* Remove current state */
-		removeState(object, TOP_VARIABLE, state);
+		removeState(object, TRANS_VARIABLE, state);
 
 		/* Remove variable if it was created in rolled back transaction */
 		if (dlist_is_empty(&object->states))
-			removeObject(object, TOP_VARIABLE);
+			removeObject(object, TRANS_VARIABLE);
 	}
 }
 
@@ -1843,7 +1843,7 @@ addToChangesStack(TransObject *transObj, TransObjectType type)
 
 		csn = get_actual_changes_list();
 		co = makeChangedObject(transObj, csn->ctx);
-		dlist_push_head(type == TOP_PACKAGE ? csn->changedPacksList :
+		dlist_push_head(type == TRANS_PACKAGE ? csn->changedPacksList :
 											  csn->changedVarsList, &co->node);
 
 		/* Give this object current subxact level */
@@ -1928,7 +1928,7 @@ processChanges(Action action)
 			switch (action)
 			{
 				case ROLLBACK_TO_SAVEPOINT:
-					rollbackSavepoint(object, i ? TOP_VARIABLE : TOP_PACKAGE);
+					rollbackSavepoint(object, i ? TRANS_VARIABLE : TRANS_PACKAGE);
 					break;
 				case RELEASE_SAVEPOINT:
 					/*
@@ -1951,7 +1951,7 @@ processChanges(Action action)
 						isObjectChangedInUpperTrans(object))
 					{
 						/* We just have to drop previous state */
-						releaseSavepoint(object, i ? TOP_VARIABLE : TOP_PACKAGE);
+						releaseSavepoint(object, i ? TRANS_VARIABLE : TRANS_PACKAGE);
 					}
 					else
 					{
diff --git a/pg_variables.h b/pg_variables.h
@@ -134,8 +134,8 @@ typedef struct ChangedObject
 /* Type of transactional object instance */
 typedef enum TransObjectType
 {
-	TOP_PACKAGE,
-	TOP_VARIABLE
+	TRANS_PACKAGE,
+	TRANS_VARIABLE
 } TransObjectType;
 
 /* Element of stack with 'changedVars' and 'changedPacks' list heads*/

Original file line number	Diff line number	Diff line change
`@@ -350,8 +350,8 @@ variable_insert(PG_FUNCTION_ARGS)`
`350`	`350`	`if (variable->is_transactional &&`
`351`	`351`	`!isObjectChangedInCurrentTrans(transObj))`
`352`	`352`	`{`
`353`		`- createSavepoint(transObj, TOP_VARIABLE);`
`354`		`- addToChangesStack(transObj, TOP_VARIABLE);`
	`353`	`+ createSavepoint(transObj, TRANS_VARIABLE);`
	`354`	`+ addToChangesStack(transObj, TRANS_VARIABLE);`
`355`	`355`	`}`
`356`	`356`	`}`
`357`	`357`
`@@ -438,8 +438,8 @@ variable_update(PG_FUNCTION_ARGS)`
`438`	`438`	`if (variable->is_transactional &&`
`439`	`439`	`!isObjectChangedInCurrentTrans(transObject))`
`440`	`440`	`{`
`441`		`- createSavepoint(transObject, TOP_VARIABLE);`
`442`		`- addToChangesStack(transObject, TOP_VARIABLE);`
	`441`	`+ createSavepoint(transObject, TRANS_VARIABLE);`
	`442`	`+ addToChangesStack(transObject, TRANS_VARIABLE);`
`443`	`443`	`}`
`444`	`444`
`445`	`445`	`/* Update a record */`
`@@ -518,8 +518,8 @@ variable_delete(PG_FUNCTION_ARGS)`
`518`	`518`	`if (variable->is_transactional &&`
`519`	`519`	`!isObjectChangedInCurrentTrans(transObject))`
`520`	`520`	`{`
`521`		`- createSavepoint(transObject, TOP_VARIABLE);`
`522`		`- addToChangesStack(transObject, TOP_VARIABLE);`
	`521`	`+ createSavepoint(transObject, TRANS_VARIABLE);`
	`522`	`+ addToChangesStack(transObject, TRANS_VARIABLE);`
`523`	`523`	`}`
`524`	`524`
`525`	`525`	`/* Delete a record */`
`@@ -841,7 +841,7 @@ remove_variable(PG_FUNCTION_ARGS)`
`841`	`841`	`if (found)`
`842`	`842`	`{`
`843`	`843`	`/* Regular variable */`
`844`		`- removeState(&variable->transObject, TOP_VARIABLE,`
	`844`	`+ removeState(&variable->transObject, TRANS_VARIABLE,`
`845`	`845`	`GetActualState(variable));`
`846`	`846`	`}`
`847`	`847`	`else`
`@@ -859,8 +859,8 @@ remove_variable(PG_FUNCTION_ARGS)`
`859`	`859`	`transObject = &variable->transObject;`
`860`	`860`	`if (!isObjectChangedInCurrentTrans(transObject))`
`861`	`861`	`{`
`862`		`- createSavepoint(transObject, TOP_VARIABLE);`
`863`		`- addToChangesStack(transObject, TOP_VARIABLE);`
	`862`	`+ createSavepoint(transObject, TRANS_VARIABLE);`
	`863`	`+ addToChangesStack(transObject, TRANS_VARIABLE);`
`864`	`864`	`}`
`865`	`865`	`GetActualState(variable)->is_valid = false;`
`866`	`866`	`}`
`@@ -922,8 +922,8 @@ removePackageInternal(Package *package)`
`922`	`922`	`transObject = &package->transObject;`
`923`	`923`	`if (!isObjectChangedInCurrentTrans(transObject))`
`924`	`924`	`{`
`925`		`- createSavepoint(transObject, TOP_PACKAGE);`
`926`		`- addToChangesStack(transObject, TOP_PACKAGE);`
	`925`	`+ createSavepoint(transObject, TRANS_PACKAGE);`
	`926`	`+ addToChangesStack(transObject, TRANS_PACKAGE);`
`927`	`927`	`}`
`928`	`928`	`GetActualState(package)->is_valid = false;`
`929`	`929`	`}`
`@@ -1315,8 +1315,8 @@ getPackageByName(text* name, bool create, bool strict)`
`1315`	`1315`	`/* Make new history entry of package */`
`1316`	`1316`	`if (!isObjectChangedInCurrentTrans(transObj))`
`1317`	`1317`	`{`
`1318`		`- createSavepoint(transObj, TOP_PACKAGE);`
`1319`		`- addToChangesStack(transObj, TOP_PACKAGE);`
	`1318`	`+ createSavepoint(transObj, TRANS_PACKAGE);`
	`1319`	`+ addToChangesStack(transObj, TRANS_PACKAGE);`
`1320`	`1320`	`}`
`1321`	`1321`
`1322`	`1322`	`GetActualState(package)->is_valid = true;`
`@@ -1335,8 +1335,8 @@ getPackageByName(text* name, bool create, bool strict)`
`1335`	`1335`
`1336`	`1336`	`if (!isObjectChangedInCurrentTrans(transObj))`
`1337`	`1337`	`{`
`1338`		`- createSavepoint(transObj, TOP_VARIABLE);`
`1339`		`- addToChangesStack(transObj, TOP_VARIABLE);`
	`1338`	`+ createSavepoint(transObj, TRANS_VARIABLE);`
	`1339`	`+ addToChangesStack(transObj, TRANS_VARIABLE);`
`1340`	`1340`	`}`
`1341`	`1341`	`GetActualState(variable)->is_valid = false;`
`1342`	`1342`	`}`
`@@ -1375,7 +1375,7 @@ getPackageByName(text* name, bool create, bool strict)`
`1375`	`1375`	`packState->state.is_valid = true;`
`1376`	`1376`
`1377`	`1377`	`/* Add to changes list */`
`1378`		`- addToChangesStack(&package->transObject, TOP_PACKAGE);`
	`1378`	`+ addToChangesStack(&package->transObject, TRANS_PACKAGE);`
`1379`	`1379`
`1380`	`1380`	`return package;`
`1381`	`1381`	`}`
`@@ -1487,7 +1487,7 @@ createVariableInternal(Package package, text name, Oid typid,`
`1487`	`1487`	`if (is_transactional &&`
`1488`	`1488`	`!isObjectChangedInCurrentTrans(transObject))`
`1489`	`1489`	`{`
`1490`		`- createSavepoint(transObject, TOP_VARIABLE);`
	`1490`	`+ createSavepoint(transObject, TRANS_VARIABLE);`
`1491`	`1491`	`}`
`1492`	`1492`	`}`
`1493`	`1493`	`else`
`@@ -1517,7 +1517,7 @@ createVariableInternal(Package package, text name, Oid typid,`
`1517`	`1517`	`GetActualState(variable)->is_valid = true;`
`1518`	`1518`	`/* If it is necessary, put variable to changedVars */`
`1519`	`1519`	`if (is_transactional)`
`1520`		`- addToChangesStack(transObject, TOP_VARIABLE);`
	`1520`	`+ addToChangesStack(transObject, TRANS_VARIABLE);`
`1521`	`1521`
`1522`	`1522`	`return variable;`
`1523`	`1523`	`}`
`@@ -1589,7 +1589,7 @@ freeValue(VarState *varstate, Oid typid)`
`1589`	`1589`	`static void`
`1590`	`1590`	`removeState(TransObject object, TransObjectType type, TransState stateToDelete)`
`1591`	`1591`	`{`
`1592`		`- if (type == TOP_VARIABLE)`
	`1592`	`+ if (type == TRANS_VARIABLE)`
`1593`	`1593`	`{`
`1594`	`1594`	`Variable var = (Variable ) object;`
`1595`	`1595`	`freeValue((VarState *) stateToDelete, var->typid);`
`@@ -1604,7 +1604,7 @@ removeObject(TransObject *object, TransObjectType type)`
`1604`	`1604`	`bool found;`
`1605`	`1605`	`HTAB *hash;`
`1606`	`1606`
`1607`		`- if (type == TOP_PACKAGE)`
	`1607`	`+ if (type == TRANS_PACKAGE)`
`1608`	`1608`	`{`
`1609`	`1609`	`Package package = (Package ) object;`
`1610`	`1610`
`@@ -1639,7 +1639,7 @@ createSavepoint(TransObject *transObj, TransObjectType type)`
`1639`	`1639`	`*prevState;`
`1640`	`1640`
`1641`	`1641`	`prevState = GetActualState(transObj);`
`1642`		`- if (type==TOP_PACKAGE)`
	`1642`	`+ if (type==TRANS_PACKAGE)`
`1643`	`1643`	`newState = (TransState *) MemoryContextAllocZero(ModuleContext,`
`1644`	`1644`	`sizeof(PackState));`
`1645`	`1645`	`else`
`@@ -1663,7 +1663,7 @@ rollbackSavepoint(TransObject *object, TransObjectType type)`
`1663`	`1663`	`TransState *state;`
`1664`	`1664`
`1665`	`1665`	`state = GetActualState(object);`
`1666`		`- if (type == TOP_PACKAGE)`
	`1666`	`+ if (type == TRANS_PACKAGE)`
`1667`	`1667`	`{`
`1668`	`1668`	`if (!state->is_valid)`
`1669`	`1669`	`{`
`@@ -1676,11 +1676,11 @@ rollbackSavepoint(TransObject *object, TransObjectType type)`
`1676`	`1676`	`else`
`1677`	`1677`	`{`
`1678`	`1678`	`/* Remove current state */`
`1679`		`- removeState(object, TOP_VARIABLE, state);`
	`1679`	`+ removeState(object, TRANS_VARIABLE, state);`
`1680`	`1680`
`1681`	`1681`	`/* Remove variable if it was created in rolled back transaction */`
`1682`	`1682`	`if (dlist_is_empty(&object->states))`
`1683`		`- removeObject(object, TOP_VARIABLE);`
	`1683`	`+ removeObject(object, TRANS_VARIABLE);`
`1684`	`1684`	`}`
`1685`	`1685`	`}`
`1686`	`1686`
`@@ -1843,7 +1843,7 @@ addToChangesStack(TransObject *transObj, TransObjectType type)`
`1843`	`1843`
`1844`	`1844`	`csn = get_actual_changes_list();`
`1845`	`1845`	`co = makeChangedObject(transObj, csn->ctx);`
`1846`		`- dlist_push_head(type == TOP_PACKAGE ? csn->changedPacksList :`
	`1846`	`+ dlist_push_head(type == TRANS_PACKAGE ? csn->changedPacksList :`
`1847`	`1847`	`csn->changedVarsList, &co->node);`
`1848`	`1848`
`1849`	`1849`	`/* Give this object current subxact level */`
`@@ -1928,7 +1928,7 @@ processChanges(Action action)`
`1928`	`1928`	`switch (action)`
`1929`	`1929`	`{`
`1930`	`1930`	`case ROLLBACK_TO_SAVEPOINT:`
`1931`		`- rollbackSavepoint(object, i ? TOP_VARIABLE : TOP_PACKAGE);`
	`1931`	`+ rollbackSavepoint(object, i ? TRANS_VARIABLE : TRANS_PACKAGE);`
`1932`	`1932`	`break;`
`1933`	`1933`	`case RELEASE_SAVEPOINT:`
`1934`	`1934`	`/*`
`@@ -1951,7 +1951,7 @@ processChanges(Action action)`
`1951`	`1951`	`isObjectChangedInUpperTrans(object))`
`1952`	`1952`	`{`
`1953`	`1953`	`/* We just have to drop previous state */`
`1954`		`- releaseSavepoint(object, i ? TOP_VARIABLE : TOP_PACKAGE);`
	`1954`	`+ releaseSavepoint(object, i ? TRANS_VARIABLE : TRANS_PACKAGE);`
`1955`	`1955`	`}`
`1956`	`1956`	`else`
`1957`	`1957`	`{`