Commita289ae2

authored and

committed

Replace package emptiness check to remove_variable()

1 parentcc5ec13 commita289ae2Copy full SHA for a289ae2

File tree

-3

lines changed

-3

lines changed

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -900,6 +900,8 @@ remove_variable(PG_FUNCTION_ARGS)`
`900`	`900`	`}`
`901`	`901`	`GetActualState(variable)->is_valid= false;`
`902`	`902`	`numOfTransVars(package)--;`
	`903`	`+if ((numOfTransVars(package)+numOfRegVars(package))==0)`
	`904`	`+GetActualState(package)->is_valid= false;`
`903`	`905`	`}`
`904`	`906`	`else`
`905`	`907`	`removeObject(&variable->transObject,TRANS_VARIABLE);`
`@@ -1380,9 +1382,11 @@ getPackage(text *name, bool strict)`
`1380`	`1382`	`{`
`1381`	`1383`	`package= (Package*)hash_search(packagesHash,key,HASH_FIND,&found);`
`1382`	`1384`
`1383`		`-if (found&&GetActualState(package)->is_valid&&`
`1384`		`-numOfTransVars(package)+numOfRegVars(package))`
	`1385`	`+if (found&&GetActualState(package)->is_valid)`
	`1386`	`+{`
	`1387`	`+Assert (numOfTransVars(package)+numOfRegVars(package)>0);`
`1385`	`1388`	`returnpackage;`
	`1389`	`+}`
`1386`	`1390`	`}`
`1387`	`1391`	`/* Package not found or it's current state is "invalid" */`
`1388`	`1392`	`if (strict)`
`@@ -1778,7 +1782,7 @@ rollbackSavepoint(TransObject *object, TransObjectType type)`
`1778`	`1782`
`1779`	`1783`	`if (dlist_is_empty(&object->states))`
`1780`	`1784`	`{`
`1781`		`-if (type==TRANS_PACKAGE&&numOfRegVars((Package*)object))`
	`1785`	`+if (type==TRANS_PACKAGE&&numOfRegVars((Package*)object)>0)`
`1782`	`1786`	`{`
`1783`	`1787`	`initObjectHistory(object,type);`
`1784`	`1788`	`GetActualState(object)->level=GetCurrentTransactionNestLevel()-1;`

Comments

(0)