Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug #06459 : change the lock strategy and split transactions in Merge citation.

Browse Source 
svn: r21502
This commit is contained in:
Serge Noiraud 2013-02-28 19:51:15 +00:00
parent 6baf023ed9
commit e5725f28c3
4 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cli/clidbman.py
View File

@ -139,8 +139,8 @@ class CLIDbManager(object):
from gen.db import META, PERSON_TBL from gen.db import META, PERSON_TBL
env = db.DBEnv() env = db.DBEnv()
flags = db.DB_CREATE | db.DB_PRIVATE |\ flags = db.DB_CREATE | db.DB_PRIVATE |\
db.DB_INIT_MPOOL | db.DB_INIT_LOCK |\ db.DB_INIT_MPOOL |\
db.DB_INIT_LOG | db.DB_INIT_TXN | db.DB_THREAD db.DB_INIT_LOG | db.DB_INIT_TXN
try: try:
env.open(file_name, flags) env.open(file_name, flags)
except: except:

4
src/gen/db/bsddbtxn.py
View File

@ -197,8 +197,8 @@ if __name__ == "__main__":
x = db.DBEnv() x = db.DBEnv()
print "3" print "3"
x.open('/tmp', db.DB_CREATE | db.DB_PRIVATE |\ x.open('/tmp', db.DB_CREATE | db.DB_PRIVATE |\
db.DB_INIT_MPOOL | db.DB_INIT_LOCK |\ db.DB_INIT_MPOOL |\
db.DB_INIT_LOG | db.DB_INIT_TXN | db.DB_THREAD) db.DB_INIT_LOG | db.DB_INIT_TXN)
print "4" print "4"
d = dbshelve.DBShelf(x) d = dbshelve.DBShelf(x)
print "5" print "5"

13
src/gen/db/write.py
View File

@ -452,8 +452,8 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
# The DB_PRIVATE flag must go if we ever move to multi-user setup # The DB_PRIVATE flag must go if we ever move to multi-user setup
env_flags = db.DB_CREATE | db.DB_PRIVATE |\ env_flags = db.DB_CREATE | db.DB_PRIVATE |\
db.DB_INIT_MPOOL | db.DB_INIT_LOCK |\ db.DB_INIT_MPOOL |\
db.DB_INIT_LOG | db.DB_INIT_TXN | db.DB_THREAD db.DB_INIT_LOG | db.DB_INIT_TXN
# As opposed to before, we always try recovery on databases # As opposed to before, we always try recovery on databases
env_flags |= db.DB_RECOVER env_flags |= db.DB_RECOVER
@ -1073,11 +1073,6 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
self.transaction_abort(self.transaction) self.transaction_abort(self.transaction)
self.env.txn_checkpoint() self.env.txn_checkpoint()
lockstats = self.env.lock_stat()
_LOG.debug("lock occupancy: %d%%, locked object occupancy: %d%%" % (
round(lockstats['maxnlocks']*100/lockstats['maxlocks']),
round(lockstats['maxnobjects']*100/lockstats['maxobjects'])))
self.__close_metadata() self.__close_metadata()
self.name_group.close() self.name_group.close()
self.surnames.close() self.surnames.close()
@ -1964,8 +1959,8 @@ class DbBsddb(DbBsddbRead, DbWriteBase, UpdateCallback):
# The DB_PRIVATE flag must go if we ever move to multi-user setup # The DB_PRIVATE flag must go if we ever move to multi-user setup
env_flags = db.DB_CREATE | db.DB_PRIVATE |\ env_flags = db.DB_CREATE | db.DB_PRIVATE |\
db.DB_INIT_MPOOL | db.DB_INIT_LOCK |\ db.DB_INIT_MPOOL |\
db.DB_INIT_LOG | db.DB_INIT_TXN | db.DB_THREAD db.DB_INIT_LOG | db.DB_INIT_TXN
# As opposed to before, we always try recovery on databases # As opposed to before, we always try recovery on databases
env_flags |= db.DB_RECOVER env_flags |= db.DB_RECOVER

4
src/plugins/tool/MergeCitations.py
View File

@ -185,8 +185,8 @@ class MergeCitations(tool.BatchTool,ManagedWindow.ManagedWindow):
db.disable_signals() db.disable_signals()
num_merges = 0 num_merges = 0
with DbTxn(_("Merge Citation"), db) as trans: for handle in db.iter_source_handles():
for handle in db.iter_source_handles(): with DbTxn(_("Merge Citation"), db) as trans:
dict = {} dict = {}
citation_handle_list = list(db.find_backlink_handles(handle)) citation_handle_list = list(db.find_backlink_handles(handle))
for (class_name, citation_handle) in citation_handle_list: for (class_name, citation_handle) in citation_handle_list: