@@ -73,7 +73,7 @@ static bool isObjectChangedInUpperTrans(TransObject *object);
7373
7474static void addToChangesStack (TransObject * object ,TransObjectType type );
7575static void pushChangesStack (void );
76- static void removeFromChangesStack (TransObject * transObj ,TransObjectType type );
76+ static void removeFromChangesStack (TransObject * object ,TransObjectType type );
7777
7878/* Constructors */
7979static void makePackHTAB (Package * package ,bool is_trans );
@@ -1691,24 +1691,24 @@ removeObject(TransObject *object, TransObjectType type)
16911691 * Create a new state of object
16921692 */
16931693static void
1694- createSavepoint (TransObject * transObj ,TransObjectType type )
1694+ createSavepoint (TransObject * object ,TransObjectType type )
16951695{
16961696TransState * newState ,
16971697* prevState ;
16981698
1699- prevState = GetActualState (transObj );
1699+ prevState = GetActualState (object );
17001700if (type == TRANS_PACKAGE )
17011701newState = (TransState * )MemoryContextAllocZero (ModuleContext ,
17021702sizeof (PackState ));
17031703else
17041704{
1705- Variable * var = (Variable * )transObj ;
1705+ Variable * var = (Variable * )object ;
17061706
17071707newState = (TransState * )MemoryContextAllocZero (var -> package -> hctxTransact ,
17081708sizeof (VarState ));
17091709copyValue ((VarState * )prevState , (VarState * )newState ,var );
17101710}
1711- dlist_push_head (& transObj -> states ,& newState -> node );
1711+ dlist_push_head (& object -> states ,& newState -> node );
17121712newState -> is_valid = prevState -> is_valid ;
17131713}
17141714
@@ -1809,14 +1809,14 @@ releaseSavepoint(TransObject *object, TransObjectType type)
18091809 * Check if object was changed in current transaction level
18101810 */
18111811static bool
1812- isObjectChangedInCurrentTrans (TransObject * transObj )
1812+ isObjectChangedInCurrentTrans (TransObject * object )
18131813{
18141814TransState * state ;
18151815
18161816if (!changesStack )
18171817return false;
18181818
1819- state = GetActualState (transObj );
1819+ state = GetActualState (object );
18201820return state -> level == GetCurrentTransactionNestLevel ();
18211821}
18221822
@@ -1916,22 +1916,22 @@ makeChangedObject(TransObject *object, MemoryContext ctx)
19161916 * in current transaction level
19171917 */
19181918static void
1919- addToChangesStack (TransObject * transObj ,TransObjectType type )
1919+ addToChangesStack (TransObject * object ,TransObjectType type )
19201920{
19211921prepareChangesStack ();
19221922
1923- if (!isObjectChangedInCurrentTrans (transObj ))
1923+ if (!isObjectChangedInCurrentTrans (object ))
19241924{
19251925ChangesStackNode * csn ;
19261926ChangedObject * co ;
19271927
19281928csn = get_actual_changes_list ();
1929- co = makeChangedObject (transObj ,csn -> ctx );
1929+ co = makeChangedObject (object ,csn -> ctx );
19301930dlist_push_head (type == TRANS_PACKAGE ?csn -> changedPacksList :
19311931csn -> changedVarsList ,& co -> node );
19321932
19331933/* Give this object current subxact level */
1934- GetActualState (transObj )-> level = GetCurrentTransactionNestLevel ();
1934+ GetActualState (object )-> level = GetCurrentTransactionNestLevel ();
19351935}
19361936}
19371937