@@ -73,7 +73,7 @@ static bool isObjectChangedInUpperTrans(TransObject *object);
73
73
74
74
static void addToChangesStack (TransObject * object , TransObjectType type );
75
75
static void pushChangesStack (void );
76
- static void removeFromChangesStack (TransObject * transObj , TransObjectType type );
76
+ static void removeFromChangesStack (TransObject * object , TransObjectType type );
77
77
78
78
/* Constructors */
79
79
static void makePackHTAB (Package * package , bool is_trans );
@@ -1691,24 +1691,24 @@ removeObject(TransObject *object, TransObjectType type)
1691
1691
* Create a new state of object
1692
1692
*/
1693
1693
static void
1694
- createSavepoint (TransObject * transObj , TransObjectType type )
1694
+ createSavepoint (TransObject * object , TransObjectType type )
1695
1695
{
1696
1696
TransState * newState ,
1697
1697
* prevState ;
1698
1698
1699
- prevState = GetActualState (transObj );
1699
+ prevState = GetActualState (object );
1700
1700
if (type == TRANS_PACKAGE )
1701
1701
newState = (TransState * ) MemoryContextAllocZero (ModuleContext ,
1702
1702
sizeof (PackState ));
1703
1703
else
1704
1704
{
1705
- Variable * var = (Variable * ) transObj ;
1705
+ Variable * var = (Variable * ) object ;
1706
1706
1707
1707
newState = (TransState * ) MemoryContextAllocZero (var -> package -> hctxTransact ,
1708
1708
sizeof (VarState ));
1709
1709
copyValue ((VarState * ) prevState , (VarState * ) newState , var );
1710
1710
}
1711
- dlist_push_head (& transObj -> states , & newState -> node );
1711
+ dlist_push_head (& object -> states , & newState -> node );
1712
1712
newState -> is_valid = prevState -> is_valid ;
1713
1713
}
1714
1714
@@ -1809,14 +1809,14 @@ releaseSavepoint(TransObject *object, TransObjectType type)
1809
1809
* Check if object was changed in current transaction level
1810
1810
*/
1811
1811
static bool
1812
- isObjectChangedInCurrentTrans (TransObject * transObj )
1812
+ isObjectChangedInCurrentTrans (TransObject * object )
1813
1813
{
1814
1814
TransState * state ;
1815
1815
1816
1816
if (!changesStack )
1817
1817
return false;
1818
1818
1819
- state = GetActualState (transObj );
1819
+ state = GetActualState (object );
1820
1820
return state -> level == GetCurrentTransactionNestLevel ();
1821
1821
}
1822
1822
@@ -1916,22 +1916,22 @@ makeChangedObject(TransObject *object, MemoryContext ctx)
1916
1916
* in current transaction level
1917
1917
*/
1918
1918
static void
1919
- addToChangesStack (TransObject * transObj , TransObjectType type )
1919
+ addToChangesStack (TransObject * object , TransObjectType type )
1920
1920
{
1921
1921
prepareChangesStack ();
1922
1922
1923
- if (!isObjectChangedInCurrentTrans (transObj ))
1923
+ if (!isObjectChangedInCurrentTrans (object ))
1924
1924
{
1925
1925
ChangesStackNode * csn ;
1926
1926
ChangedObject * co ;
1927
1927
1928
1928
csn = get_actual_changes_list ();
1929
- co = makeChangedObject (transObj , csn -> ctx );
1929
+ co = makeChangedObject (object , csn -> ctx );
1930
1930
dlist_push_head (type == TRANS_PACKAGE ? csn -> changedPacksList :
1931
1931
csn -> changedVarsList , & co -> node );
1932
1932
1933
1933
/* Give this object current subxact level */
1934
- GetActualState (transObj )-> level = GetCurrentTransactionNestLevel ();
1934
+ GetActualState (object )-> level = GetCurrentTransactionNestLevel ();
1935
1935
}
1936
1936
}
1937
1937
0 commit comments