Rename macro numOfTransVars()

CherkashinSergey · za-arthur · commit 53e6b3f2c276 · 2019-03-05T16:01:04.000+03:00
diff --git a/pg_variables.c b/pg_variables.c
@@ -899,8 +899,8 @@ remove_variable(PG_FUNCTION_ARGS)
 			addToChangesStack(transObject, TRANS_VARIABLE);
 		}
 		GetActualState(variable)->is_valid = false;
-		numOfTransVars(package)--;
-		if ((numOfTransVars(package) + numOfRegVars(package)) == 0)
+		GetPackState(package)->trans_var_num--;
+		if ((GetPackState(package)->trans_var_num + numOfRegVars(package)) == 0)
 			GetActualState(package)->is_valid = false;
 	}
 	else
@@ -962,7 +962,7 @@ removePackageInternal(Package *package)
 		addToChangesStack(transObject, TRANS_PACKAGE);
 	}
 	GetActualState(package)->is_valid = false;
-	numOfTransVars(package) = 0;
+	GetPackState(package)->trans_var_num = 0;
 }
 
 static bool
@@ -1384,7 +1384,8 @@ getPackage(text *name, bool strict)
 
 		if (found && GetActualState(package)->is_valid)
 		{
-			Assert (numOfTransVars(package) + numOfRegVars(package) > 0);
+			Assert (GetPackState(package)->trans_var_num +
+					numOfRegVars(package) > 0);
 			return package;
 		}
 	}
@@ -1610,7 +1611,7 @@ createVariableInternal(Package *package, text *name, Oid typid, bool is_record,
 
 	if (is_transactional &&
 		(!found || !GetActualState(variable)->is_valid))
-		numOfTransVars(package)++;
+		GetPackState(package)->trans_var_num++;
 	GetActualState(variable)->is_valid = true;
 	
 	Assert (numOfTransVars(package) == _numOfTransVars(package));
diff --git a/pg_variables.h b/pg_variables.h
@@ -171,15 +171,11 @@ extern void removeObject(TransObject *object, TransObjectType type);
 #define GetActualValue(variable) \
 	(((VarState *) GetActualState(variable))->value)
 
-#define numOfTransVars(package) \
-	(((PackState *) GetActualState(package))->trans_var_num)
+#define GetPackState(package) \
+	(((PackState *) GetActualState(package)))
 
 #define GetName(object) \
 	(AssertVariableIsOfTypeMacro(object->transObject, TransObject), \
 	 object->transObject.name)
 
-#define GetStateStorage(object) \
-	(AssertVariableIsOfTypeMacro(object->transObject, TransObject), \
-	 &(object->transObject.states))
-
 #endif							/* __PG_VARIABLES_H__ */

Original file line number	Diff line number	Diff line change
`@@ -899,8 +899,8 @@ remove_variable(PG_FUNCTION_ARGS)`
`899`	`899`	`addToChangesStack(transObject, TRANS_VARIABLE);`
`900`	`900`	`}`
`901`	`901`	`GetActualState(variable)->is_valid = false;`
`902`		`- numOfTransVars(package)--;`
`903`		`- if ((numOfTransVars(package) + numOfRegVars(package)) == 0)`
	`902`	`+ GetPackState(package)->trans_var_num--;`
	`903`	`+ if ((GetPackState(package)->trans_var_num + numOfRegVars(package)) == 0)`
`904`	`904`	`GetActualState(package)->is_valid = false;`
`905`	`905`	`}`
`906`	`906`	`else`
`@@ -962,7 +962,7 @@ removePackageInternal(Package *package)`
`962`	`962`	`addToChangesStack(transObject, TRANS_PACKAGE);`
`963`	`963`	`}`
`964`	`964`	`GetActualState(package)->is_valid = false;`
`965`		`- numOfTransVars(package) = 0;`
	`965`	`+ GetPackState(package)->trans_var_num = 0;`
`966`	`966`	`}`
`967`	`967`
`968`	`968`	`static bool`
`@@ -1384,7 +1384,8 @@ getPackage(text *name, bool strict)`
`1384`	`1384`
`1385`	`1385`	`if (found && GetActualState(package)->is_valid)`
`1386`	`1386`	`{`
`1387`		`- Assert (numOfTransVars(package) + numOfRegVars(package) > 0);`
	`1387`	`+ Assert (GetPackState(package)->trans_var_num +`
	`1388`	`+ numOfRegVars(package) > 0);`
`1388`	`1389`	`return package;`
`1389`	`1390`	`}`
`1390`	`1391`	`}`
`@@ -1610,7 +1611,7 @@ createVariableInternal(Package package, text name, Oid typid, bool is_record,`
`1610`	`1611`
`1611`	`1612`	`if (is_transactional &&`
`1612`	`1613`	`(!found \|\| !GetActualState(variable)->is_valid))`
`1613`		`- numOfTransVars(package)++;`
	`1614`	`+ GetPackState(package)->trans_var_num++;`
`1614`	`1615`	`GetActualState(variable)->is_valid = true;`
`1615`	`1616`
`1616`	`1617`	`Assert (numOfTransVars(package) == _numOfTransVars(package));`