Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite9d74c4

Browse files
CherkashinSergeyza-arthur
authored andcommitted
Remove package automatically when it becomes empty
1 parent1b0b3be commite9d74c4

File tree

3 files changed

+56
-11
lines changed

3 files changed

+56
-11
lines changed

‎README.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,10 @@ SELECT pgv_get('vars', 'trans_int', NULL::int);
3838
101
3939
```
4040

41+
You can aggregate variables into packages. This is done to be able to have
42+
variables with different names or to quickly remove the whole batch of
43+
variables. If the package becomes empty, it is automatically deleted.
44+
4145
##License
4246

4347
This module available under the[license](LICENSE) similar to

‎expected/pg_variables_trans.out‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,7 +1035,7 @@ SELECT pgv_get('vars2', 'any1',NULL::text);
10351035
ROLLBACK TO sp1;
10361036
COMMIT;
10371037
SELECT pgv_get('vars2', 'any1',NULL::text);
1038-
ERROR: unrecognizedvariable "any1"
1038+
ERROR: unrecognizedpackage "vars2"
10391039
SELECT pgv_free();
10401040
pgv_free
10411041
----------
@@ -1385,7 +1385,7 @@ SELECT pgv_get('vars2', 'any1',NULL::text);
13851385

13861386
ROLLBACK;
13871387
SELECT pgv_get('vars2', 'any1',NULL::text);
1388-
ERROR: unrecognizedvariable "any1"
1388+
ERROR: unrecognizedpackage "vars2"
13891389
SELECT pgv_free();
13901390
pgv_free
13911391
----------
@@ -1652,7 +1652,7 @@ SELECT pgv_exists('vars', 'any1');
16521652
(1 row)
16531653

16541654
SELECT pgv_get('vars', 'any1',NULL::text);
1655-
ERROR: unrecognizedvariable "any1"
1655+
ERROR: unrecognizedpackage "vars"
16561656
SELECT * FROM pgv_list() ORDER BY package, name;
16571657
package | name | is_transactional
16581658
---------+------+------------------
@@ -1858,7 +1858,7 @@ SELECT pgv_insert('package', 'errs',row(1), true);
18581858
SELECT pgv_insert('vars4', 'r1', row('str1', 'str1'));
18591859
ERROR: could not identify a hash function for type unknown
18601860
SELECT pgv_select('vars4', 'r1', 0);
1861-
ERROR: unrecognizedvariable "r1"
1861+
ERROR: unrecognizedpackage "vars4"
18621862
-- If variable created and removed in same transaction level,
18631863
-- it should be totally removed and should not be present
18641864
-- in changes list and cache.
@@ -1878,7 +1878,7 @@ SELECT pgv_remove('vars', 'any1');
18781878

18791879
RELEASE comm;
18801880
SELECT pgv_get('vars', 'any1',NULL::text);
1881-
ERROR: unrecognizedvariable "any1"
1881+
ERROR: unrecognizedpackage "vars"
18821882
COMMIT;
18831883
SELECT pgv_free();
18841884
pgv_free

‎pg_variables.c‎

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -955,6 +955,7 @@ removePackageInternal(Package *package)
955955
{
956956
MemoryContextDelete(package->hctxRegular);
957957
package->hctxRegular=NULL;
958+
package->varHashRegular=NULL;
958959
}
959960

960961
/* Add to changes list */
@@ -967,6 +968,17 @@ removePackageInternal(Package *package)
967968
GetActualState(package)->is_valid= false;
968969
}
969970

971+
staticbool
972+
isPackageEmpty(Package*package)
973+
{
974+
intvar_num=hash_get_num_entries(package->varHashTransact);
975+
976+
if (package->varHashRegular)
977+
var_num+=hash_get_num_entries(package->varHashRegular);
978+
979+
returnvar_num==0;
980+
}
981+
970982
/*
971983
* Reset cache variables to their default values. It is necessary to do in case
972984
* of some changes: removing, rollbacking, etc.
@@ -1657,6 +1669,7 @@ removeObject(TransObject *object, TransObjectType type)
16571669
{
16581670
boolfound;
16591671
HTAB*hash;
1672+
Package*package=NULL;
16601673

16611674
/*
16621675
* Delete an object from the change history of the overlying
@@ -1666,16 +1679,20 @@ removeObject(TransObject *object, TransObjectType type)
16661679
removeFromChangesStack(object,type);
16671680
if (type==TRANS_PACKAGE)
16681681
{
1669-
Package*package= (Package*)object;
1682+
package= (Package*)object;
16701683

16711684
/* Regular variables had already removed */
16721685
MemoryContextDelete(package->hctxTransact);
16731686
hash=packagesHash;
16741687
}
16751688
else
1676-
hash= ((Variable*)object)->is_transactional ?
1677-
((Variable*)object)->package->varHashTransact :
1678-
((Variable*)object)->package->varHashRegular;
1689+
{
1690+
Variable*var= (Variable*)object;
1691+
package=var->package;
1692+
hash=var->is_transactional ?
1693+
var->package->varHashTransact :
1694+
var->package->varHashRegular;
1695+
}
16791696

16801697
/* Remove all object's states */
16811698
while (!dlist_is_empty(&object->states))
@@ -1684,6 +1701,12 @@ removeObject(TransObject *object, TransObjectType type)
16841701
/* Remove object from hash table */
16851702
hash_search(hash,object->name,HASH_REMOVE,&found);
16861703

1704+
/* Remove package if it is became empty */
1705+
if (type==TRANS_VARIABLE&&
1706+
isObjectChangedInCurrentTrans(&package->transObject)&&
1707+
isPackageEmpty(package))
1708+
GetActualState(&package->transObject)->is_valid= false;
1709+
16871710
resetVariablesCache(true);
16881711
}
16891712

@@ -1725,8 +1748,19 @@ rollbackSavepoint(TransObject *object, TransObjectType type)
17251748
{
17261749
if (!state->is_valid)
17271750
{
1728-
dlist_pop_head_node(&object->states);
1729-
pfree(state);
1751+
if (isPackageEmpty((Package*)object))
1752+
{
1753+
removeObject(object,TRANS_PACKAGE);
1754+
return;
1755+
}
1756+
1757+
if (dlist_has_next(&object->states,&state->node))
1758+
{
1759+
dlist_pop_head_node(&object->states);
1760+
pfree(state);
1761+
}
1762+
else
1763+
state->is_valid= true;
17301764
/* Restore regular vars HTAB */
17311765
makePackHTAB((Package*)object, false);
17321766
}
@@ -1797,6 +1831,13 @@ releaseSavepoint(TransObject *object, TransObjectType type)
17971831
!dlist_has_next(states,dlist_head_node(states)))
17981832
{
17991833
removeObject(object,type);
1834+
/* Remove package if it becomes empty */
1835+
if (type==TRANS_VARIABLE)
1836+
{
1837+
Package*pack= ((Variable*)object)->package;
1838+
if (isPackageEmpty(pack))
1839+
(GetActualState(&pack->transObject))->is_valid= false;
1840+
}
18001841
return;
18011842
}
18021843
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp